Browse Source

2014-12-13 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* libgusb: updated, compat32
	* libusb1: compat32
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9150 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
16c9f9445b
2 changed files with 130 additions and 16 deletions
  1. 62 7
      lib/libg/libgusb/libgusb-vl.spec
  2. 68 9
      lib/libu/libusb1/libusb1-vl.spec

+ 62 - 7
lib/libg/libgusb/libgusb-vl.spec

@@ -1,6 +1,8 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 Name:		libgusb
-Version:	0.1.6
-Release:	2%{?_dist_release}
+Version:	0.2.3
+Release:	1%{?_dist_release}
 Summary:	GObject wrapper for libusb1
 Summary(ja):	libusb1 用 GObject ラッパー
 
@@ -8,12 +10,11 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            https://gitorious.org/gusb/
 Source0:        http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires:  glib2-devel >= 2.28.0
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  glib2-devel >= 2.32.0
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  libgudev1-devel
-BuildRequires:  libusb1-devel >= 1.0.0
+BuildRequires:  libusb1-devel >= 1.0.19
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -55,11 +56,44 @@ BuildArch:      noarch
 This package contains documentation for %{name}.
 
 
+# compat32
+%package -n compat32-%{name}
+Summary: GObject wrapper for libusb1
+Summary(ja): libusb1 用 GObject ラッパー
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n compat32-%{name}
+GUsb is a GObject wrapper for libusb1 that makes it easy to do
+asynchronous control, bulk and interrupt transfers with proper
+cancellation and integration into a mainloop.
+This makes it easy to integrate low level USB transfers with your
+high-level application or system daemon.
+
+Not everything you can do in libusb1 is wrapped, although we'll accept
+feature requests (with patches) if it makes sense. There is some pretty
+low hanging fruit if you're interested.
+
+%package -n compat32-%{name}-devel
+Summary: Development files for %{name}
+Summary(ja): %{name} の開発ファイル
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: compat32-%{name} = %{version}-%{release}
+Requires: compat32-glib2-devel
+Requires: compat32-libusb1-devel
+Requires: compat32-pkgconfig
+
+%description -n compat32-%{name}-devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
 %prep
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-vala
 make %{?_smp_mflags}
 
 %check
@@ -78,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+%if %{build_compat32}
+%post -n compat32-%{name} -p /sbin/ldconfig
+%postun -n compat32-%{name} -p /sbin/ldconfig
+%endif
+
 
 %files
 %defattr(-,root,root,-)
@@ -96,8 +135,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/gusb
 
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root,-)
+%{_libdir}/%{name}.so.*
+
+%files -n compat32-%{name}-devel
+%defattr(-,root,root,-)
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/gusb.pc
+%endif
+
 
 %changelog
+* Sat Dec 13 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.2.3-1
+- new upstream release
+- added compat32 subpackages
+
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.6-2
 - rebuild with VineSeed environment
 

+ 68 - 9
lib/libu/libusb1/libusb1-vl.spec

@@ -1,13 +1,17 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 Summary: A library which allows userspace access to USB devices
 Summary(ja): USB デバイスにユーザスペースからアクセスするためのライブラリ
 Name: libusb1
 Version: 1.0.19
-Release: 1%{?_dist_release}
-Source0: http://downloads.sourceforge.net/libusb/libusb-%{version}.tar.bz2
-License: LGPLv2+
+Release: 2%{?_dist_release}
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+License: LGPLv2+
 URL: http://libusb.wiki.sourceforge.net/Libusb1.0
+
+Source0: http://downloads.sourceforge.net/libusb/libusb-%{version}.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 ExcludeArch: s390 s390x
 BuildRequires: eudev-libudev-devel
 BuildRequires: doxygen
@@ -22,7 +26,7 @@ this library is not compatible with the original libusb-0.1 series.
 
 %package devel
 Summary: Development files for libusb
-Summary(ja): libusb の開発ファイル
+Summary(ja): libusb の開発ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
@@ -48,6 +52,40 @@ This package contains static libraries to develop applications that use libusb1.
 このパッケージは libusb1 を使うアプリケーションを開発するための
 静的ライブラリを含んでいます。
 
+
+# compat32
+%package -n compat32-%{name}
+Summary: A library which allows userspace access to USB devices
+Summary(ja): USB デバイスにユーザスペースからアクセスするためのライブラリ
+Group:    System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: compat32-eudev-libudev
+
+%description -n compat32-%{name}
+This package provides a way for applications to access USB devices. Note that
+this library is not compatible with the original libusb-0.1 series.
+
+%description -n compat32-%{name} -l ja
+このパッケージはアプリケーションが USB デバイスにアクセスする方法を提供します。
+このライブラリはオリジナルの libusb-0.1 シリーズと互換性がないことに注意してください。
+
+%package -n compat32-%{name}-devel
+Summary: Development files for libusb
+Summary(ja): libusb の開発用ファイル
+Group:   Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: compat32-%{name} = %{version}-%{release}
+Requires: compat32-pkgconfig
+
+%description -n compat32-%{name}-devel
+This package contains the header files, libraries and documentation needed to
+develop applications that use libusb1.
+
+%description -n compat32-%{name}-devel -l ja
+このパッケージは libusb1 を使うアプリケーションを開発するために
+必要なヘッダファイル、ライブラリ、ドキュメントを含んでいます。
+
+
 %prep
 %setup -q -n libusb-%{version}
 
@@ -69,24 +107,45 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%if %{build_compat32}
+%post -n compat32-%{name} -p /sbin/ldconfig
+%postun -n compat32-%{name} -p /sbin/ldconfig
+%endif
+
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README NEWS ChangeLog
-%{_libdir}/*.so.*
+%{_libdir}/libusb-1.0.so.*
 
 %files devel
 %defattr(-,root,root)
 %doc doc/html examples/*.c
+%{_includedir}/libusb-1.0
+%{_libdir}/libusb-1.0.so
 %{_libdir}/pkgconfig/libusb-1.0.pc
-%{_includedir}/*
-%{_libdir}/*.so
 
 %files static
 %defattr(-,root,root)
-%{_libdir}/*.a
+%{_libdir}/libusb-1.0.a
+
+# compat32
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root,-)
+%{_libdir}/libusb-1.0.so.*
+
+%files -n compat32-%{name}-devel
+%defattr(-,root,root,-)
+%{_libdir}/libusb-1.0.so
+%{_libdir}/pkgconfig/libusb-1.0.pc
+%endif
+
 
 %changelog
+* Sat Dec 13 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.0.19-2
+- added compat32 subpackages
+
 * Sat Jul 12 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.19-1
 - new upstream release
 - add BuildRequires: eudev-libudev-devel