rpms/pki-ca/F-12 import.log,1.1,1.2 pki-ca.spec,1.1,1.2

[kwright]

Author: kwright

Update of /cvs/pkgs/rpms/pki-ca/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4946/F-12

Modified Files:
	import.log pki-ca.spec 
Log Message:
respin of pki-ca



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pki-ca/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	11 Jan 2010 22:38:42 -0000	1.1
+++ import.log	14 Jan 2010 22:02:00 -0000	1.2
@@ -1 +1,2 @@
 pki-ca-1_3_0-6_fc12:F-12:pki-ca-1.3.0-6.fc12.src.rpm:1263249391
+pki-ca-1_3_0-7_fc12:F-12:pki-ca-1.3.0-7.fc12.src.rpm:1263506183


Index: pki-ca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pki-ca/F-12/pki-ca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pki-ca.spec	11 Jan 2010 22:38:42 -0000	1.1
+++ pki-ca.spec	14 Jan 2010 22:02:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pki-ca
 Version:        1.3.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Dogtag Certificate System - Certificate Authority
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -75,12 +75,12 @@ rm -rf %{buildroot}
 
 %post
 # This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add pki-cad
+/sbin/chkconfig --add pki-cad || :
 
 %preun
 if [ $1 = 0 ] ; then
-    /sbin/service pki-cad stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del pki-cad
+    /sbin/service pki-cad stop >/dev/null 2>&1
+    /sbin/chkconfig --del pki-cad || :
 fi
 
 %postun
@@ -98,6 +98,9 @@ fi
 %{_localstatedir}/run/*
 
 %changelog
+* Tue Jan 12 2010 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-7
+- Corrected "|| :" scriptlet logic (see Bugzilla Bug #475895)
+
 * Mon Dec 7 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-6
 - Bugzilla Bug #522210 - Packaging for Fedora Dogtag
 - Bugzilla Bug #529070 -  rpm packaging problems (cannot reinstall correctly)