From 69cc6531d883cf22b06982cef9bb7facd7c6275f69249e1fdec1f3705a3f2706 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 8 Dec 2010 14:59:30 +0000 Subject: [PATCH] Accepting request 55227 from home:msmeissn:branches:Base:System 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 --- brpcombress.diff | 51 +++++++++++++++++++++++++++++++++++++++++------- rpm.changes | 5 +++++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/brpcombress.diff b/brpcombress.diff index c879014..fff1a7e 100644 --- a/brpcombress.diff +++ b/brpcombress.diff @@ -1,5 +1,7 @@ ---- ./scripts/brp-compress.orig 2009-12-07 14:36:49.000000000 +0000 -+++ ./scripts/brp-compress 2010-03-25 15:11:29.000000000 +0000 +Index: scripts/brp-compress +=================================================================== +--- scripts/brp-compress.orig ++++ scripts/brp-compress @@ -1,16 +1,43 @@ -#!/bin/sh +#!/bin/bash @@ -45,16 +47,51 @@ 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 +50,9 @@ do +@@ -23,34 +50,34 @@ do [ "`basename $f`" = "dir" ] && continue case "$f" in - *.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;; +- *) b=$f;; ++ *.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 +- $COMPRESS $b /dev/null || { ++ $COMPRESS "$b" /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 diff --git a/rpm.changes b/rpm.changes index 1a2daec..6f7e9fc 100644 --- a/rpm.changes +++ b/rpm.changes @@ -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