[pki-core] Fix JNI_JAR_DIR

[Ade Lee]

commit 6072979eeb10fbf21976a063dda112f1b8d5f543
Author: Ade Lee <alee at redhat.com>
Date:   Tue May 7 10:25:21 2013 -0400

    Fix JNI_JAR_DIR

 pki-core.spec |   26 ++++++++++++++++----------
 sources       |    2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/pki-core.spec b/pki-core.spec
index 0039814..6b729da 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:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -501,15 +501,6 @@ cd build
 %else
 	-DRESTEASY_LIB=/usr/share/java/resteasy \
 %endif
-%if 0%{?fedora} <= 18
-%ifarch x86_64
-	-DJNI_JAR_DIR=/usr/lib64/java \
-%else
-	-DJNI_JAR_DIR=/usr/lib/java \
-%endif
-%else
-	-DJNI_JAR_DIR=/usr/lib/java \
-%endif
 	%{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \
 %if ! 0%{?rhel} && 0%{?fedora} <= 17
         -DBUILD_PKI_SELINUX:BOOL=ON \
@@ -615,6 +606,17 @@ end
 
 %post -n pki-base
 
+%if 0%{?fedora} <= 18
+if [ "`uname -i`" == "x86_64" ]
+then
+	sed -i -e 's/^JNI_JAR_DIR=.*$/JNI_JAR_DIR=\/usr\/lib64\/java/' %{_datadir}/pki/etc/pki.conf
+else
+	sed -i -e 's/^JNI_JAR_DIR=.*$/JNI_JAR_DIR=\/usr\/lib\/java/' %{_datadir}/pki/etc/pki.conf
+fi
+%else
+	sed -i -e 's/^JNI_JAR_DIR=.*$/JNI_JAR_DIR=\/usr\/lib\/java/' %{_datadir}/pki/etc/pki.conf
+%endif
+
 if [ $1 -eq 1 ]
 then
     # On RPM installation create system upgrade tracker
@@ -623,6 +625,7 @@ then
 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 --remove-tracker >> /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
@@ -1071,6 +1074,9 @@ fi
 
 
 %changelog
+* Mon May 6 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-5
+- Fixed incorrect JNI_JAR_DIR.
+
 * Sat May 4 2013 Ade Lee <alee at redhat.com> 10.0.2-4
 - TRAC Ticket 605 Junit internal function used in TestRunner,
   breaks F19 build
diff --git a/sources b/sources
index 376a988..a179c3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b2fdb1d090eef8cf1bfe9dd82dd4e53  pki-core-10.0.2.tar.gz
+9a4a1712121ed7d046e8fde4da52ae99  pki-core-10.0.2.tar.gz