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

Giovanni Scafora giovanni at nymeria.archlinux.org
Tue Oct 1 20:38:48 UTC 2013


    Date: Tuesday, October 1, 2013 @ 22:38:48
  Author: giovanni
Revision: 195838

upgpkg: unrar 1:5.0.12-1

upstream release

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

---------------------------+
 PKGBUILD                  |   24 ++++++++++++------------
 unrar-4.2.1-soname.patch  |   11 -----------
 unrar-5.0.12-soname.patch |   11 +++++++++++
 3 files changed, 23 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-01 19:22:56 UTC (rev 195837)
+++ PKGBUILD	2013-10-01 20:38:48 UTC (rev 195838)
@@ -4,7 +4,7 @@
 
 pkgbase=unrar
 pkgname=('unrar' 'libunrar')
-pkgver=4.2.4
+pkgver=5.0.12
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -12,18 +12,20 @@
 license=('custom')
 makedepends=('gcc-libs')
 source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz"
-        'unrar-4.2.1-soname.patch')
-md5sums=('8ea9d1b4139474b282d76e627a2de3e4'
-         'b9ec767da9a36f5ac38034c974e77758')
+        'unrar-5.0.12-soname.patch')
+md5sums=('f090106c2819cf717ba42b4d5d71f1ed'
+         'cd9a5291db0379d73148872cf6e6d3ce')
 
+prepare() {
+  cd "${srcdir}/${pkgbase}"
+  patch -Np1 -i "${srcdir}/unrar-5.0.12-soname.patch"
+}
+
 build() {
   cd "${srcdir}/${pkgbase}"
-
-  patch -Np0 -i "${srcdir}/unrar-4.2.1-soname.patch"
-
   cp -a ${srcdir}/unrar ${srcdir}/libunrar
-  make -C "${srcdir}"/libunrar -f makefile.unix lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}"
-  make -f makefile.unix CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true"
+  make -C "${srcdir}"/libunrar lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}"
+  make CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true"
 }
 
 package_unrar() {
@@ -30,7 +32,6 @@
   pkgdesc="The RAR uncompression program"
   depends=('gcc-libs')
   cd "${srcdir}/${pkgbase}"
-
   install -Dm755 unrar "${pkgdir}/usr/bin/unrar"
   # install license
   install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -40,10 +41,9 @@
   pkgdesc="Library and header file for applications that use libunrar"
   depends=('gcc-libs')
   cd "${srcdir}/libunrar"
-
   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.4"
+  ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.5"
   ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so"
   # install license
   install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

Deleted: unrar-4.2.1-soname.patch
===================================================================
--- unrar-4.2.1-soname.patch	2013-10-01 19:22:56 UTC (rev 195837)
+++ unrar-4.2.1-soname.patch	2013-10-01 20:38:48 UTC (rev 195838)
@@ -1,11 +0,0 @@
---- 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

Added: unrar-5.0.12-soname.patch
===================================================================
--- unrar-5.0.12-soname.patch	                        (rev 0)
+++ unrar-5.0.12-soname.patch	2013-10-01 20:38:48 UTC (rev 195838)
@@ -0,0 +1,11 @@
+--- a/makefile	2013-04-29 16:27:05.000000000 +0200
++++ b/makefile	2013-10-01 22:07:29.611485989 +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




More information about the arch-commits mailing list