- release 1.7 (debuginfo fixes).

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 65f99549a25d2968eb0daa02cbdbfa7854dc4884..6163a69f97b4990c5d321cc44480d061b82da14e 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -188,10 +188,10 @@ unset LINGUAS ||:\
 %_examplesdir  /usr/src/examples
 
 # Alternative kernel type/version
-%alt_kernel    %{nil}%{?_alt_kernel:-%{?_alt_kernel}}
+%_alt_kernel   %{nil}%{?alt_kernel:-%{?alt_kernel}}
 
 # The directory holding Linux kernel sources
-%_kernelsrcdir /usr/src/linux%{alt_kernel}
+%_kernelsrcdir /usr/src/linux%{_alt_kernel}
 
 # If non-empty "debug" macro defined, add "dbg" suffix to release number
 %_rpmfilename          %%{NAME}-%%{VERSION}-%%{RELEASE}%{?debug:dbg}.%%{ARCH}.rpm
@@ -202,7 +202,7 @@ unset LINGUAS ||:\
 %releq_kernel_up()             %((LC_ALL="C" rpm -qf --qf '%%{name}-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
 %releq_kernel_smp()            %((LC_ALL="C" rpm -qf --qf '%%{name}-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
 %requires_releq_kernel_up(s:)  Requires%{-s:(%{-s*})}: %releq_kernel_up
-%requires_releq_kernel_smp(s:)         Requires%{-s:(%{-s*})}: %releq_kernel_smp
+%requires_releq_kernel_smp(s:) Requires%{-s:(%{-s*})}: %releq_kernel_smp
 
 %requires_eq()         %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 %requires_eq_to() %(LC_ALL="C" rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' %2 | sed -e 's/ (none):/ /' | grep -v "is not")
@@ -236,8 +236,11 @@ unset LINGUAS ||:\
 
 # minimum file size needed for compressed documents.
 # just smaller files than this get larger when compressed.
-# current number is based from experiment that 0 byte file compressed was 25 bytes .gz
-%_min_compress_bytes   25
+# some stats:
+# - 0 byte file compressed was 25 bytes .gz
+# - 39 byte file was compressed as 57
+# - with test/test.spec@man 158 byte file was compressed also 158
+%_min_compress_bytes   159
 
 #-----------------------------------------------------------------
 # find and gzip all files in %{_mandir} and %{infodir}
@@ -741,7 +744,7 @@ if [ "$1" = "1" ] && [ "$2" = "1" ]; then\
        /usr/sbin/webapp register %1 %2\
 fi\
 # reload webserver if the config symlink is there and skip reload if webserver is upgraded\
-if [ -L /etc/%1/webapps.d/%2.conf ] && [ "$2" -lt "2" ]; then\
+if [ -L /etc/%1/webapps.d/%(echo "%2" | tr '/' '-').conf ] && [ "$2" -lt "2" ]; then\
        %{expand:%service -q %%1 reload}\
 fi\
 %{nil}
@@ -752,7 +755,7 @@ fi\
 %webapp_unregister(f) \
 %{?debug:set -x; echo "webapp_unregister: %{name}-%{version}-%{release}: 1:[$1]; 2:[$2]"} \
 # remove link if either of the packages are gone \
-if [ -n "%{-f:1}" ] || [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps.d/%2.conf ]; then \
+if [ -n "%{-f:1}" ] || [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps.d/%(echo "%2" | tr '/' '-').conf ]; then \
        /usr/sbin/webapp unregister %1 %2\
        %{expand:%service -q %%1 reload}\
 fi \