SliTaz Repositories

     1.1 --- a/rpm4/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/rpm4/receipt	Fri Dec 25 15:23:46 2015 +0200
     1.3 @@ -22,14 +22,14 @@
     1.4  {
     1.5  	cd $src
     1.6  	CPPFLAGS="$CPPFLAGS -I/usr/include/nspr -I/usr/include/nss" ./configure \
     1.7 -	--prefix=/usr  \
     1.8 -	 --infodir=/usr/share/info \
     1.9 -	 --with-selinux=no \
    1.10 -	 --with-lua=no \
    1.11 -	 --with-dmalloc=no \
    1.12 -	 --with-efence=no \
    1.13 -	 --with-external-db \
    1.14 -	 --mandir=/usr/share/man $CONFIGURE_ARGS &&
    1.15 +		--prefix=/usr  \
    1.16 +		--infodir=/usr/share/info \
    1.17 +		--with-selinux=no \
    1.18 +		--with-lua=no \
    1.19 +		--with-dmalloc=no \
    1.20 +		--with-efence=no \
    1.21 +		--with-external-db \
    1.22 +		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    1.23  	make $MAKEFLAGS &&
    1.24  	make DESTDIR=$DESTDIR install
    1.25  }
    1.26 @@ -37,7 +37,8 @@
    1.27  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.28  genpkg_rules()
    1.29  {
    1.30 -	mkdir -p $fs/usr/bin \
    1.31 +	mkdir -p \
    1.32 +		$fs/usr/bin \
    1.33  		$fs/usr/lib \
    1.34  		$fs/var/lib/rpm \
    1.35  		$fs/usr/src/redhat/SOURCES \
    1.36 @@ -45,7 +46,7 @@
    1.37  		$fs/usr/src/redhat/RPMS \
    1.38  		$fs/usr/src/redhat/SPECS \
    1.39  		$fs/usr/src/redhat/SRPMS
    1.40 -		
    1.41 +
    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 @@ -54,26 +55,25 @@
    1.46  
    1.47  post_install()
    1.48  {
    1.49 -	echo "Processing post install commands..."
    1.50 -	cmd=`readlink $root/bin/rpm`
    1.51 -    if [ ! "$cmd" = "/usr/bin/rpm" ]; then
    1.52 -        echo ""
    1.53 -        echo "**** Actual RPM link : $cmd"
    1.54 -        echo ""
    1.55 -        echo -n "Do you want rpm  for /bin/rpm (Y/n) ? : "; read -t 30 anser
    1.56 -        if [ "$anser" != "n" ]; then
    1.57 -            echo ""
    1.58 -            echo -n "Removing rpm link to make a new one pointing on /usr/bin/rpm..."
    1.59 -            rm $root/bin/rpm && ln -sf $root/usr/bin/rpm $root/bin/rpm
    1.60 -            status
    1.61 -        else
    1.62 -            echo ""
    1.63 -            echo "Leaving /bin/rpm to : $cmd"
    1.64 -        fi
    1.65 -    fi
    1.66 -                
    1.67 -    # Building rpm database.
    1.68 -	$root/usr/bin/rpm --initdb --quiet
    1.69 +	cmd=$(readlink $root/bin/rpm)
    1.70 +	if [ "$cmd" != '/usr/bin/rpm' ]; then
    1.71 +		echo ''
    1.72 +		echo "**** Actual RPM link : $cmd"
    1.73 +		echo ''
    1.74 +		echo -n 'Do you want rpm for /bin/rpm (Y/n) ? : '; read -t 30 anser
    1.75 +		if [ "$anser" != 'n' ]; then
    1.76 +			echo ''
    1.77 +			action 'Removing rpm link to make a new one pointing on /usr/bin/rpm...'
    1.78 +			rm $root/bin/rpm && ln -sf $root/usr/bin/rpm $root/bin/rpm
    1.79 +			status
    1.80 +		else
    1.81 +			echo ''
    1.82 +			echo "Leaving /bin/rpm to : $cmd"
    1.83 +		fi
    1.84 +	fi
    1.85 +
    1.86 +	# Building rpm database.
    1.87 +	$1/usr/bin/rpm --initdb --quiet
    1.88  }
    1.89  
    1.90  pre_remove()
    1.91 @@ -85,10 +85,10 @@
    1.92  
    1.93  post_remove()
    1.94  {
    1.95 -	echo "Processing post remove commands..."
    1.96  	cmd=$(readlink "$1/bin/rpm")
    1.97 -    	if [ ! "$cmd" = "/bin/rpm" ]; then
    1.98 -		echo -n "Restore applets from busybox..."
    1.99 +	if [ "$cmd" != '/bin/rpm' ]; then
   1.100 +		newline
   1.101 +		action 'Restore applets from busybox...'
   1.102  		ln -sf /bin/busybox "$1/bin/rpm"
   1.103  		ln -sf /bin/busybox "$1/usr/bin/rpm2cpio"
   1.104  		status