rpms/pki-ca/F-11 import.log,1.1,1.2 pki-ca.spec,1.1,1.2
kwright
kwright at fedoraproject.org
Thu Jan 14 21:32:36 UTC 2010
Author: kwright
Update of /cvs/pkgs/rpms/pki-ca/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31263/F-11
Modified Files:
import.log pki-ca.spec
Log Message:
respin of pki-ca
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pki-ca/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 10 Jan 2010 00:11:28 -0000 1.1
+++ import.log 14 Jan 2010 21:32:35 -0000 1.2
@@ -1 +1,2 @@
pki-ca-1_3_0-6_fc11:F-11:pki-ca-1.3.0-6.fc11.src.rpm:1263082172
+pki-ca-1_3_0-7_fc11:F-11:pki-ca-1.3.0-7.fc11.src.rpm:1263504615
Index: pki-ca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pki-ca/F-11/pki-ca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pki-ca.spec 10 Jan 2010 00:11:28 -0000 1.1
+++ pki-ca.spec 14 Jan 2010 21:32:36 -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)
More information about the scm-commits
mailing list