diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-10-07 23:00:37 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-10-07 23:00:37 (GMT) |
| commit | 5ff0e78a8bfa59cf5709fbbc384aa857fac2a298 (patch) | |
| tree | e2b38b3803549e2fbf962cbf8901cb32453a91e1 | |
| parent | 8d8eb60e1812a930e0b6779670967f818c4b14b3 (diff) | |
| parent | 7fd0493cded61ebcf8f7b93571956472801c83a7 (diff) | |
| download | linhes_pkgbuild-5ff0e78a8bfa59cf5709fbbc384aa857fac2a298.zip linhes_pkgbuild-5ff0e78a8bfa59cf5709fbbc384aa857fac2a298.tar.gz linhes_pkgbuild-5ff0e78a8bfa59cf5709fbbc384aa857fac2a298.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
| -rw-r--r-- | abs/core-testing/libjpeg6/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core-testing/libjpeg6/libjpeg6.install | 24 | ||||
| -rw-r--r-- | abs/core-testing/mjpegtools/PKGBUILD | 2 |
3 files changed, 10 insertions, 18 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() { diff --git a/abs/core-testing/mjpegtools/PKGBUILD b/abs/core-testing/mjpegtools/PKGBUILD index 4265256..13c9061 100644 --- a/abs/core-testing/mjpegtools/PKGBUILD +++ b/abs/core-testing/mjpegtools/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mjpegtools pkgver=1.9.0 -pkgrel=10 +pkgrel=11 pkgdesc="The mjpeg programs are a set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video under Linux. " arch=(i686 x86_64) license=('GPL') |