[arch-commits] Commit in nss/trunk (PKGBUILD nss-no-rpath.patch)

[Jan de Groot]

    Date: Monday, October 29, 2012 @ 06:48:47
  Author: jgc
Revision: 169788

upgpkg: nss 3.14-1

3.14, remove rpath patch, as upstream only applies these when building packages for sun

Modified:
  nss/trunk/PKGBUILD
Deleted:
  nss/trunk/nss-no-rpath.patch

--------------------+
 PKGBUILD           |   10 +++-------
 nss-no-rpath.patch |   14 --------------
 2 files changed, 3 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-29 10:29:15 UTC (rev 169787)
+++ PKGBUILD	2012-10-29 10:48:47 UTC (rev 169788)
@@ -2,24 +2,22 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nss
-pkgver=3.13.6
+pkgver=3.14
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.9.2
+_nsprver=4.9.3
 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
 makedepends=('perl')
 options=('!strip')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
-        nss-no-rpath.patch
         nss.pc.in
         nss-config.in
         ssl-renegotiate-transitional.patch
         add_spi+cacert_ca_certs.patch)
-sha1sums=('1f86a7c787e8fe3ebd1dd1cce127e57fb347dac3'
-          'c8fcdb153af9d39689243119adb475905a657284'
+sha1sums=('ace3642fb2ca67854ea7075d053ca01a6d81e616'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
           '8a964a744ba098711b80c0d279a2993524e8eb92'
@@ -33,8 +31,6 @@
 
   # Adds transitional SSL renegotiate support - patch from Debian
   patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
-  # Removes rpath
-  patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
 
   # Respect LDFLAGS
   sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \

Deleted: nss-no-rpath.patch
===================================================================
--- nss-no-rpath.patch	2012-10-29 10:29:15 UTC (rev 169787)
+++ nss-no-rpath.patch	2012-10-29 10:48:47 UTC (rev 169788)
@@ -1,14 +0,0 @@
---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
-+++ ./mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
-@@ -52,9 +52,9 @@
- 
- ifeq ($(OS_ARCH), Linux)
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
- endif
- endif
-