New version

- monit fixes in spec file
This commit is contained in:
Jiří Moskovčák 2009-09-16 11:44:30 +00:00
parent d94b597afa
commit 484ca2a1ab
4 changed files with 76 additions and 9 deletions

View File

@ -1 +1 @@
usbutils-0.82.tar.gz usbutils-0.86.tar.gz

View File

@ -1 +1 @@
6e393cc7423b5d228fa3d34c21481ae4 usbutils-0.82.tar.gz 34979f675d2bcb3e1b45012fa830a53f usbutils-0.86.tar.gz

View File

@ -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:

View File

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