diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | UPSTREAM | 5 | ||||
| -rwxr-xr-x | brp-compress | 57 |
4 files changed, 1 insertions, 63 deletions
diff --git a/Makefile.am b/Makefile.am index 56e39cc..9ca9772 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,6 @@ pkg_gconfig = \ $(if $(CANONTARGETCPU32), platform32, ) pkg_scripts = \ - brp-compress \ brp-java-repack-jars \ drop-ld-no-undefined-for-shared-lib-modules-in-libtool \ filter.sh \ @@ -1,3 +1,4 @@ +- drop unused brp-compress (obsoleted by spec-helper 4 years ago) - use upstream find-debuginfo.sh as we merged our changes back into rpm package Version 1.153 - 31 Jul 2012, by Thierry Vignaud @@ -1,11 +1,6 @@ "-" denotes upstream features we lack "+" denotes Mageia features -Those that could be replaced by patches: - -- brp-compress: - + we default to bzip2 instead of gzip - Other divergences: - perl.prov, perl.req: quite some work prior to merge but doable diff --git a/brp-compress b/brp-compress deleted file mode 100755 index e4da043..0000000 --- a/brp-compress +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -# $Id: brp-compress 11488 2005-04-29 03:14:31Z othauvin $ - -# If using normal root, avoid changing anything. -if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then - exit 0 -fi - -cd "$RPM_BUILD_ROOT" - -# Compress man pages -COMPRESS="bzip2 -9" -COMPRESS_EXT=.bz2 - -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* \ - ./usr/share/doc/*/man/man* ./usr/lib/*/man/man* -do - [ -d $d ] || continue - for f in `find $d -type f ! -name dir` - do - [ -f "$f" ] || continue - - case "$f" in - *.gz|*.Z) gunzip -f $f; b=`echo $f | sed -e 's/\.\(gz\|Z\)$//'`;; - *.bz2) bunzip2 -f $f; b=`echo $f | sed -e 's/\.bz2$//'`;; - *.xz|*.lzma) unxz -f $f; b=`echo $f | sed -e 's/\.\(xz\|lzma\)$//'`;; - *) 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 - - 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 - done -done |