[arch-commits] Commit in qt3/trunk (PKGBUILD qt.install)

[Pierre Schmitz]

    Date: Sunday, February 14, 2010 @ 10:15:52
  Author: pierre
Revision: 68838

upgpkg: qt3 3.3.8-15
rebuild due to FS#18238

Modified:
  qt3/trunk/PKGBUILD
  qt3/trunk/qt.install

------------+
 PKGBUILD   |    5 ++++-
 qt.install |    7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-14 14:35:34 UTC (rev 68837)
+++ PKGBUILD	2010-02-14 15:15:52 UTC (rev 68838)
@@ -4,7 +4,7 @@
 
 pkgname=qt3
 pkgver=3.3.8
-pkgrel=14
+pkgrel=15
 pkgdesc="The QT gui toolkit."
 arch=(i686 x86_64)
 license=('GPL')
@@ -112,4 +112,7 @@
   # install man pages
   mkdir -p $startdir/pkg/opt/qt/man
   cp -r $startdir/src/$pkgfqn/doc/man/{man1,man3} $startdir/pkg/opt/qt/man/
+
+  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+  echo '/opt/qt/lib' > ${pkgdir}/etc/ld.so.conf.d/qt3.conf
 }

Modified: qt.install
===================================================================
--- qt.install	2010-02-14 14:35:34 UTC (rev 68837)
+++ qt.install	2010-02-14 15:15:52 UTC (rev 68838)
@@ -1,11 +1,12 @@
 post_install() {
-	grep -q '/opt/qt/lib' etc/ld.so.conf || echo '/opt/qt/lib' >> etc/ld.so.conf
+	post_remove
 }
 
 post_upgrade() {
-	post_install
+	post_remove
 }
 
 post_remove() {
-	sed  -ie '/\/opt\/qt\/lib/d' etc/ld.so.conf		
+	# this can be removed in future versions
+	sed  -ie '/\/opt\/qt\/lib/d' etc/ld.so.conf
 }