- redone _noautocompress handling to use parameter instead of file

- killed all no longer necessary builddir locking, at last!
  (modified files: compress-doc, compress-doc.patch, rpm.macros)
- release .20.7 - for heavy testing again, then release can be increased to .21

Changed files:
    rpm-compress-doc -> 1.7
    rpm-compress-doc.patch -> 1.5
    rpm.macros -> 1.126
    rpm.spec -> 1.462

diff --git a/rpm-compress-doc b/rpm-compress-doc
index b9a18fd93640936c8e120b80892f549946f54067..766649dc304f647b406ab49eb537720ddb75fdae 100644 (file)
--- a/rpm-compress-doc
+++ b/rpm-compress-doc
@@ -3,20 +3,35 @@
 # Compress documentation files found in $DOCDIR. Omit some files we don't
 # want to get compressed.
 #
-# $RPM_BUILD_DIR/__rpm_noautocompressdoc can contain whitespace delimated
-# list of patters to ommit.
+# /etc/rpm/noautocompressdoc and --noautocompressdoc= option can contain
+# whitespace delimated list of patters to omit.
 #
 
 #set -x
 
 COMPRESS_CMD="gzip -9nf"
-EXCLUDE_SUFFIXES="htm html jpg jpeg png gif pdf css dia js HTM JPG PNG GIF PDF CSS"
+EXCLUDE_SUFFIXES="htm html jpg jpeg png gif pdf css dia js HTM JPG PNG GIF PDF CSS JS"
 EXCLUDE_MASKS=
 RECOMPRESS_BZIP2=yes
 
-if test -f $RPM_BUILD_DIR/__rpm_noautocompressdoc ; then
-       EXCLUDE_MASKS=$(cat $RPM_BUILD_DIR/__rpm_noautocompressdoc | \
-                       xargs echo | sed -e 's/^ *//; s/ *$//; s/ \+/|/g')
+nocompressdoc=''
+while [ $# -gt 0 ]; do
+       case "$1" in
+         --noautocompressdoc=*)
+               EXCLUDE_MASKS=`echo "${1#--noautocompressdoc=}" | sed -e 's/^ *//;s/ *$//;s/ \+/|/g'`
+       esac
+       shift
+done
+
+if [ -r /etc/rpm/noautocompressdoc ]; then
+       exclude=$(cat /etc/rpm/noautocompressdoc | grep -v '^#' | xargs echo | sed -e 's/^ *//;s/ *$//;s/ \+/|/g')
+       if [ -n "${exclude}" ]; then
+               if [ -n "${EXCLUDE_MASKS}" ]; then
+                       EXCLUDE_MASKS="${EXCLUDE_MASKS}|${exclude}"
+               else
+                       EXCLUDE_MASKS="${exclude}"
+               fi
+       fi
 fi
 
 if [ "$DOCDIR" = "" ] ; then

diff --git a/rpm-compress-doc.patch b/rpm-compress-doc.patch
index c044405a89810c4b6fe595df7242fac005f77ce0..7c3661fd1806a263b4c78d3acbdfe314c06b7e7c 100644 (file)
--- a/rpm-compress-doc.patch
+++ b/rpm-compress-doc.patch
@@ -26,7 +26,7 @@ diff -ur rpm-4.0.4/platform.in rpm-4.0.4-/platform.in
  %{nil}
  
 +# Executed at after copying %doc to DOCDIR, with $DOCDIR set
-+%__compress_doc               @prefix@/lib/rpm/compress-doc
++%__compress_doc               @prefix@/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
 +
  @redhat@#---------------------------------------------------------------------
  @redhat@#     Expanded at end of %prep

diff --git a/rpm.macros b/rpm.macros
index 97e62525715c8f7a0681bee5fa5f47c2ab56bcdc..217181266c369ca49016028234ed09e7090b0df8 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -330,38 +330,14 @@ echo "Compress kernel modules if any."; \
 ###################################################################
 # Requires/Provides automation
 # exceptions system by Jacek Konieczny <jajcus@pld.org.pl>
-%__spec_prep_pre \
-_autoreqprov=n \
-%{?_noautocompressdoc:_autoreqprov=y}\
-if [ "$_autoreqprov" = "y" ] ; then \
-    if [ -f %{_builddir}/__rpm_lock ] ; then \
-       echo "Some package using \%_noauto*  macros is already being built" >&2 \
-       echo "If it is not true delete %{_builddir}/__rpm_lock" >&2 \
-       exit 1 \
-    else \
-       rm -f %{_builddir}/__rpm_*\
-       touch %{_builddir}/__rpm_lock \
-    fi \
-fi \
-%{?_noautocompressdoc:echo '%{_noautocompressdoc}' > %{_builddir}/__rpm_noautocompressdoc}\
-%{___build_pre}\
-%{nil}
-
-
-%__spec_clean_pre      %{___build_pre}\
-_autoreqprov=n \
-%{?_noautocompressdoc:_autoreqprov=y}\
-if [ "$_autoreqprov" = "y" ] ; then \
-       rm -f %{_builddir}/__rpm_* \
-fi \
-%{nil}
-
-
-#%_noautoreqfiles      "%{_defaultdocdir}.*" "%{_examplesdir}.*"
+#
+#%_noautoreqfiles      '%{_defaultdocdir}.*' '%{_examplesdir}.*'
 #%_noautoreq           %{nil}
 #%_noautoreqdep                %{nil}
 #%_noautoprovfiles     %{nil}
 #%_noautoprov          %{nil}
+#%_noautocompressdoc   %{nil}
+#
 %_missing_doc_files_terminate_build    1%{nil}
 %_unpackaged_files_terminate_build     %{nil}
 # (X)emacs support

diff --git a/rpm.spec b/rpm.spec
index fd5dabcbd60f58b824775d42b1d119d49b07fc35..42d8d81dba9846646c6a0657056d477927fab2c0 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -29,7 +29,7 @@ Summary(uk):  
 Name:          rpm
 %define        ver     4.3
 Version:       %{ver}
-%define        rel     0.%{snap}.20.6
+%define        rel     0.%{snap}.20.7
 Release:       %{rel}
 License:       GPL
 Group:         Base
@@ -76,7 +76,7 @@ Patch16:      %{name}-etc_dir.patch
 Patch17:       %{name}-system_libs-more.patch
 Patch18:       %{name}-php-deps.patch
 Patch19:       %{name}-python-fix.patch
-#Patch20:      %{name}-spec-prep-pre.patch
+
 Patch21:       %{name}-perl_req.patch
 Patch22:       %{name}-system_libs_more.patch
 Patch23:       %{name}-python_2_3.patch
@@ -547,7 +547,6 @@ construir pacotes usando o RPM.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-# patch20 -- look down
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
@@ -563,7 +562,6 @@ install %{SOURCE12} scripts/php.prov.in
 install %{SOURCE13} scripts/php.req.in
 install %{SOURCE33} scripts/perl.prov
 cat %{SOURCE14} >> macros.in
-# %patch20 -p1 -- merged into macros
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
@@ -695,6 +693,9 @@ libgtkmozembed.so
 libgtksuperwin.so
 libxpcom.so
 EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc <<EOF
+# global list of file masks not to be compressed in DOCDIR
+EOF
 
 # for rpm -e|-U --repackage
 install -d $RPM_BUILD_ROOT/var/spool/repackage