[packages/libirecovery] - added sh patch (fixes += bashism in configure) - pl - -devel R: libusb-devel

[qboosh]

commit ffee5760f7ba3a7447071fdd530717bcd4b93e03
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Sep 6 17:52:40 2013 +0200

    - added sh patch (fixes += bashism in configure)
    - pl
    - -devel R: libusb-devel

 libirecovery-sh.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 libirecovery.spec     | 20 ++++++++++++++++----
 2 files changed, 64 insertions(+), 4 deletions(-)
---
diff --git a/libirecovery.spec b/libirecovery.spec
index 5bde1da..be60749 100644
--- a/libirecovery.spec
+++ b/libirecovery.spec
@@ -3,6 +3,7 @@
 %bcond_without	static_libs	# don't build static libraries
 
 Summary:	Library and utility to talk to iBoot/iBSS via USB
+Summary(pl.UTF-8):	Biblioteka i narzędzie do komunikacji z iBoot/iBSS po USB
 Name:		libirecovery
 Version:	0.1.1
 Release:	0.1
@@ -10,11 +11,12 @@ License:	LGPL v2.1
 Group:		Libraries
 Source0:	https://github.com/libimobiledevice/libirecovery/archive/master.tar.gz?/%{name}.tgz
 # Source0-md5:	c285877601bd5496c194a34959f29754
+Patch0:		%{name}-sh.patch
 URL:		http://www.libirecovery.org/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
 BuildRequires:	libtool
-BuildRequires:	libusb-devel
+BuildRequires:	libusb-devel >= 1.0
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -24,11 +26,17 @@ libirecovery is a cross-platform library which implements
 communication to iBoot/iBSS found on Apple's iOS devices via USB. A
 command-line utility is also provided.
 
+%description -l pl.UTF-8
+libirecovery to wieloplatformowa biblioteka implementująca komunikację
+po USB z iBoot/iBSS, które można spotkać w urządzeniach z systemem iOS
+Apple'a. Dołączone jest także narzędzie działające z linii poleceń.
+
 %package devel
 Summary:	Header files for libirecovery library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libirecovery
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libusb-devel >= 1.0
 
 %description devel
 Header files for libirecovery library.
@@ -51,6 +59,10 @@ Statyczna biblioteka libirecovery.
 %prep
 %setup -qc
 mv libirecovery-*/* .
+%patch0 -p1
+
+# use system headers
+%{__rm} -r include/libusb-1.0
 
 %build
 %{__libtoolize}
@@ -59,8 +71,8 @@ mv libirecovery-*/* .
 %{__autoheader}
 %{__automake}
 %configure \
-	%{!?with_static_libs:--disable-static} \
 	%{!?with_openssl:--disable-openssl} \
+	%{!?with_static_libs:--disable-static} \
 	--disable-silent-rules
 %{__make}
 
@@ -82,12 +94,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc README TODO
 %attr(755,root,root) %{_bindir}/irecovery
 %attr(755,root,root) %{_libdir}/libirecovery.so.*.*.*
-%ghost %{_libdir}/libirecovery.so.0
+%attr(755,root,root) %ghost %{_libdir}/libirecovery.so.0
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libirecovery.so
 %{_includedir}/libirecovery.h
-%{_libdir}/libirecovery.so
 %{_pkgconfigdir}/libirecovery.pc
 
 %if %{with static_libs}
diff --git a/libirecovery-sh.patch b/libirecovery-sh.patch
new file mode 100644
index 0000000..007d0cf
--- /dev/null
+++ b/libirecovery-sh.patch
@@ -0,0 +1,48 @@
+--- libirecovery-0.1.1/configure.ac.orig	2013-05-21 13:22:25.000000000 +0200
++++ libirecovery-0.1.1/configure.ac	2013-09-06 17:41:35.203001334 +0200
+@@ -33,25 +33,24 @@
+ #echo $host_os
+ case "$host_os" in
+ 	darwin*)
+-		ACCFLAGS+="-I\$(top_srcdir)/include -I/usr/local/include -I/opt/local/include"
+-		ACLDFLAGS+="-L/usr/lib -L/usr/local/lib -L/opt/local/lib"
+-		ACLIBS+="-lusb-1.0 -framework CoreFoundation -framework IOKit"
++		ACCFLAGS="$ACCFLAGS -I\$(top_srcdir)/include -I/usr/local/include -I/opt/local/include"
++		ACLDFLAGS="$ACLDFLAGS -L/usr/lib -L/usr/local/lib -L/opt/local/lib"
++		ACLIBS="$ACLIBS -lusb-1.0 -framework CoreFoundation -framework IOKit"
+ 	;;
+ 	linux*)
+-		ACCFLAGS+="-fPIC -O3 -I\$(top_srcdir)/include -I/usr/include -I/usr/local/include"
+-		ACLDFLAGS+="-L/usr/lib -L/usr/local/lib"
+-		ACLIBS+="-lusb-1.0"
++		ACCFLAGS="$ACCFLAGS -I\$(top_srcdir)/include"
++		ACLIBS="$ACLIBS -lusb-1.0"
+ 	;;
+ 	mingw32*)
+-		ACCFLAGS+="-O3 -DWIN32 -I$(top_srcdir)/include -Ic:/mingw/include"
+-		ACLDFLAGS+="-static-libgcc -Lc:/mingw/lib -Lc:/mingw/bin"
+-		ACLIBS+="-lkernel32 -lmsvcrt -lsetupapi"
++		ACCFLAGS="$ACCFLAGS -O3 -DWIN32 -I$(top_srcdir)/include -Ic:/mingw/include"
++		ACLDFLAGS="$ACLDFLAGS -static-libgcc -Lc:/mingw/lib -Lc:/mingw/bin"
++		ACLIBS="$ACLIBS -lkernel32 -lmsvcrt -lsetupapi"
+ 	;;
+ 	cygwin*)
+ 		CC=gcc-3
+-		ACCFLAGS+="-O3 -DWIN32 -mno-cygwin -I$(top_srcdir)/include -I/usr/include"
+-		ACLDFLAGS+="-static-libgcc -L/lib -L/usr/lib -L/bin"
+-		ACLIBS+="-lkernel32 -lmsvcrt -lsetupapi"
++		ACCFLAGS="$ACCFLAGS -O3 -DWIN32 -mno-cygwin -I$(top_srcdir)/include -I/usr/include"
++		ACLDFLAGS="$ACLDFLAGS -static-libgcc -L/lib -L/usr/lib -L/bin"
++		ACLIBS="$ACLIBS -lkernel32 -lmsvcrt -lsetupapi"
+ 	;;
+ 	*)
+ 		
+@@ -82,7 +81,7 @@
+ AC_SUBST(GLOBAL_CFLAGS)
+ 
+ LIBIRECOVERY_CFLAGS=$ACCFLAGS
+-LIBIRECOVERY_CFLAGS+=$GLOBAL_CFLAGS
++LIBIRECOVERY_CFLAGS="$LIBIRECOVERY_CFLAGS $GLOBAL_CFLAGS"
+ LIBIRECOVERY_LDFLAGS=$ACLDFLAGS
+ LIBIRECOVERY_LIBS=$ACLIBS
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libirecovery.git/commitdiff/ffee5760f7ba3a7447071fdd530717bcd4b93e03