diff --git a/libusb-1_0.changes b/libusb-1_0.changes index bc707b2..7b8053c 100644 --- a/libusb-1_0.changes +++ b/libusb-1_0.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 12 15:11:04 UTC 2012 - crrodriguez@opensuse.org + +- Libraries back in %{_libdir}, /usr merge project. + ------------------------------------------------------------------- Thu Nov 24 16:40:21 UTC 2011 - dimstar@opensuse.org diff --git a/libusb-1_0.spec b/libusb-1_0.spec index e019014..a219fd1 100644 --- a/libusb-1_0.spec +++ b/libusb-1_0.spec @@ -1,7 +1,7 @@ # # spec file for package libusb-1_0 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,29 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libusb-1_0 %define _name libusb Url: http://www.libusb.org/ -License: LGPL-2.1+ Summary: USB Library +License: LGPL-2.1+ Group: System/Libraries Version: 1.0.8_1.0.9rc3 -Release: 1 +Release: 0 %define _version f07a4a7 Source: %{_name}-%{version}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libtool pkg-config +BuildRequires: libtool +BuildRequires: pkg-config %define debug_package_requires libusb-1_0-0 = %{version}-%{release} %description Libusb is a library that allows userspace access to USB devices. %package -n libusb-1_0-0 -License: LGPL-2.1+ Summary: USB Library Group: System/Libraries @@ -45,7 +43,6 @@ Group: System/Libraries Libusb is a library that allows userspace access to USB devices. %package devel -License: LGPL-2.1+ Summary: USB Library Group: Development/Libraries/C and C++ Requires: libusb-1_0-0 = %{version} glibc-devel @@ -58,22 +55,12 @@ Libusb is a library that allows userspace access to USB devices. %build mkdir m4 ; autoreconf -f -i -%configure\ - --libdir=/%{_lib} \ - --disable-static +%configure --with-pic --disable-static make %{?jobs:-j%jobs} %install %makeinstall - -install -d -m 0755 %{buildroot}%{_libdir} -for i in %{buildroot}/%{_lib}/*.so; do - link=$(readlink $i) - ln -s /%{_lib}/$link %{buildroot}%{_libdir}/$(basename $i) - rm $i -done -mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir} -%{__rm} -f %{buildroot}/%{_lib}/*.la +%{__rm} -f %{buildroot}%{_libdir}/*.la %post -n libusb-1_0-0 -p /sbin/ldconfig @@ -82,7 +69,7 @@ mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir} %files -n libusb-1_0-0 %defattr(-,root,root) %doc AUTHORS COPYING NEWS README THANKS TODO -/%{_lib}/*.so.* +%{_libdir}/*.so.* %files devel %defattr(-,root,root)