diff --git a/.gitignore b/.gitignore index 265cfd0..32cc3ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libusb-compat-0.1.4.tar.bz2 +/libusb-compat-0.1.5.tar.bz2 diff --git a/libusb.spec b/libusb.spec index 0344f88..9b87a68 100644 --- a/libusb.spec +++ b/libusb.spec @@ -1,16 +1,13 @@ Name: libusb Epoch: 1 -Version: 0.1.4 -Release: 2%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: A library which allows userspace access to USB devices Group: System Environment/Libraries License: LGPLv2+ URL: http://sourceforge.net/projects/libusb/ Source0: http://downloads.sourceforge.net/libusb/libusb-compat-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - Patch0: libusb-config-multilib.patch - BuildRequires: libusb1-devel %description @@ -19,66 +16,53 @@ Legacy libusb-0.1 is no longer supported by upstream, therefore content of this package was replaced by libusb-compat. It provides compatibility layer allowing applications written for libusb-0.1 to work with libusb-1.0. + %package devel Summary: Development files for libusb Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: pkgconfig +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel This package contains the header files, libraries and documentation needed to develop applications that use libusb-0.1. However new applications should use libusb-1.0 library instead of this one. -%package static -Summary: Static development files for libusb -Group: Development/Libraries -Requires: %{name}-devel = %{epoch}:%{version}-%{release} - -%description static -This package contains static libraries needed to develop applications that use -libusb-0.1. However new applications should use libusb-1.0 library instead of -this one. %prep %setup -q -n libusb-compat-%{version} %patch0 -p1 -b .config-multilib + %build -%configure --libdir=/%{_lib} +%configure --disable-static make %{?_smp_mflags} -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -rm -f %{buildroot}/%{_lib}/libusb.la -mkdir -p %{buildroot}%{_libdir}/pkgconfig -mv %{buildroot}/%{_lib}/pkgconfig/* %{buildroot}%{_libdir}/pkgconfig/ +%install +%make_install +rm $RPM_BUILD_ROOT%{_libdir}/libusb.la -%clean -rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig + %files -%defattr(-,root,root,-) -/%{_lib}/libusb-0.1.so.* +%doc AUTHORS COPYING ChangeLog NEWS README +%{_libdir}/libusb-0.1.so.* %files devel -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README %{_includedir}/usb.h -/%{_lib}/libusb.so +%{_libdir}/libusb.so %{_libdir}/pkgconfig/libusb.pc %{_bindir}/libusb-config -%files static -%defattr(-,root,root,-) -/%{_lib}/libusb.a %changelog +* Sun Aug 04 2013 Hans de Goede - 0.1.5-1 +- Update to 0.1.5 (#965414) +- Drop unused -static subpackage + * Sat Aug 03 2013 Fedora Release Engineering - 1:0.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -199,7 +183,7 @@ rm -rf %{buildroot} * Thu Jun 1 2006 Jindrich Novy 0.1.12-4 - remove .la files from libusb-devel (#172643) -* Thu May 30 2006 Jindrich Novy 0.1.12-3 +* Tue May 30 2006 Jindrich Novy 0.1.12-3 - use pkg-config calls in libusb-config instead of hardcoded defaults to avoid multiarch conflicts (#192714) diff --git a/sources b/sources index c09001d..35f6c31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ca521fffadd0c28fdf174e6ec73865b libusb-compat-0.1.4.tar.bz2 +2780b6a758a1e2c2943bdbf7faf740e4 libusb-compat-0.1.5.tar.bz2