- adjusted for current pl.po patch

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index ab060ba2c4ce4f568cf1801d3ca1a4e6eb6539ba..5f293bb53440cf238b8586f3a217cd5da76f48f6 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -15,10 +15,10 @@
 #-----------------------------------------------------------------
 # CFLAGS and LDFLAGS used to build
 
-%debuginfocflags        %{expand:%%define dic_%{_enable_debug_packages} %{_enable_debug_packages}}%{?dic_0:}%{?dic_1:-ggdb}%{expand:%%undefine dic_%{_enable_debug_packages}}
+%debuginfocflags       %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
 
 %debugcflags   -O0 -g -Wall
-%rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags: %debuginfocflags}
+%rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
 %rpmldflags    %{nil}
 
 # kernel compiler
@@ -368,11 +368,11 @@ echo "Compress kernel modules if any."; \
 # Requires/Provides automation
 # exceptions system by Jacek Konieczny <jajcus@pld.org.pl>
 #
-%_noautoreqfiles       %(sed -e s'/#.*//' /etc/rpm/noautoreqfiles)
-%_noautoprovfiles      %(sed -e s'/#.*//' /etc/rpm/noautoprovfiles)
-%_noautoreq            %(sed -e s'/#.*//' /etc/rpm/noautoreq)
-%_noautoreqdep         %(sed -e s'/#.*//' /etc/rpm/noautoreqdep)
-%_noautoprov           %(sed -e s'/#.*//' /etc/rpm/noautoprov)
+%__noautoreqfiles      %(sed -e s'/#.*//' /etc/rpm/noautoreqfiles)%{?_noautoreqfiles: %{_noautoreqfiles}}
+%__noautoprovfiles     %(sed -e s'/#.*//' /etc/rpm/noautoprovfiles)%{?_noautoprovfiles: %{_noautoprovfiles}}
+%__noautoreq           %(sed -e s'/#.*//' /etc/rpm/noautoreq)%{?_noautoreq: %{_noautoreq}}
+%__noautoreqdep                %(sed -e s'/#.*//' /etc/rpm/noautoreqdep)%{?_noautoreqdep: %{_noautoreqdep}}
+%__noautoprov          %(sed -e s'/#.*//' /etc/rpm/noautoprov)%{?_noautoprov: %{_noautoprov}}
 #%_noautocompressdoc   %{nil}
 #
 %_missing_doc_files_terminate_build    1%{nil}
@@ -445,3 +445,22 @@ fi; \
 %xmms_general_plugindir       %(xmms-config --general-plugin-dir)
 
 %_target_base_arch     %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/')
+
+# user/group checking macros
+#
+# Usage:
+#      %userremove myuser
+#
+%userremove    /usr/lib/rpm/user_group.sh user del
+%groupremove   /usr/lib/rpm/user_group.sh group del
+#
+# Usage:
+#      if %usertestrm myuser; then
+#              /usr/sbin/userdel -r myuser
+# Note:
+#      use these macros only if you need to call userdel/groupdel with
+#      a non-standard option or take an extra action; otherwise use the
+#      %userremove/%groupremove macros
+#
+%usertestrm    /usr/lib/rpm/user_group.sh user testrm
+%grouptestrm   /usr/lib/rpm/user_group.sh group testrm