diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-25 03:18:27 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-25 03:18:27 +0000 |
| commit | b396a7e955a5e27bb0de65f1d31584bd83bc7698 (patch) | |
| tree | f8ff4402a0fb428e2b0cec13ac6fcac8a2cb9606 /pki/base/java-tools | |
| parent | 4c443b3deb1183754b31a22e30f0264adbc8287d (diff) | |
Bugzilla Bug #521995 - Packaging for Fedora Dogtag PKI
- Use "_javadir" macro when appropriate
- Move jar file to top-level
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@851 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/java-tools')
4 files changed, 4 insertions, 4 deletions
diff --git a/pki/base/java-tools/build.xml b/pki/base/java-tools/build.xml index 6f0fe7245..e89773e89 100644 --- a/pki/base/java-tools/build.xml +++ b/pki/base/java-tools/build.xml @@ -414,7 +414,7 @@ <zip destfile="${dist.base.binaries}/${dist.name}.zip"> <zipfileset dir="./build/jars" filemode="755" - prefix="usr/share/java/${product.prefix}"> + prefix="usr/share/java"> <include name="**"/> </zipfileset> <zipfileset dir="./build/cmds" diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper b/pki/base/java-tools/templates/pki_java_command_wrapper index d92bf3e6b..b3d49b190 100644 --- a/pki/base/java-tools/templates/pki_java_command_wrapper +++ b/pki/base/java-tools/templates/pki_java_command_wrapper @@ -134,7 +134,7 @@ CP=/usr/lib/java/osutil.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/cmsutil.jar:${CP} -CP=/usr/share/java/${PRODUCT}/cstools.jar:${CP} +CP=/usr/share/java/cstools.jar:${CP} CP=/usr/share/${PRODUCT}/classes:${CP} export CP diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper index 9caf5049d..a91e37bdd 100644 --- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper +++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper @@ -134,7 +134,7 @@ CP=/usr/lib/java/osutil.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/cmsutil.jar:${CP} -CP=/usr/share/java/${PRODUCT}/cstools.jar:${CP} +CP=/usr/share/java/cstools.jar:${CP} CP=/usr/share/${PRODUCT}/classes:${CP} export CP diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper index ee91d7d2b..861d4c499 100644 --- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper +++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper @@ -134,7 +134,7 @@ CP=/usr/lib/java/osutil.jar:${CP} CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/cmsutil.jar:${CP} -CP=/usr/share/java/${PRODUCT}/cstools.jar:${CP} +CP=/usr/share/java/cstools.jar:${CP} CP=/usr/share/${PRODUCT}/classes:${CP} export CP |