[arch-commits] Commit in kdelibs3/repos (3 files)

[Pierre Schmitz]

    Date: Friday, August 7, 2009 @ 10:12:07
  Author: pierre
Revision: 49397

Merged revisions 49396 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/kdelibs3/trunk

........
  r49396 | pierre | 2009-08-07 16:11:33 +0200 (Fr, 07 Aug 2009) | 2 lines
  
  upgpkg: kdelibs3 3.5.10-7
      don't break apps that are not build with full rpath
........

Modified:
  kdelibs3/repos/extra-x86_64/	(properties)
  kdelibs3/repos/extra-x86_64/PKGBUILD
  kdelibs3/repos/extra-x86_64/kdelibs3.install

------------------+
 PKGBUILD         |    2 +-
 kdelibs3.install |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)


Property changes on: kdelibs3/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdelibs3/trunk:1-49372
   + /kdelibs3/trunk:1-49396

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-07 14:11:33 UTC (rev 49396)
+++ extra-x86_64/PKGBUILD	2009-08-07 14:12:07 UTC (rev 49397)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs3
 pkgver=3.5.10
-pkgrel=6
+pkgrel=7
 pkgdesc="KDE3 Core Libraries"
 arch=('i686' 'x86_64')
 url="http://www.kde.org"

Modified: extra-x86_64/kdelibs3.install
===================================================================
--- extra-x86_64/kdelibs3.install	2009-08-07 14:11:33 UTC (rev 49396)
+++ extra-x86_64/kdelibs3.install	2009-08-07 14:12:07 UTC (rev 49397)
@@ -1,9 +1,11 @@
+post_install() {
+	grep -q '/opt/kde/lib' etc/ld.so.conf || echo '/opt/kde/lib' >> etc/ld.so.conf
+}
+
 post_upgrade() {
-	if [ "$(vercmp $2 3.5.10-6)" -lt 0 ]; then
-		sed  -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
-	fi
+	post_install
 }
 
 post_remove() {
-	post_upgrade
+	sed  -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
 }