[arch-commits] Commit in unrar/trunk (3 files)

[Giovanni Scafora]

    Date: Saturday, May 4, 2013 @ 23:03:30
  Author: giovanni
Revision: 184244

upgpkg: unrar 1:4.2.4-1

FS35096 - Revert to the previous version that works with kdeutils-ark and mc

Added:
  unrar/trunk/unrar-4.2.1-soname.patch
Modified:
  unrar/trunk/PKGBUILD
Deleted:
  unrar/trunk/unrar-5.0.2-soname.patch

--------------------------+
 PKGBUILD                 |   17 +++++++++--------
 unrar-4.2.1-soname.patch |   11 +++++++++++
 unrar-5.0.2-soname.patch |   11 -----------
 3 files changed, 20 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-04 20:20:08 UTC (rev 184243)
+++ PKGBUILD	2013-05-04 21:03:30 UTC (rev 184244)
@@ -4,25 +4,26 @@
 
 pkgbase=unrar
 pkgname=('unrar' 'libunrar')
-pkgver=5.0.2
+pkgver=4.2.4
 pkgrel=1
+epoch=1
 arch=('i686' 'x86_64')
 url="http://www.rarlab.com/rar_add.htm"
 license=('custom')
 makedepends=('gcc-libs')
 source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz"
-        'unrar-5.0.2-soname.patch')
-md5sums=('f8295f66c8323c73c286fd8eef63b235'
-         '4b7cad1a0cd7225f7e115f770e85dd58')
+        'unrar-4.2.1-soname.patch')
+md5sums=('8ea9d1b4139474b282d76e627a2de3e4'
+         'b9ec767da9a36f5ac38034c974e77758')
 
 build() {
   cd "${srcdir}/${pkgbase}"
 
-  patch -Np0 -i "${srcdir}/unrar-5.0.2-soname.patch"
+  patch -Np0 -i "${srcdir}/unrar-4.2.1-soname.patch"
 
   cp -a ${srcdir}/unrar ${srcdir}/libunrar
-  make -C "${srcdir}"/libunrar -f makefile lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}"
-  make -f makefile CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true"
+  make -C "${srcdir}"/libunrar -f makefile.unix lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}"
+  make -f makefile.unix CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true"
 }
 
 package_unrar() {
@@ -42,7 +43,7 @@
 
   install -Dm755 libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.${pkgver}"
   install -Dm644 dll.hpp "${pkgdir}/usr/include/unrar/dll.hpp"
-  ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.5"
+  ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.4"
   ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so"
   # install license
   install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

Added: unrar-4.2.1-soname.patch
===================================================================
--- unrar-4.2.1-soname.patch	                        (rev 0)
+++ unrar-4.2.1-soname.patch	2013-05-04 21:03:30 UTC (rev 184244)
@@ -0,0 +1,11 @@
+--- makefile.unix	2012-02-23 10:23:14.000000000 +0100
++++ makefile.unix	2012-05-05 12:58:13.000000000 +0200
+@@ -131,7 +131,7 @@
+ lib:	CXXFLAGS+=$(LIBFLAGS)
+ lib:	clean $(OBJECTS) $(LIB_OBJ)
+ 	@rm -f libunrar.so
+-	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
++	$(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ 
+ install-unrar:
+ 			install -D unrar $(DESTDIR)/bin/unrar

Deleted: unrar-5.0.2-soname.patch
===================================================================
--- unrar-5.0.2-soname.patch	2013-05-04 20:20:08 UTC (rev 184243)
+++ unrar-5.0.2-soname.patch	2013-05-04 21:03:30 UTC (rev 184244)
@@ -1,11 +0,0 @@
---- makefile	2013-04-29 16:27:05.000000000 +0200
-+++ makefile	2013-05-01 08:06:07.000000000 +0200
-@@ -133,7 +133,7 @@
- lib:	CXXFLAGS+=$(LIBFLAGS)
- lib:	clean $(OBJECTS) $(LIB_OBJ)
- 	@rm -f libunrar.so
--	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
-+	$(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
- 
- install-unrar:
- 			install -D unrar $(DESTDIR)/bin/unrar