rpms/fedora-usermgmt/devel fedora-usermgmt-wrapper, 1.2, 1.3 fedora-usermgmt.spec, 1.10, 1.11 macros.fedora-usermgmt, 1.1, 1.2 needs.rebuild, 1.1, NONE

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/fedora-usermgmt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27286

Modified Files:
	fedora-usermgmt-wrapper fedora-usermgmt.spec 
	macros.fedora-usermgmt 
Removed Files:
	needs.rebuild 
Log Message:
fedora-usermgmt.spec


Index: fedora-usermgmt-wrapper
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt-wrapper,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-usermgmt-wrapper	10 Dec 2005 11:59:30 -0000	1.2
+++ fedora-usermgmt-wrapper	15 Sep 2006 06:25:42 -0000	1.3
@@ -24,16 +24,16 @@
     local rc=0
     {
 	# Enforce some nscd activity
-	id root
-	id nscd
+	id root || :
+	id nscd || :
 
 	# Clear the caches
 	/usr/sbin/nscd -i group  || rc=1
 	/usr/sbin/nscd -i passwd || rc=1
 
 	# Enforce some nscd activity
-	id root
-	id nscd
+	id root || :
+	id nscd || :
     } &>/dev/null
 
     return $rc


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-usermgmt.spec	27 Apr 2006 17:48:19 -0000	1.10
+++ fedora-usermgmt.spec	15 Sep 2006 06:25:42 -0000	1.11
@@ -9,7 +9,7 @@
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
 Version:	0.8.90
-Release:	%release_func 2
+Release:	%release_func 3
 
 License:	GPL
 BuildArch:	noarch
@@ -188,6 +188,10 @@
 
 
 %changelog
+* Fri Sep 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8.90-3
+- make 'id ...' succeed everytime in the wrapper
+- append a '%%nil' in a new line to %%FE_USERADD_REQ
+
 * Thu Apr 27 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8.90-2
 - moved most content of the base package and used directories into a
   -core subpackage; this avoids dependencies loops.


Index: macros.fedora-usermgmt
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/macros.fedora-usermgmt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- macros.fedora-usermgmt	27 Apr 2006 17:48:19 -0000	1.1
+++ macros.fedora-usermgmt	15 Sep 2006 06:25:42 -0000	1.2
@@ -23,4 +23,5 @@
 
 %FE_USERADD_REQ	\
 Requires(pre):		%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}	\
-Requires(postun):	%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}
+Requires(postun):	%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}	\
+%nil


--- needs.rebuild DELETED ---