From 484ca2a1ab446eec470bb5bee01e6368b680fdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Wed, 16 Sep 2009 11:44:30 +0000 Subject: [PATCH] New version - monit fixes in spec file --- .cvsignore | 2 +- sources | 2 +- usbutils-0.86-hwdata.patch | 62 ++++++++++++++++++++++++++++++++++++++ usbutils.spec | 19 +++++++----- 4 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 usbutils-0.86-hwdata.patch diff --git a/.cvsignore b/.cvsignore index c573125..3792494 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -usbutils-0.82.tar.gz +usbutils-0.86.tar.gz diff --git a/sources b/sources index e19cc4a..ce944ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e393cc7423b5d228fa3d34c21481ae4 usbutils-0.82.tar.gz +34979f675d2bcb3e1b45012fa830a53f usbutils-0.86.tar.gz diff --git a/usbutils-0.86-hwdata.patch b/usbutils-0.86-hwdata.patch new file mode 100644 index 0000000..246240a --- /dev/null +++ b/usbutils-0.86-hwdata.patch @@ -0,0 +1,62 @@ +--- 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: diff --git a/usbutils.spec b/usbutils.spec index a87da5f..9bd0042 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -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-devel >= 0.1.8 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 0.86-1 +- new version +- spec file fixes as suggested in rhbz#466041 (info@owlriver.com) + * Mon Aug 24 2009 Karsten Hopp 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