[packages/libirecovery] - updated to 1.0.0 - updated sh patch

qboosh qboosh at pld-linux.org
Sat Sep 12 08:44:10 CEST 2020 

commit 4b439e69041d064fbd6b2a3efa00576e06dd65d3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 12 08:46:54 2020 +0200

    - updated to 1.0.0
    - updated sh patch

 libirecovery-sh.patch | 68 ++++++++++++++++++++++-----------------------------
 libirecovery.spec     | 42 +++++++++++++++++--------------
 2 files changed, 53 insertions(+), 57 deletions(-)
---
diff --git a/libirecovery.spec b/libirecovery.spec
index 5cbc286..11f5cd3 100644
--- a/libirecovery.spec
+++ b/libirecovery.spec
@@ -5,20 +5,22 @@
 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:	3
+Version:	1.0.0
+Release:	1
 License:	LGPL v2.1
 Group:		Libraries
-Source0:	https://github.com/libimobiledevice/libirecovery/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	cfc221033ecc98552369b72dca41cf33
+#Source0Download: https://libimobiledevice.org/
+Source0:	https://github.com/libimobiledevice/libirecovery/releases/download/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	ff4aff474e8d58f70b55091519c4015b
 Patch0:		%{name}-sh.patch
 URL:		https://github.com/libimobiledevice/libirecovery
-BuildRequires:	autoconf >= 2.61
+BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake
 BuildRequires:	libtool
-BuildRequires:	libusb-devel >= 1.0
+BuildRequires:	libusb-devel >= 1.0.3
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
+Requires:	libusb >= 1.0.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,7 +38,7 @@ 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
+Requires:	libusb-devel >= 1.0.3
 
 %description devel
 Header files for libirecovery library.
@@ -60,9 +62,6 @@ Statyczna biblioteka libirecovery.
 %setup -q
 %patch0 -p1
 
-# use system headers
-%{__rm} -r include/libusb-1.0
-
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -72,15 +71,21 @@ Statyczna biblioteka libirecovery.
 %configure \
 	%{!?with_openssl:--disable-openssl} \
 	%{!?with_static_libs:--disable-static} \
-	--disable-silent-rules
+	--disable-silent-rules \
+	--with-udev \
+	--with-udevrule='OWNER="root", GROUP="usb", MODE="0660"' \
+	--with-udevrulesdir=/lib/udev/rules.d
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libirecovery-1.0.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,19 +95,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README TODO
+%doc NEWS README.md
 %attr(755,root,root) %{_bindir}/irecovery
-%attr(755,root,root) %{_libdir}/libirecovery.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libirecovery.so.0
+%attr(755,root,root) %{_libdir}/libirecovery-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libirecovery-1.0.so.3
+/lib/udev/rules.d/39-libirecovery.rules
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libirecovery.so
+%attr(755,root,root) %{_libdir}/libirecovery-1.0.so
 %{_includedir}/libirecovery.h
-%{_pkgconfigdir}/libirecovery.pc
+%{_pkgconfigdir}/libirecovery-1.0.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libirecovery.a
+%{_libdir}/libirecovery-1.0.a
 %endif
diff --git a/libirecovery-sh.patch b/libirecovery-sh.patch
index 007d0cf..f8749c9 100644
--- a/libirecovery-sh.patch
+++ b/libirecovery-sh.patch
@@ -1,48 +1,38 @@
---- 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"
+--- libirecovery-1.0.0/configure.ac.orig	2020-09-12 08:24:09.012837498 +0200
++++ libirecovery-1.0.0/configure.ac	2020-09-12 08:30:23.620808073 +0200
+@@ -55,7 +55,7 @@
+ 		AC_MSG_RESULT([${host_os}])
+ 		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h, [
+ 			AC_CHECK_HEADER(IOKit/usb/IOUSBLib.h, [
+-				GLOBAL_LDFLAGS+=" -framework IOKit -framework CoreFoundation"
++				GLOBAL_LDFLAGS="$GLOBAL_LDFLAGS -framework IOKit -framework CoreFoundation"
+ 				have_iokit=yes
+ 			], [])
+ 		], [])
+@@ -63,14 +63,14 @@
  	;;
  	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"
+ 		AC_MSG_RESULT([${host_os}])
+-		GLOBAL_LDFLAGS+=" -static-libgcc -lkernel32 -lmsvcrt -lsetupapi"
++		GLOBAL_LDFLAGS="$GLOBAL_LDFLAGS -static-libgcc -lkernel32 -lmsvcrt -lsetupapi"
+ 		win32=true
  	;;
  	cygwin*)
+ 		AC_MSG_RESULT([${host_os}])
  		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"
+-		CFLAGS+=" -mno-cygwin"
+-		GLOBAL_LDFLAGS+=" -static-libgcc -lkernel32 -lmsvcrt -lsetupapi"
++		CFLAGS="$CFLAGS -mno-cygwin"
++		GLOBAL_LDFLAGS="$GLOBAL_LDFLAGS -static-libgcc -lkernel32 -lmsvcrt -lsetupapi"
+ 		win32=true
  	;;
  	*)
- 		
-@@ -82,7 +81,7 @@
- AC_SUBST(GLOBAL_CFLAGS)
+@@ -113,7 +113,7 @@
+ ])
  
- LIBIRECOVERY_CFLAGS=$ACCFLAGS
--LIBIRECOVERY_CFLAGS+=$GLOBAL_CFLAGS
-+LIBIRECOVERY_CFLAGS="$LIBIRECOVERY_CFLAGS $GLOBAL_CFLAGS"
- LIBIRECOVERY_LDFLAGS=$ACLDFLAGS
- LIBIRECOVERY_LIBS=$ACLIBS
+ AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wmissing-declarations -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter -fvisibility=hidden $PTHREAD_CFLAGS")
+-GLOBAL_LDFLAGS+=" $PTHREAD_LIBS"
++GLOBAL_LDFLAGS="$GLOBAL_LDFLAGS $PTHREAD_LIBS"
+ AC_SUBST(GLOBAL_CFLAGS)
+ AC_SUBST(GLOBAL_LDFLAGS)
  
================================================================

---- gitweb:

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

More information about the pld-cvs-commit mailing list