- partial merge from HEAD

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 19a1a5b26e7b026b6dcd65e9c4ef15214d2d2525..91dedfd04f5b73effd1d8dcd67a84cd107d1b2f4 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -38,6 +38,9 @@ fi; \
 %__intltoolize         intltoolize --copy --force
 %__libtoolize          libtoolize --copy --force
 
+#      The number of cvs changelog entries kept when building package.
+%_buildchangelogtruncate 20
+
 %dependencytracking    %{nil}
 
 #      Relations between package names that cause dependency loops
@@ -188,8 +191,8 @@ unset LINGUAS ||:\
 # Requires name = version-release
 %requires_releq()              %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}-%%{release}\\n' | sed -e 's/ (none):/ /' | grep -v "is not")
 
-%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)")
+%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
 
@@ -618,7 +621,8 @@ else \
                -g %{-g*} \\\
                %{-M} \\\
                %{-G:-G %{-G*}} \\\
-               %{expand:%{%{#}}} 1>&2 \
+               %{expand:%{%{#}}} 1>&2 || exit $? \
+       [ ! -x /usr/sbin/nscd ] || /usr/sbin/nscd -i passwd \
 fi;
 
 # Usage:
@@ -639,7 +643,8 @@ if [ -n "`/usr/bin/getgid %{1}`" ]; then \
        fi \
 else \
        echo "Adding group %{1} GID=%{-g*}." \
-       /usr/sbin/groupadd -g %{-g*} -r %{1} 1>&2 \
+       /usr/sbin/groupadd -g %{-g*} -r %{1} 1>&2 || exit $? \
+       [ ! -x /usr/sbin/nscd ] || /usr/sbin/nscd -i group \
 fi;
 
 # apache_config_{install/uninstall} macros written by glen@pld-linux.org.