pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 55227 from home:msmeissn:branches:Base:System

Browse Source 
na das ist ja jetzt sicher

OBS-URL: https://build.opensuse.org/request/show/55227
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=79
This commit is contained in:
Stephan Kulow 2010-12-08 14:59:30 +00:00 committed by Git OBS Bridge
parent ad94ee7229
commit 69cc6531d8
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
brpcombress.diff
View File

@ -1,5 +1,7 @@
--- ./scripts/brp-compress.orig 2009-12-07 14:36:49.000000000 +0000 Index: scripts/brp-compress
+++ ./scripts/brp-compress 2010-03-25 15:11:29.000000000 +0000 ===================================================================
--- scripts/brp-compress.orig
+++ scripts/brp-compress
@@ -1,16 +1,43 @@ @@ -1,16 +1,43 @@
-#!/bin/sh -#!/bin/sh
+#!/bin/bash +#!/bin/bash
@ -45,16 +47,51 @@
for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \ for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \ ./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \ ./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \
@@ -23,9 +50,9 @@ do @@ -23,34 +50,34 @@ do
[ "`basename $f`" = "dir" ] && continue [ "`basename $f`" = "dir" ] && continue
case "$f" in case "$f" in
- *.gz|*.Z) gunzip $f; b=`echo $f | sed -e 's/\.\(gz\|Z\)$//'`;; - *.gz|*.Z) gunzip $f; b=`echo $f | sed -e 's/\.\(gz\|Z\)$//'`;;
- *.bz2) bunzip2 $f; b=`echo $f | sed -e 's/\.bz2$//'`;; - *.bz2) bunzip2 $f; b=`echo $f | sed -e 's/\.bz2$//'`;;
- *.xz|*.lzma) unxz $f; b=`echo $f | sed -e 's/\.\(xz\|lzma\)$//'`;; - *.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\)$//'`;; - *) b=$f;;
+ *.bz2) bunzip2 $f || check_for_hard_link $d $f; b=`echo $f | sed -e 's/\.bz2$//'`;; + *.gz|*.Z) gunzip "$f" || check_for_hard_link $d "$f"; b="`echo $f | sed -e 's/\.\(gz\|Z\)$//'`";;
+ *.xz|*.lzma) unxz $f || check_for_hard_link $d $f; b=`echo $f | sed -e 's/\.\(xz\|lzma\)$//'`;; + *.bz2) bunzip2 "$f" || check_for_hard_link $d "$f"; b="`echo $f | sed -e 's/\.bz2$//'`";;
*) b=$f;; + *.xz|*.lzma) unxz "$f" || check_for_hard_link $d "$f"; b="`echo $f | sed -e 's/\.\(xz\|lzma\)$//'`";;
+ *) b="$f";;
esac esac
- $COMPRESS $b </dev/null 2>/dev/null || {
+ $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
+ [ "$afile" != "$b" ] && rm -f "$afile"
done
- $COMPRESS -f $b
+ $COMPRESS -f "$b"
for afile in $others ; do
- [ "$afile" != "$b" ] && ln $b$COMPRESS_EXT $afile$COMPRESS_EXT
+ [ "$afile" != "$b" ] && ln "$b$COMPRESS_EXT" "$afile$COMPRESS_EXT"
done
else
- $COMPRESS -f $b
+ $COMPRESS -f "$b"
fi
}
done
for f in `find $d -type l`
do
- l=`ls -l $f | sed -e 's/.* -> //' -e 's/\.\(gz\|Z\|bz2\|xz\|lzma\)$//'`
- rm -f $f
- b=`echo $f | sed -e 's/\.\(gz\|Z\|bz2\|xz\|lzma\)$//'`
- ln -sf $l$COMPRESS_EXT $b$COMPRESS_EXT
+ l="`ls -l "$f" | sed -e 's/.* -> //' -e 's/\.\(gz\|Z\|bz2\|xz\|lzma\)$//'`"
+ rm -f "$f"
+ b="`echo $f | sed -e 's/\.\(gz\|Z\|bz2\|xz\|lzma\)$//'`"
+ ln -sf "$l$COMPRESS_EXT" "$b$COMPRESS_EXT"
done
done

5
rpm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 8 13:05:06 UTC 2010 - meissner@novell.com
- handle spaces in manpage filenames (like e.g. in boost).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 7 14:33:33 UTC 2010 - coolo@novell.com Tue Dec 7 14:33:33 UTC 2010 - coolo@novell.com