diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-25 00:48:46 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-25 00:48:46 +0000 |
commit | e833168274812eb7587c4bb2adda2a79e92f8369 (patch) | |
tree | 0170423584e4e031717dd394de30aae0c858b6f4 /pki/dogtag | |
parent | 5718962bf9474929001bfe83f1971e67c75ea874 (diff) | |
download | pki-e833168274812eb7587c4bb2adda2a79e92f8369.tar.gz pki-e833168274812eb7587c4bb2adda2a79e92f8369.tar.xz pki-e833168274812eb7587c4bb2adda2a79e92f8369.zip |
Bugzilla Bug #521989 - New Package for Dogtag PKI:pki-util
- Use "%{_javadir}" macro when appropriate
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@849 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/dogtag')
-rw-r--r-- | pki/dogtag/ca/pki-ca.spec | 9 | ||||
-rw-r--r-- | pki/dogtag/common/pki-common.spec | 33 | ||||
-rw-r--r-- | pki/dogtag/console-ui/dogtag-pki-console-ui.spec | 4 | ||||
-rw-r--r-- | pki/dogtag/console/pki-console.spec | 4 | ||||
-rw-r--r-- | pki/dogtag/java-tools/pki-java-tools.spec | 14 | ||||
-rw-r--r-- | pki/dogtag/kra/pki-kra.spec | 4 | ||||
-rw-r--r-- | pki/dogtag/ocsp/pki-ocsp.spec | 4 | ||||
-rw-r--r-- | pki/dogtag/silent/pki-silent.spec | 9 | ||||
-rw-r--r-- | pki/dogtag/tks/pki-tks.spec | 4 | ||||
-rw-r--r-- | pki/dogtag/util/pki-util.spec | 9 |
10 files changed, 53 insertions, 41 deletions
diff --git a/pki/dogtag/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec index 282f103a4..aaf4b6f5f 100644 --- a/pki/dogtag/ca/pki-ca.spec +++ b/pki/dogtag/ca/pki-ca.spec @@ -1,6 +1,6 @@ Name: pki-ca Version: 1.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Dogtag Certificate System - Certificate Authority URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -58,7 +58,7 @@ cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/ca/conf/CS.cfg sed -i 's/^cms.version=.*$/cms.version=%{major_version}.%{minor_version}/' %{buildroot}%{_datadir}/pki/ca/conf/CS.cfg -cd %{buildroot}%{_datadir}/java/pki/ca +cd %{buildroot}%{_javadir}/pki/ca mv ca.jar ca-%{version}.jar ln -s ca-%{version}.jar ca.jar @@ -97,10 +97,13 @@ fi %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki/ca/ +%{_javadir}/pki/ca/ %{_datadir}/pki/ca/ %changelog +* Tue Nov 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-5 +- Bugzilla Bug #522210 - Packaging for Fedora Dogtag +- Use "%{_javadir}" macro when appropriate * Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-4 - Bugzilla Bug #522210 - Packaging for Fedora Dogtag - Take ownership of directories diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec index e9a21b79c..94ebdc11e 100644 --- a/pki/dogtag/common/pki-common.spec +++ b/pki/dogtag/common/pki-common.spec @@ -1,6 +1,6 @@ Name: pki-common Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dogtag Certificate System - PKI Common Framework URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -32,12 +32,12 @@ Requires: pki-setup Requires: rhgb Requires: symkey Requires: tomcatjss -Requires: %{_datadir}/java/ldapjdk.jar -Requires: %{_datadir}/java/pki/cmsutil.jar -Requires: %{_datadir}/java/pki/nsutil.jar -Requires: %{_datadir}/java/velocity.jar -Requires: %{_datadir}/java/xalan-j2.jar -Requires: %{_datadir}/java/xerces-j2.jar +Requires: %{_javadir}/ldapjdk.jar +Requires: %{_javadir}/pki/cmsutil.jar +Requires: %{_javadir}/pki/nsutil.jar +Requires: %{_javadir}/velocity.jar +Requires: %{_javadir}/xalan-j2.jar +Requires: %{_javadir}/xerces-j2.jar Requires: velocity Conflicts: tomcat-native @@ -83,7 +83,7 @@ ant \ rm -rf %{buildroot} cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} -cd %{buildroot}%{_datadir}/java/pki +cd %{buildroot}%{_javadir}/pki mv certsrv.jar certsrv-%{version}.jar ln -s certsrv-%{version}.jar certsrv.jar mv cms.jar cms-%{version}.jar @@ -94,12 +94,12 @@ mv cmscore.jar cmscore-%{version}.jar ln -s cmscore-%{version}.jar cmscore.jar mkdir -p %{buildroot}%{_sharedstatedir}/tomcat5/common/lib cd %{buildroot}%{_sharedstatedir}/tomcat5/common/lib -ln -s %{_datadir}/java/ldapjdk.jar ldapjdk.jar -ln -s %{_datadir}/java/pki/cmsutil.jar cmsutil.jar -ln -s %{_datadir}/java/pki/nsutil.jar nsutil.jar -ln -s %{_datadir}/java/velocity.jar velocity.jar -ln -s %{_datadir}/java/xalan-j2.jar xalan-j2.jar -ln -s %{_datadir}/java/xerces-j2.jar xerces-j2.jar +ln -s %{_javadir}/ldapjdk.jar ldapjdk.jar +ln -s %{_javadir}/pki/cmsutil.jar cmsutil.jar +ln -s %{_javadir}/pki/nsutil.jar nsutil.jar +ln -s %{_javadir}/velocity.jar velocity.jar +ln -s %{_javadir}/xalan-j2.jar xalan-j2.jar +ln -s %{_javadir}/xerces-j2.jar xerces-j2.jar %clean rm -rf %{buildroot} @@ -110,7 +110,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki/ +%{_javadir}/pki/ %{_datadir}/pki/ %{_sharedstatedir}/tomcat5/common/lib/* @@ -119,6 +119,9 @@ rm -rf %{buildroot} %{_javadocdir}/%{name}-%{version}/ %changelog +* Tue Nov 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-3 +- Bugzilla Bug #522207 - packaging for Fedora Dogtag +- Use "%{_javadir}" macro when appropriate * Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 - Bugzilla Bug #522207 - packaging for Fedora Dogtag - Take ownership of directories diff --git a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec index 5c6acf93c..46b70456f 100644 --- a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec +++ b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec @@ -48,7 +48,7 @@ ant \ rm -rf %{buildroot} cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} -cd %{buildroot}%{_datadir}/java/pki +cd %{buildroot}%{_javadir}/pki ln -s cms-theme-%{version}_en.jar cms-theme_en.jar %clean @@ -57,7 +57,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki +%{_javadir}/pki %changelog * Wed Oct 14 2009 Ade Lee <alee@redhat.com> 1.3.0-1 diff --git a/pki/dogtag/console/pki-console.spec b/pki/dogtag/console/pki-console.spec index 088eb140a..78cfd81a9 100644 --- a/pki/dogtag/console/pki-console.spec +++ b/pki/dogtag/console/pki-console.spec @@ -49,7 +49,7 @@ ant \ rm -rf %{buildroot} cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} -cd %{buildroot}%{_datadir}/java/pki +cd %{buildroot}%{_javadir}/pki ln -s console-cms-%{version}.jar console-cms.jar ln -s console-cms-%{version}_en.jar console-cms_en.jar @@ -60,7 +60,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc LICENSE %{_bindir}/pkiconsole -%{_datadir}/java/pki +%{_javadir}/pki %changelog * Thu Oct 15 2009 Ade Lee <alee@redhat.com> 1.3.0-1 diff --git a/pki/dogtag/java-tools/pki-java-tools.spec b/pki/dogtag/java-tools/pki-java-tools.spec index 2150fd30e..1908674c1 100644 --- a/pki/dogtag/java-tools/pki-java-tools.spec +++ b/pki/dogtag/java-tools/pki-java-tools.spec @@ -1,6 +1,6 @@ Name: pki-java-tools Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dogtag Certificate System - PKI Java-Based Tools URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -57,13 +57,10 @@ ant \ rm -rf %{buildroot} cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} -cd %{buildroot}%{_datadir}/java/pki +cd %{buildroot}%{_javadir}/pki mv cstools.jar cstools-%{version}.jar ln -s cstools-%{version}.jar cstools.jar -cd %{buildroot}%{_datadir}/pki -rm pki_java_command_wrapper -rm pretty_print_cert_command_wrapper -rm pretty_print_crl_command_wrapper +rm -rf %{buildroot}%{_datadir}/pki %clean rm -rf %{buildroot} @@ -72,13 +69,16 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc LICENSE %{_bindir}/* -%{_datadir}/java/pki/ +%{_javadir}/pki/ %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version}/ %changelog +* Tue Nov 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-3 +- Bugzilla Bug #521995 - Packaging for Fedora Dogtag PKI +- Use "%{_javadir}" macro when appropriate * Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 - Bugzilla Bug #521995 - Packaging for Fedora Dogtag PKI - Take ownership of directories diff --git a/pki/dogtag/kra/pki-kra.spec b/pki/dogtag/kra/pki-kra.spec index a868a1071..207b2005f 100644 --- a/pki/dogtag/kra/pki-kra.spec +++ b/pki/dogtag/kra/pki-kra.spec @@ -67,7 +67,7 @@ cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/kra/conf/CS.cfg sed -i 's/^cms.version=.*$/cms.version=%{major_version}.%{minor_version}/' %{buildroot}%{_datadir}/pki/kra/conf/CS.cfg -cd %{buildroot}%{_datadir}/java/pki/kra +cd %{buildroot}%{_javadir}/pki/kra mv kra.jar kra-%{version}.jar ln -s kra-%{version}.jar kra.jar @@ -106,7 +106,7 @@ fi %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki/kra/* +%{_javadir}/pki/kra/* %{_datadir}/pki/kra/* %changelog diff --git a/pki/dogtag/ocsp/pki-ocsp.spec b/pki/dogtag/ocsp/pki-ocsp.spec index 828aca6a2..5487ebadd 100644 --- a/pki/dogtag/ocsp/pki-ocsp.spec +++ b/pki/dogtag/ocsp/pki-ocsp.spec @@ -76,7 +76,7 @@ cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/ocsp/conf/CS.cfg sed -i 's/^cms.version=.*$/cms.version=%{major_version}.%{minor_version}/' %{buildroot}%{_datadir}/pki/ocsp/conf/CS.cfg -cd %{buildroot}%{_datadir}/java/pki/ocsp +cd %{buildroot}%{_javadir}/pki/ocsp mv ocsp.jar ocsp-%{version}.jar ln -s ocsp-%{version}.jar ocsp.jar @@ -115,7 +115,7 @@ fi %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki/ocsp/* +%{_javadir}/pki/ocsp/* %{_datadir}/pki/ocsp/* %changelog diff --git a/pki/dogtag/silent/pki-silent.spec b/pki/dogtag/silent/pki-silent.spec index 6809927e8..87fee793f 100644 --- a/pki/dogtag/silent/pki-silent.spec +++ b/pki/dogtag/silent/pki-silent.spec @@ -1,6 +1,6 @@ Name: pki-silent Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dogtag Certificate System - Silent Installer URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -52,7 +52,7 @@ ant \ rm -rf %{buildroot} cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} -cd %{buildroot}%{_datadir}/java +cd %{buildroot}%{_javadir} mv silent.jar silent-%{version}.jar ln -s silent-%{version}.jar silent.jar @@ -63,10 +63,13 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc LICENSE %{_bindir}/* -%{_datadir}/java/* +%{_javadir}/* %{_datadir}/pki/silent/ %changelog +* Tue Nov 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-3 +- Bugzilla Bug #521996 - Packaging for Fedora Dogtag PKI +- Use "%{_javadir}" macro when appropriate * Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 - Bugzilla Bug #521996 - Packaging for Fedora Dogtag PKI - Take ownership of directories diff --git a/pki/dogtag/tks/pki-tks.spec b/pki/dogtag/tks/pki-tks.spec index 3cda14a8c..3306f720c 100644 --- a/pki/dogtag/tks/pki-tks.spec +++ b/pki/dogtag/tks/pki-tks.spec @@ -69,7 +69,7 @@ cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/tks/conf/CS.cfg sed -i 's/^cms.version=.*$/cms.version=%{major_version}.%{minor_version}/' %{buildroot}%{_datadir}/pki/tks/conf/CS.cfg -cd %{buildroot}%{_datadir}/java/pki/tks +cd %{buildroot}%{_javadir}/pki/tks mv tks.jar tks-%{version}.jar ln -s tks-%{version}.jar tks.jar @@ -110,7 +110,7 @@ fi %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki/tks/* +%{_javadir}/pki/tks/* %{_datadir}/pki/tks/* %changelog diff --git a/pki/dogtag/util/pki-util.spec b/pki/dogtag/util/pki-util.spec index 831b0278b..b734ce8ee 100644 --- a/pki/dogtag/util/pki-util.spec +++ b/pki/dogtag/util/pki-util.spec @@ -1,6 +1,6 @@ Name: pki-util Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dogtag Certificate System - PKI Utility Framework URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -64,7 +64,7 @@ ant \ rm -rf %{buildroot} cd dist/binary unzip %{name}-%{version}.zip -d %{buildroot} -cd %{buildroot}%{_datadir}/java/pki +cd %{buildroot}%{_javadir}/pki mv cmsutil.jar cmsutil-%{version}.jar ln -s cmsutil-%{version}.jar cmsutil.jar mv nsutil.jar nsutil-%{version}.jar @@ -76,13 +76,16 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki/ +%{_javadir}/pki/ %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version}/ %changelog +* Tue Nov 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-3 +- Bugzilla Bug #521989 - packaging for Fedora Dogtag +- Use "%{_javadir}" macro when appropriate * Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 - Bugzilla Bug #521989 - packaging for Fedora Dogtag - Take ownership of directories |