PLD-doc: BuildRequires.txt - merge %{user|group}remove with their add conte...

glen glen at pld-linux.org
Sat Sep 5 12:13:01 CEST 2009


Author: glen                         Date: Sat Sep  5 10:13:01 2009 GMT
Module: PLD-doc                       Tag: HEAD
---- Log message:
- merge %{user|group}remove with their add conterparts

---- Files affected:
PLD-doc:
   BuildRequires.txt (1.120 -> 1.121) 

---- Diffs:

================================================================
Index: PLD-doc/BuildRequires.txt
diff -u PLD-doc/BuildRequires.txt:1.120 PLD-doc/BuildRequires.txt:1.121
--- PLD-doc/BuildRequires.txt:1.120	Mon May 11 20:46:41 2009
+++ PLD-doc/BuildRequires.txt	Sat Sep  5 12:12:56 2009
@@ -204,31 +204,25 @@
 Requires:	coreutils
 </unconfirmed>
 
-# %useradd
+# %useradd + %userremove
 BuildRequires:	rpmbuild(macros) >= 1.202
+Provides:	user(xxx)
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):  /bin/id
 Requires(pre):  /usr/sbin/useradd
-Provides:	user(xxx)
 
-# %groupadd
+# %groupadd + %groupremove
 BuildRequires:	rpmbuild(macros) >= 1.202
+Provides:	group(xxx)
+Requires(postun):	/usr/sbin/groupdel
 Requires(pre):  /usr/bin/getgid
 Requires(pre):  /usr/sbin/groupadd
-Provides:	group(xxx)
 
 # %addusertogroup
 BuildRequires:	rpmbuild(macros) >= 1.165
 Requires(pre):	/usr/lib/rpm/user_group.sh
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/usermod
-
-# %userremove
-BuildRequires:  rpmbuild(macros) >= 1.159
-Requires(postun):	/usr/sbin/userdel
-
-# %groupremove
-BuildRequires:  rpmbuild(macros) >= 1.159
-Requires(postun):	/usr/sbin/groupdel
 
 # %include /usr/lib/rpm/macros.mono
 BuildRequires:	rpmbuild(monoautodeps)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/PLD-doc/BuildRequires.txt?r1=1.120&r2=1.121&f=u



More information about the pld-cvs-commit mailing list