rpms/pki-ca/EL-5 import.log,1.2,1.3 pki-ca.spec,1.2,1.3

[kwright]

Author: kwright

Update of /cvs/pkgs/rpms/pki-ca/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9267/EL-5

Modified Files:
	import.log pki-ca.spec 
Log Message:
respin for bugzilla 475895



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pki-ca/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Jan 2010 18:56:58 -0000	1.2
+++ import.log	14 Jan 2010 22:17:30 -0000	1.3
@@ -1,2 +1,3 @@
 pki-ca-1_3_0-6_el5:EL-5:pki-ca-1.3.0-6.el5.src.rpm:1263013986
 pki-ca-1_3_0-6_el5_1:EL-5:pki-ca-1.3.0-6.el5.1.src.rpm:1263236081
+pki-ca-1_3_0-7_el5:EL-5:pki-ca-1.3.0-7.el5.src.rpm:1263507306


Index: pki-ca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pki-ca/EL-5/pki-ca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pki-ca.spec	11 Jan 2010 18:54:58 -0000	1.2
+++ pki-ca.spec	14 Jan 2010 22:17:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pki-ca
 Version:        1.3.0
-Release:        6%{?dist}.1
+Release:        7%{?dist}
 Summary:        Dogtag Certificate System - Certificate Authority
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -29,11 +29,6 @@ Requires(preun):   chkconfig
 Requires(preun):   initscripts
 Requires(postun):  initscripts
 
-%if 0%{?rhel}
-#rhel has no java on ppc
-ExcludeArch:    ppc
-%endif
-
 Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
 %description
@@ -80,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
@@ -103,8 +98,8 @@ fi
 %{_localstatedir}/run/*
 
 %changelog
-* Mon Jan 11 2010 Kevin Wright <kwright at redhat.com> 1.3.0-6.1
-- no java on rhel ppc
+* 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