summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2013-01-08 15:38:07 -0500
committerAde Lee <alee@redhat.com>2013-01-08 15:38:07 -0500
commit494c57164dd6a4a90c4442f508a55aa7b9511374 (patch)
treeaca990e92e7431ef86cc66738f37efb4e378d91b
parentb8e407aa83f3ff4a4feea049e4ada54853b39f4d (diff)
downloadpki-494c57164dd6a4a90c4442f508a55aa7b9511374.zip
pki-494c57164dd6a4a90c4442f508a55aa7b9511374.tar.gz
pki-494c57164dd6a4a90c4442f508a55aa7b9511374.tar.xz
Fix spec file to allow f17 to work with latest tomcatjss
-rw-r--r--specs/pki-core.spec4
1 files changed, 2 insertions, 2 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index c26ceb1..66b2962 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -503,8 +503,8 @@ cd build
cd build
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
-# Fedora 18: Substitute 'tomcat7jss.jar' for 'tomcatjss.jar'
-%if 0%{?fedora} == 18
+# Fedora 18 and 17: Substitute 'tomcat7jss.jar' for 'tomcatjss.jar'
+%if 0%{?fedora} <= 18
sed -i -e 's/grant codeBase "file:\/usr\/share\/java\/tomcatjss.jar" {/grant codeBase "file:\/usr\/share\/java\/tomcat7jss.jar" {/' %{buildroot}%{_datadir}/pki/server/conf/pki.policy
sed -i -e 's/pki_tomcatjss_jar=\/usr\/share\/java\/tomcatjss.jar/pki_tomcatjss_jar=\/usr\/share\/java\/tomcat7jss.jar/' %{buildroot}%{_sysconfdir}/pki/default.cfg
sed -i -e 's/ \[tomcatjss.jar\]=\${java_dir}\/tomcatjss.jar/ \[tomcatjss.jar\]=\${java_dir}\/tomcat7jss.jar/' %{buildroot}%{_datadir}/pki/scripts/operations