Attachment 157118 Details for Bug 242921 – proposed patch 2

[patch] proposed patch 2

redhat-rpm-config-brp-compress.patch (text/plain), 2.94 KB, created by Stepan Kasal on 2007-06-15 14:26:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stepan Kasal

Created: 2007-06-15 14:26:11 UTC

Size: 2.94 KB

patch

obsolete

>diff -urpN redhat-rpm-config-8.0.45.orig/brp-compress redhat-rpm-config-8.0.45/brp-compress
>--- redhat-rpm-config-8.0.45.orig/brp-compress	2004-10-15 23:02:36.000000000 +0200
>+++ redhat-rpm-config-8.0.45/brp-compress	2007-06-05 18:40:24.000000000 +0200
>@@ -17,40 +17,71 @@ for d in ./usr/man/man* ./usr/man/*/man*
> 	./usr/share/doc/*/man/man* ./usr/lib/*/man/man*
> do
>     [ -d $d ] || continue
>+    # Fix existing symbolic links first:
>+    for f in `find $d -type l`
>+    do
>+	l=`ls -l $f | sed -e 's/.* -> //' -e 's/\.gz$//' -e 's/\.bz2$//' -e 's/\.Z$//'`
>+	rm -f $f
>+	b=`echo $f | sed -e 's/\.gz$//' -e 's/\.bz2$//' -e 's/\.Z$//'`
>+	ln -sf $l$COMPRESS_EXT $b$COMPRESS_EXT
>+    done
>+
>+    # Then compress all the pages, replacing the "links" with real symlinks.
>+    handled_hardlinks=
>     for f in `find $d -type f`
>     do
>         [ -f "$f" ] || continue
> 	[ "`basename $f`" = "dir" ] && continue
> 
>-	case "$f" in
>+	# do not re-do the hard-linked pages multiple times:
>+	case " $handled_hardlinks " in
>+	*" $f "*) continue;;
>+	esac
>+
>+	case $f in
> 	 *.Z) gunzip -f $f; b=`echo $f | sed -e 's/\.Z$//'`;;
> 	 *.gz) gunzip -f $f; b=`echo $f | sed -e 's/\.gz$//'`;;
> 	 *.bz2) bunzip2 -f $f; b=`echo $f | sed -e 's/\.bz2$//'`;;
> 	 *) b=$f;;
> 	esac
> 
>-	$COMPRESS $b </dev/null 2>/dev/null || {
>-	    inode=`ls -i $b | awk '{ print $1 }'`
>-	    others=`find $d -type f -inum $inode`
>-	    if [ -n "$others" ]; then
>-		for afile in $others ; do
>-		    [ "$afile" != "$b" ] && rm -f $afile
>-		done
>-		$COMPRESS -f $b
>-		for afile in $others ; do
>-		    [ "$afile" != "$b" ] && ln $b$COMPRESS_EXT $afile$COMPRESS_EXT
>-		done
>-	    else
>-		$COMPRESS -f $b
>-	    fi
>-	}
>-    done
>+	# Try extracting the symlink:
>+	l=`sed -n '$s/^\.so  *//p;1q' "$f"`
>+	target=
>+	[ -n "$l" ] &&
>+	    for t in ../$l $l; do
>+	    	(cd `dirname $f` &&
>+		  [ -e "$t" -o -e "$t.gz" -o -e "$t.Z" -o -e "$t.bz2" ]
>+		) && target=$t && break
>+	    done
> 
>-    for f in `find $d -type l`
>-    do
>-	l=`ls -l $f | sed -e 's/.* -> //' -e 's/\.gz$//' -e 's/\.bz2$//' -e 's/\.Z$//'`
>-	rm -f $f
>-	b=`echo $f | sed -e 's/\.gz$//' -e 's/\.bz2$//' -e 's/\.Z$//'`
>-	ln -sf $l$COMPRESS_EXT $b$COMPRESS_EXT
>+	if [ -n "$target" ]; then
>+	    # simplify, if possible:
>+	    thedir=`dirname $f`
>+	    case $target in
>+	      ../${thedir##*/}/*) target=${target#../*/} ;;
>+	    esac
>+	    # ... then symlink:
>+	    rm -f $f
>+	    echo ln -sf $target$COMPRESS_EXT $f$COMPRESS_EXT >>/tmp/kasal
>+	    ln -sf $target$COMPRESS_EXT $f$COMPRESS_EXT
>+	else
>+	    $COMPRESS $b </dev/null 2>/dev/null || {
>+		inode=`ls -i $b | awk '{ print $1 }'`
>+		others=`find $d -type f -inum $inode`
>+		if [ -n "$others" ]; then
>+		    for afile in $others ; do
>+			[ "$afile" != "$b" ] && rm -f $afile
>+		    done
>+		    $COMPRESS -f $b
>+		    for afile in $others ; do
>+			[ "$afile" != "$b" ] && ln $b$COMPRESS_EXT $afile$COMPRESS_EXT
>+			handled_hardlinks="$handled_hardlinks $afile$COMPRESS_EXT"
>+		    done
>+		else
>+		    $COMPRESS -f $b
>+		fi
>+	    }
>+	fi
>     done
> done

Actions: View | Diff

Attachments on bug 242921: 156349 | 157118