From 7fd0493cded61ebcf8f7b93571956472801c83a7 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sun, 4 Oct 2009 22:09:13 -0700
Subject: libjpeg6:Modified install to add /opt/libjpeg6/lib instead of
 include.

---
 abs/core-testing/libjpeg6/PKGBUILD         |  2 +-
 abs/core-testing/libjpeg6/libjpeg6.install | 24 ++++++++----------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/abs/core-testing/libjpeg6/PKGBUILD b/abs/core-testing/libjpeg6/PKGBUILD
index 098b6b7..659aaf6 100644
--- a/abs/core-testing/libjpeg6/PKGBUILD
+++ b/abs/core-testing/libjpeg6/PKGBUILD
@@ -3,7 +3,7 @@
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=libjpeg6
 pkgver=6b
-pkgrel=10
+pkgrel=11
 pkgdesc="Library of JPEG support functions"
 arch=('i686' 'x86_64')
 url="http://ijg.org"
diff --git a/abs/core-testing/libjpeg6/libjpeg6.install b/abs/core-testing/libjpeg6/libjpeg6.install
index 9ad4afe..0d3173d 100644
--- a/abs/core-testing/libjpeg6/libjpeg6.install
+++ b/abs/core-testing/libjpeg6/libjpeg6.install
@@ -1,25 +1,17 @@
 # arg 1:  the new package version
 post_install() {
-	if grep -q libjpeg6 /etc/ld.so.conf
-	then
-		exit
-	else
-		echo "/opt/libjpeg6/include" >> /etc/ld.so.conf
-		ldconfig
-	fi
-	ln -s /opt/libjpeg6/lib/libjpeg.so.62 /usr/lib/libjpeg.so.62
+	grep -v libjpeg6 /etc/ld.so.conf > /tmp/ld.so.conf
+	mv /tmp/ld.so.conf /etc/ld.so.conf
+	echo "/opt/libjpeg6/lib" >> /etc/ld.so.conf
+	ldconfig
 }
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-	if grep -q libjpeg6 /etc/ld.so.conf
-	then
-		exit
-	else
-		echo "/opt/libjpeg6/include" >> /etc/ld.so.conf
-		ldconfig
-	fi
-	ln -sf /opt/libjpeg6/lib/libjpeg.so.62 /usr/lib/libjpeg.so.62
+	grep -v libjpeg6 /etc/ld.so.conf > /tmp/ld.so.conf
+	mv /tmp/ld.so.conf /etc/ld.so.conf
+	echo "/opt/libjpeg6/lib" >> /etc/ld.so.conf
+	ldconfig
 }
 # arg 1:  the old package version
 post_remove() {
-- 
cgit v0.12

