pool/rpm
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

- update to rpm-4.8.0

Browse Source 
* updated python bindings
  * new transaction ordering code

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=40
This commit is contained in:
Michael Schröder
2010-03-26 10:56:28 +00:00
committed by Git OBS Bridge
parent 3de0fb7483
commit a6846b83ca
30 changed files with 960 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
brpcombress.diff
View File

@@ -1,8 +1,11 @@
make brp-compress deal correctly with hardlinked man pages
--- ./scripts/brp-compress.orig 2004-10-17 18:49:52.000000000 +0000
+++ ./scripts/brp-compress 2005-12-15 14:03:58.000000000 +0000
@@ -5,12 +5,38 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD
--- ./scripts/brp-compress.orig 2009-12-07 14:36:49.000000000 +0000
+++ ./scripts/brp-compress 2010-03-25 15:11:29.000000000 +0000
@@ -1,16 +1,43 @@
-#!/bin/sh
+#!/bin/bash
# If using normal root, avoid changing anything.
if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
exit 0
fi
@@ -20,7 +23,6 @@ make brp-compress deal correctly with hardlinked man pages
+{
+ dir=$1
+ b=$2
+ type=$3
+
+ inode=`ls -i $b | awk '{ print $1 }'`
+ others=`find $dir -type f -inum $inode`
@@ -28,11 +30,13 @@ make brp-compress deal correctly with hardlinked man pages
+ [ "$afile" != "$b" ] && rm -f $afile
+ done
+
+ case $type in
+ Z|gz) gunzip $b ;;
+ bz2) bunzip2 $b ;;
+ case $b in
+ *.Z|*.gz) gunzip $b ;;
+ *.bz2) bunzip2 $b ;;
+ *.xz|*.lzma) unxz $b ;;
+ esac
+
+ type=${b##*.}
+ for afile in $others ; do
+ [ "${afile%.$type}" != "${b%.$type}" ] && ln ${b%.$type} ${afile%.$type}
+ done
@@ -41,16 +45,16 @@ make brp-compress deal correctly with hardlinked man pages
for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \
@@ -23,9 +49,9 @@ do
@@ -23,9 +50,9 @@ do
[ "`basename $f`" = "dir" ] && continue
case "$f" in
- *.Z) gunzip $f; b=`echo $f | sed -e 's/\.Z$//'`;;
- *.gz) gunzip $f; b=`echo $f | sed -e 's/\.gz$//'`;;
- *.bz2) bunzip2 $f; b=`echo $f | sed -e 's/\.bz2$//'`;;
+ *.Z) gunzip $f || check_for_hard_link $d $f Z; b=`echo $f | sed -e 's/\.Z$//'`;;
+ *.gz) gunzip $f || check_for_hard_link $d $f gz; b=`echo $f | sed -e 's/\.gz$//'`;;
+ *.bz2) bunzip2 $f || check_for_hard_link $d $f bz2; b=`echo $f | sed -e 's/\.bz2$//'`;;
- *.gz|*.Z) gunzip $f; b=`echo $f | sed -e 's/\.\(gz\|Z\)$//'`;;
- *.bz2) bunzip2 $f; b=`echo $f | sed -e 's/\.bz2$//'`;;
- *.xz|*.lzma) unxz $f; b=`echo $f | sed -e 's/\.\(xz\|lzma\)$//'`;;
+ *.gz|*.Z) gunzip $f || check_for_hard_link $d $f; b=`echo $f | sed -e 's/\.\(gz\|Z\)$//'`;;
+ *.bz2) bunzip2 $f || check_for_hard_link $d $f; b=`echo $f | sed -e 's/\.bz2$//'`;;
+ *.xz|*.lzma) unxz $f || check_for_hard_link $d $f; b=`echo $f | sed -e 's/\.\(xz\|lzma\)$//'`;;
*) b=$f;;
esac