From 42977ca1c33e9dac016e732d8ce86d1f84885273 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 14 Dec 2009 17:40:20 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for usbview --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 836e0160dda8e442e7c2a140e66a4e2cd3127fef Mon Sep 17 00:00:00 2001 From: Itamar Reis Peixoto Date: Mon, 14 Dec 2009 20:57:03 +0000 Subject: [PATCH 2/4] initial import --- .cvsignore | 1 + import.log | 1 + sources | 1 + usbview.desktop | 9 ++++++ usbview.spec | 74 +++++++++++++++++++++++++++++++++++++++++++++++ usbview_icon.png | Bin 0 -> 1425 bytes 6 files changed, 86 insertions(+) create mode 100644 import.log create mode 100644 usbview.desktop create mode 100644 usbview.spec create mode 100644 usbview_icon.png diff --git a/.cvsignore b/.cvsignore index e69de29..4e73b37 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +usbview-1.1.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..d45bedb --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +usbview-1_1-3_fc13:F-12:usbview-1.1-3.fc13.src.rpm:1260824186 diff --git a/sources b/sources index e69de29..96f571e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +8bf5e66351156356f3ad07454123affa usbview-1.1.tar.gz diff --git a/usbview.desktop b/usbview.desktop new file mode 100644 index 0000000..6f455e2 --- /dev/null +++ b/usbview.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=USB Viewer +GenericName=USB Viewer +Comment=USB topology and device viewer +Exec=usbview +Icon=usbview_icon +Terminal=false +Type=Application +Categories=System; diff --git a/usbview.spec b/usbview.spec new file mode 100644 index 0000000..38c7019 --- /dev/null +++ b/usbview.spec @@ -0,0 +1,74 @@ +Name: usbview +Version: 1.1 +Release: 3%{?dist} +Summary: USB topology and device viewer + +Group: Applications/System +License: GPLv2 +URL: http://www.kroah.com/linux-usb/ +Source0: http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gtk2-devel + +Source1: %{name}_icon.png +Source2: %{name}.desktop + + +BuildRequires: desktop-file-utils + + +%description +Display information about the topology of the devices connected to the USB bus +on a Linux machine. It also displays detailed information on the individual +devices. + +%prep +%setup -q +# Convert to utf-8 +for file in ChangeLog; do + iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ + touch -r $file $file.new && \ + mv $file.new $file +done + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +#install desktop icon +install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_icon.png + +#install desktop file +desktop-file-install \ +--add-category="System" \ +--dir=$RPM_BUILD_ROOT%{_datadir}/applications \ +%{SOURCE2} + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc ChangeLog COPYING* README TODO +%{_bindir}/usbview +%{_mandir}/man8/usbview* +%{_datadir}/pixmaps/%{name}_icon.png +%{_datadir}/applications/%{name}.desktop + +%changelog +* Fri Dec 11 2009 Itamar Reis Peixoto - 1.1-3 +- increasy usage of macros, fix icon permission + +* Fri Dec 11 2009 Itamar Reis Peixoto - 1.1-2 +- install desktop icon + +* Sun Nov 29 2009 Itamar Reis Peixoto - 1.1-1 +- Initial RPM for fedora + diff --git a/usbview_icon.png b/usbview_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..85d1b812e098740311f9743992bc447ca354a762 GIT binary patch literal 1425 zcmV;C1#bF@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXh@ z6B__rLR<6z00j|AL_t(|+U=W5Y!r1I$3HW>+irK+(qflVkd`VX)OJ%KSV@SOC>V$r zqX!-_3L;VCiA%4h*Iqn&z@)_(E0X9zlO{$)tBr^SENy8^dD$0ip$~0om+oUc{Pxv$ zy9;Hh-I@6&)6M>8W;@^S|NDFVCo>AEp^@287PE66X-A$LMNu=zG@fM2WuiJPK$SdR!~~OJ0~vc#`ej=;pDMx;haD$t$X$z(LH$pi!BS! zz9Z4^YQzew%eG<^#BtT44k$E`0P$SaNRyLkb^dW+cje>AbH@b8lnyVg{c)JH@tDtn zDS#<}DS#<}DS(k-T}~JCR1R!$Lyiruk3-jpfdqIq4~|rVE$qn`*TK0V`1YF41Xy8% zr(LoR4*?+!f*Ksy93vmWj2}A ztX%=O{(+O7$;oKIuY>tUvE$74ouY zk1630an3#80uI~K$9RraoH^----jMSfPqOUUzPmFuZ_bOSCSu-mo2s|&V_A-;+F9T z(AXt)KHYeIqc{^_cuK0Mkk<2+5LF{x<^t!-LYVABEf2Bg>6xeng-z=_K+>PvjArvNRX2}y@4H^a3Ot{G3 z1|?A@tot(t5MVlxy5%-Qz!bm~z!bm~z!bm~z!YFn0%%&uaKs~=Re-7SyZ9!?3`5>G zF&2HPDjEXb-b;oNAfBsA_<@aK0|^kvHTIZzds96@|BUX*2mLd&H`ULt0{3oq($Y|? zdjVP+Y9sFp%@RNXh4YPd^tUzZmVAF(Gv^!YB2gdv6JH$+{NiME$k4COMx8Ksz(6lg frxqi_kd)(p3cIfFH44vY00000NkvXXu0mjfpYD^n literal 0 HcmV?d00001 From 3231fd85e78a935474bd16f4244f684ec9225328 Mon Sep 17 00:00:00 2001 From: Itamar Reis Peixoto Date: Tue, 15 Dec 2009 17:24:41 +0000 Subject: [PATCH 3/4] fix desktop install --- import.log | 1 + usbview.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/import.log b/import.log index d45bedb..77a9ee6 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ usbview-1_1-3_fc13:F-12:usbview-1.1-3.fc13.src.rpm:1260824186 +usbview-1_1-4_fc13:F-12:usbview-1.1-4.fc13.src.rpm:1260897794 diff --git a/usbview.spec b/usbview.spec index 38c7019..1107c0b 100644 --- a/usbview.spec +++ b/usbview.spec @@ -1,6 +1,6 @@ Name: usbview Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: USB topology and device viewer Group: Applications/System @@ -46,6 +46,7 @@ install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_icon.p #install desktop file desktop-file-install \ +--vendor fedora \ --add-category="System" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} @@ -60,9 +61,12 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/usbview %{_mandir}/man8/usbview* %{_datadir}/pixmaps/%{name}_icon.png -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/fedora-%{name}.desktop %changelog +* Tue Dec 15 2009 Itamar Reis Peixoto - 1.1-4 +- include --vendor fedora in desktop-file-install (required for EL-5) + * Fri Dec 11 2009 Itamar Reis Peixoto - 1.1-3 - increasy usage of macros, fix icon permission From 976a659bf7f94b9f4fe469861ce88b15006120cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:48:18 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 2 -- 4 files changed, 24 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b1bfe7a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: usbview -# $Id$ -NAME := usbview -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 77a9ee6..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -usbview-1_1-3_fc13:F-12:usbview-1.1-3.fc13.src.rpm:1260824186 -usbview-1_1-4_fc13:F-12:usbview-1.1-4.fc13.src.rpm:1260897794