[libusb] rebase legacy libusb-0.1 to libusb-compat-0.1.3
jvcelak
jvcelak at fedoraproject.org
Fri Aug 27 13:35:02 UTC 2010
commit a82f37afdf2bca8db2312e1612a63a7edd0d4176
Author: Jan Vcelak <jvcelak at redhat.com>
Date: Wed Aug 25 13:03:28 2010 +0200
rebase legacy libusb-0.1 to libusb-compat-0.1.3
libusb-0.1 is no longer supported by upstream. The developers are
encouraged to port their applications to libusb-1.0 (which has
different API). Or to use libusb-compat library, which works as
a wrapper around libusb-1.0 and provides the same API as libusb-0.1.
See libusb.org for more information.
.gitignore | 1 +
libusb-0.1.12-concurrency-timeout.patch | 160 -------------------------------
libusb-0.1.12-invalid-read.patch | 21 ----
libusb-0.1.12-libusbconfig.patch | 49 ----------
libusb-0.1.12-memset.patch | 10 --
libusb-0.1.12-openat.patch | 114 ----------------------
libusb-0.1.12-wakeups.patch | 67 -------------
libusb.spec | 81 +++++++---------
sources | 2 +-
9 files changed, 38 insertions(+), 467 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46ec95f..154fe2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ libusb-0.1.9.tar.gz
libusb-0.1.10.tar.gz
libusb-0.1.10a.tar.gz
libusb-0.1.11.tar.gz
+/libusb-compat-0.1.3.tar.bz2
diff --git a/libusb.spec b/libusb.spec
index fd8edb9..c82f045 100644
--- a/libusb.spec
+++ b/libusb.spec
@@ -1,24 +1,21 @@
-Summary: A library which allows userspace access to USB devices
Name: libusb
-Version: 0.1.12
-Release: 23%{?dist}
-Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz
-Patch0: libusb-0.1.12-libusbconfig.patch
-Patch1: libusb-0.1.12-memset.patch
-Patch2: libusb-0.1.12-openat.patch
-Patch3: libusb-0.1.12-wakeups.patch
-Patch4: libusb-0.1.12-concurrency-timeout.patch
-Patch5: libusb-0.1.12-invalid-read.patch
-License: LGPLv2+
+Epoch: 1
+Version: 0.1.3
+Release: 1%{?dist}
+Summary: A library which allows userspace access to USB devices
Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+License: LGPLv2+
URL: http://sourceforge.net/projects/libusb/
-BuildRequires: docbook-utils, pkgconfig
-BuildRequires: docbook-dtds >= 1.0-5, docbook-utils-pdf
-BuildRequires: openjade autoconf
+Source0: http://prdownloads.sourceforge.net/libusb/libusb-compat-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: libusb1-devel
%description
This package provides a way for applications to access USB devices.
+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
@@ -27,8 +24,9 @@ Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
-This package contains the header files, libraries and documentation needed to
-develop applications that use libusb.
+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
@@ -36,55 +34,48 @@ Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
-This package contains static libraries to develop applications that use libusb.
+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
-%patch0 -p1 -b .libusbconfig
-%patch1 -p1 -b .memset
-%patch2 -p1 -b .openat
-#%patch3 -p0 -b .wakeups
-#%patch4 -p1 -b .concurrency-timeout
-%patch5 -p1 -b .invalid-read
+%setup -q -n libusb-compat-%{version}
%build
-autoconf
%configure
-make CFLAGS="$RPM_OPT_FLAGS"
-pushd doc
-docbook2ps manual.sgml
-sed -i '/DVIPSSource:/d;/CreationDate:/d' manual.ps
-popd
+make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/libusb.la
+rm -f %{buildroot}%{_bindir}/libusb-config
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
%files
-%defattr(-,root,root)
-%{_libdir}/*.so.*
+%defattr(-,root,root,-)
+%{_libdir}/libusb-0.1.so.*
%files devel
-%defattr(-,root,root)
-%doc AUTHORS README INSTALL.libusb NEWS ChangeLog doc/manual.ps doc/html
-%{_bindir}/libusb-config
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%{_includedir}/usb.h
+%{_libdir}/libusb.so
%{_libdir}/pkgconfig/libusb.pc
-%{_includedir}/*
-%{_libdir}/*.so
%files static
-%defattr(-,root,root)
-%{_libdir}/*.a
+%defattr(-,root,root,-)
+%{_libdir}/libusb.a
%changelog
+* Fri Aug 27 2010 Jan Vcelak <jvcelak at redhat.com> 0.1.3-1
+- legacy libusb-0.1 replaced with libusb-compat
+
* Wed Jun 23 2010 Jan Vcelak <jvcelak at redhat.com> 0.1.12-23
- fixes invalid read causing segfault (#565904)
diff --git a/sources b/sources
index b309b06..59c34f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-caf182cbc7565dac0fd72155919672e6 libusb-0.1.12.tar.gz
+570ac2ea085b80d1f74ddc7c6a93c0eb libusb-compat-0.1.3.tar.bz2
More information about the scm-commits
mailing list