wok diff rpm4/receipt @ rev 14848
realvnc-viewer: typo
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Jul 18 09:44:52 2013 +0000 (2013-07-18) |
parents | 8e4c74abdf74 |
children | 7896f0694ef6 |
line diff
1.1 --- a/rpm4/receipt Mon Jan 02 23:06:19 2012 +0100 1.2 +++ b/rpm4/receipt Thu Jul 18 09:44:52 2013 +0000 1.3 @@ -1,18 +1,18 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="rpm4" 1.7 -VERSION="4.8.1" 1.8 +VERSION="4.10.0" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="RPM Package Manager" 1.11 MAINTAINER="erjo@slitaz.org" 1.12 DEPENDS="popt beecrypt bzlib expat sqlite zlib gcc-lib-base neon libkrb5 \ 1.13 libcomerr3 nss nspr db liblzma libmagic" 1.14 BUILD_DEPENDS="beecrypt beecrypt-dev popt-dev gettext zlib-dev python-dev \ 1.15 -nss-dev nspr-dev db-dev liblzma-dev libmagic-dev" 1.16 +nss-dev nspr-dev db-dev liblzma liblzma-dev libmagic-dev" 1.17 SOURCE="rpm" 1.18 TARBALL="$SOURCE-$VERSION.tar.bz2" 1.19 WEB_SITE="http://www.rpm.org/" 1.20 -WGET_URL="http://www.rpm.org/releases/rpm-${VERSION:0:3}.x/$TARBALL" 1.21 +WGET_URL="http://www.rpm.org/releases/rpm-${VERSION:0:4}.x/$TARBALL" 1.22 TAGS="package-manager" 1.23 1.24 # Rules to configure and make the package. 1.25 @@ -29,7 +29,7 @@ 1.26 --with-external-db \ 1.27 --mandir=/usr/share/man $CONFIGURE_ARGS && 1.28 make $MAKEFLAGS && 1.29 - make DESTDIR=$PWD/_pkg install 1.30 + make DESTDIR=$DESTDIR install 1.31 } 1.32 1.33 # Rules to gen a SliTaz package suitable for Tazpkg. 1.34 @@ -44,10 +44,10 @@ 1.35 $fs/usr/src/redhat/SPECS \ 1.36 $fs/usr/src/redhat/SRPMS 1.37 1.38 - cp -a $_pkg/usr/bin $fs/usr 1.39 - cp -a $_pkg/bin/* $fs/usr/bin 1.40 - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 1.41 - cp -a $_pkg/usr/lib/rpm $fs/usr/lib 1.42 + cp -a $install/usr/bin $fs/usr 1.43 + cp -a $install/bin/* $fs/usr/bin 1.44 + cp -a $install/usr/lib/*.so* $fs/usr/lib 1.45 + cp -a $install/usr/lib/rpm $fs/usr/lib 1.46 } 1.47 1.48 post_install() 1.49 @@ -76,8 +76,8 @@ 1.50 1.51 pre_remove() 1.52 { 1.53 - if [ -d /var/lib/rpm ]; then 1.54 - rm -f /var/lib/rpm/* 1.55 + if [ -d $1/var/lib/rpm ]; then 1.56 + rm -f $1/var/lib/rpm/* 1.57 fi 1.58 } 1.59 1.60 @@ -85,10 +85,10 @@ 1.61 { 1.62 echo "Processing post remove commands..." 1.63 cmd=`readlink $root/bin/rpm` 1.64 - if [ ! "$cmd" = "/bin/rpm" ]; then 1.65 - echo -n "Restore applets from busybox..." 1.66 - ln -sf $root/bin/busybox $root/bin/rpm 1.67 - ln -sf $root/bin/busybox $root/usr/bin/rpm2cpio 1.68 - status 1.69 - fi 1.70 + if [ ! "$cmd" = "/bin/rpm" ]; then 1.71 + echo -n "Restore applets from busybox..." 1.72 + ln -sf $root/bin/busybox $root/bin/rpm 1.73 + ln -sf $root/bin/busybox $root/usr/bin/rpm2cpio 1.74 + status 1.75 + fi 1.76 }