rpms/usbutils/devel usbutils-0.86-hwdata.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 usbutils.spec, 1.30, 1.31

[Jiří Moskovčák]

Author: jmoskovc

Update of /cvs/extras/rpms/usbutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17241

Modified Files:
	.cvsignore sources usbutils.spec 
Added Files:
	usbutils-0.86-hwdata.patch 
Log Message:
New version
- monit fixes in spec file


usbutils-0.86-hwdata.patch:
 Makefile.am |   22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

--- NEW FILE usbutils-0.86-hwdata.patch ---
--- usbutils-0.86/Makefile.am_old	2009-09-16 11:56:26.000000000 +0200
+++ usbutils-0.86/Makefile.am	2009-09-16 11:57:40.000000000 +0200
@@ -1,18 +1,9 @@
 AM_LDFLAGS = \
 	-Wl,--as-needed
 
-data_DATA = \
-	usb.ids
-if HAVE_ZLIB
-data_DATA += usb.ids.gz
-endif
-
 sbin_PROGRAMS = \
 	lsusb
 
-sbin_SCRIPTS = \
-	update-usbids.sh
-
 bin_SCRIPTS = \
 	usb-devices
 
@@ -26,7 +17,7 @@
 
 lsusb_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-DDATADIR=\"$(datadir)\"
+	-DDATADIR=\"$(datadir)/hwdata\"
 
 lsusb_LDADD = \
 	$(LIBUSB_LIBS)
@@ -36,20 +27,11 @@
 	usb-devices.1
 
 EXTRA_DIST = \
-	usb.ids \
-	update-usbids.sh.in \
 	lsusb.8.in \
 	usb-devices.1.in \
 	usb-devices \
 	usbutils.pc.in
 
-usb.ids.gz: $(srcdir)/usb.ids
-	gzip -c -9 $< > $@
-
-update-usbids.sh: $(srcdir)/update-usbids.sh.in
-	sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@
-	chmod 755 $@
-
 lsusb.8: $(srcdir)/lsusb.8.in
 	sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
 
@@ -63,10 +45,8 @@
 	sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
 
 DISTCLEANFILES = \
-	usb.ids.gz \
 	lsusb.8 \
 	usb-devices.1 \
-	update-usbids.sh \
 	usbutils.pc
 
 distclean-local:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/usbutils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 May 2009 11:15:29 -0000	1.8
+++ .cvsignore	16 Sep 2009 11:44:29 -0000	1.9
@@ -1 +1 @@
-usbutils-0.82.tar.gz
+usbutils-0.86.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/usbutils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 May 2009 11:15:29 -0000	1.8
+++ sources	16 Sep 2009 11:44:30 -0000	1.9
@@ -1 +1 @@
-6e393cc7423b5d228fa3d34c21481ae4  usbutils-0.82.tar.gz
+34979f675d2bcb3e1b45012fa830a53f  usbutils-0.86.tar.gz


Index: usbutils.spec
===================================================================
RCS file: /cvs/extras/rpms/usbutils/devel/usbutils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- usbutils.spec	24 Aug 2009 14:44:35 -0000	1.30
+++ usbutils.spec	16 Sep 2009 11:44:30 -0000	1.31
@@ -1,6 +1,6 @@
 Name: usbutils
-Version: 0.82
-Release: 5%{?dist}
+Version: 0.86
+Release: 1%{?dist}
 Source:	http://downloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
 URL: http://www.linux-usb.org/
 License: GPLv2+
@@ -11,7 +11,7 @@ BuildRequires: autoconf, libtool, libusb
 Summary: Linux USB utilities
 Group: Applications/System
 Conflicts: hotplug < 3:2002_01_14-2
-Patch0: usbutils-0.82-hwdata.patch
+Patch0: usbutils-0.86-hwdata.patch
 
 %description 
 This package contains utilities for inspecting devices connected to a
@@ -23,7 +23,7 @@ USB bus.
 autoreconf
 
 %build
-%configure --sbindir=/sbin
+%configure --sbindir=%{_sbindir}
 make %{?_smp_mflags}
 
 %install
@@ -31,19 +31,24 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # usb.ids is shipped in hwdata; nuke and adjust .pc file
-sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/usbutils.pc
+sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUILD_ROOT%{_datadir}/pkgconfig/usbutils.pc
 
 %files
 %defattr(-,root,root,-)
 %{_mandir}/*/*
-/sbin/*
-%{_libdir}/pkgconfig/usbutils.pc
+%{_sbindir}
+%{_bindir}
+%{_datadir}/pkgconfig/usbutils.pc
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Sep 16 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.86-1
+- new version
+- spec file fixes as suggested in rhbz#466041 (info at owlriver.com)
+
 * Mon Aug 24 2009 Karsten Hopp <karsten at redhat.com> 0.82-5
 - drop ExcludeArch: s390 s390x as we need this package on s390x to be able to build
   p.e. udev without any hacks