[pki-core/f19] Trac Ticket #597 - Create 10.0.2 builds

[Ade Lee]

commit 4dffe1409179185a57c66e4707956980e43834e0
Author: Ade Lee <alee at redhat.com>
Date:   Tue Apr 30 00:41:15 2013 -0400

    Trac Ticket #597 - Create 10.0.2 builds

 pki-core.spec |   32 ++++++++++++++++++++++++++------
 sources       |    2 +-
 2 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/pki-core.spec b/pki-core.spec
index 2d333a5..616f0b2 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -5,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:             pki-core
 Version:          10.0.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -615,10 +615,25 @@ end
 
 %post -n pki-base
 
-echo "Upgrading base at `/bin/date`." >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
-/sbin/pki-upgrade --silent >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
-echo >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
+if [ $1 -eq 1 ]
+then
+    # On RPM installation create system upgrade tracker
+    echo "Configuration-Version: %{version}" > %{_sysconfdir}/pki/pki.version
 
+else
+    # On RPM upgrade run system upgrade
+    echo "Upgrading system at `/bin/date`." >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
+    /sbin/pki-upgrade --silent >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
+    echo >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
+fi
+
+%postun -n pki-base
+
+if [ $1 -eq 0 ]
+then
+    # On RPM uninstallation remove system upgrade tracker
+    rm -f %{_sysconfdir}/pki/pki.version
+fi
 
 %if ! 0%{?rhel} && 0%{?fedora} <= 17
 %pre -n pki-selinux
@@ -853,6 +868,8 @@ fi
 %doc base/common/LICENSE
 %dir %{_datadir}/pki
 %{_datadir}/pki/VERSION
+%{_datadir}/pki/etc/pki.conf
+%{_datadir}/pki/upgrade/
 %dir %{_sysconfdir}/pki
 %config(noreplace) %{_sysconfdir}/pki/pki.conf
 %dir %{_javadir}/pki
@@ -865,7 +882,6 @@ fi
 %{python_sitelib}/pki/*.pyo
 %dir %{_localstatedir}/log/pki
 %{_sbindir}/pki-upgrade
-%{_datadir}/pki/upgrade/
 
 %files -n pki-tools
 %defattr(-,root,root,-)
@@ -1055,6 +1071,10 @@ fi
 
 
 %changelog
+* Mon Apr 29 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-2
+- Added default pki.conf in /usr/share/pki/etc
+- Create upgrade tracker on install and remove it on uninstall
+
 * Fri Apr 26 2013 Ade Lee <alee at redhat.com> 10.0.2-1
 - Change release number for official release.
 
@@ -1062,7 +1082,7 @@ fi
 - Added %pretrans script for f19
 - Added java-atk-wrapper dependency
 
-* Tue Apr 24 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-0.7
+* Wed Apr 24 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-0.7
 - Added pki-server-upgrade script and pki.server module.
 - Call upgrade scripts in %post for pki-base and pki-server.
 
diff --git a/sources b/sources
index e2fbc0a..a5827a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6cb24b8ab12cf806439bf02ee295f39e  pki-core-10.0.2.tar.gz
+6dd3a1cd46272ccca74ed68e398bd755  pki-core-10.0.2.tar.gz