The code that customizes the links to the JAR files has been split between client and server packages.
https://fedorahosted.org/pki/ticket/2403 Pushed to master under one-liner/trivial rule. -- Endi S. Dewata
>From e69a5ac35dab52f32e9af00499b3ff7979f984bf Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <[email protected]> Date: Sat, 6 Aug 2016 02:20:35 +0200 Subject: [PATCH] Split link customization in RPM spec. The code that customizes the links to the JAR files has been split between client and server packages. https://fedorahosted.org/pki/ticket/2403 --- specs/pki-core.spec | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/specs/pki-core.spec b/specs/pki-core.spec index ed00135beb4b1085c1806fe20a15f7be7b2195be..075e35722aa6d06acc8925b863f5f4b1e4d68d5c 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -855,29 +855,17 @@ ln -s %{_datadir}/pki/java-tools/KRATool.cfg %{buildroot}%{_datadir}/pki/java-to # Create compatibility symlink for DRMTool.1.gz -> KRATool.1.gz ln -s %{_mandir}/man1/KRATool.1.gz %{buildroot}%{_mandir}/man1/DRMTool.1.gz -%if %{with server} - -# Customize symlinks for each platform +# Customize client library links in /usr/share/pki/lib %if 0%{?fedora} >= 24 - # /usr/share/pki/lib rm -f %{buildroot}%{_datadir}/pki/lib/scannotation.jar rm -f %{buildroot}%{_datadir}/pki/lib/resteasy-jaxrs-api.jar rm -f %{buildroot}%{_datadir}/pki/lib/resteasy-jaxrs-jandex.jar ln -sf %{jaxrs_api_jar} %{buildroot}%{_datadir}/pki/lib/jboss-jaxrs-2.0-api.jar ln -sf /usr/share/java/jboss-logging/jboss-logging.jar %{buildroot}%{_datadir}/pki/lib/jboss-logging.jar ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar %{buildroot}%{_datadir}/pki/lib/jboss-annotations-api_1.2_spec.jar - - # /usr/share/pki/server/common/lib - rm -f %{buildroot}%{_datadir}/pki/server/common/lib/scannotation.jar - rm -f %{buildroot}%{_datadir}/pki/server/common/lib/resteasy-jaxrs-api.jar - ln -sf %{jaxrs_api_jar} %{buildroot}%{_datadir}/pki/server/common/lib/jboss-jaxrs-2.0-api.jar - ln -sf /usr/share/java/jboss-logging/jboss-logging.jar %{buildroot}%{_datadir}/pki/server/common/lib/jboss-logging.jar - ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar %{buildroot}%{_datadir}/pki/server/common/lib/jboss-annotations-api_1.2_spec.jar - %else if [ -f /etc/debian_version ]; then - # /usr/share/pki/lib ln -sf /usr/share/java/httpclient.jar %{buildroot}%{_datadir}/pki/lib/httpclient.jar ln -sf /usr/share/java/httpcore.jar %{buildroot}%{_datadir}/pki/lib/httpcore.jar ln -sf /usr/share/java/jackson-core-asl.jar %{buildroot}%{_datadir}/pki/lib/jackson-core-asl.jar @@ -887,8 +875,23 @@ if [ -f /etc/debian_version ]; then ln -sf /usr/share/java/jackson-smile.jar %{buildroot}%{_datadir}/pki/lib/jackson-smile.jar ln -sf /usr/share/java/jackson-xc.jar %{buildroot}%{_datadir}/pki/lib/jackson-xc.jar ln -sf /usr/share/java/jss4.jar %{buildroot}%{_datadir}/pki/lib/jss4.jar +fi - # /usr/share/pki/server/common/lib +%endif + +%if %{with server} + +# Customize server library links in /usr/share/pki/server/common/lib +%if 0%{?fedora} >= 24 + rm -f %{buildroot}%{_datadir}/pki/server/common/lib/scannotation.jar + rm -f %{buildroot}%{_datadir}/pki/server/common/lib/resteasy-jaxrs-api.jar + ln -sf %{jaxrs_api_jar} %{buildroot}%{_datadir}/pki/server/common/lib/jboss-jaxrs-2.0-api.jar + ln -sf /usr/share/java/jboss-logging/jboss-logging.jar %{buildroot}%{_datadir}/pki/server/common/lib/jboss-logging.jar + ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar %{buildroot}%{_datadir}/pki/server/common/lib/jboss-annotations-api_1.2_spec.jar + +%else + +if [ -f /etc/debian_version ]; then ln -sf /usr/share/java/commons-collections3.jar %{buildroot}%{_datadir}/pki/server/common/lib/commons-collections.jar ln -sf /usr/share/java/httpclient.jar %{buildroot}%{_datadir}/pki/server/common/lib/httpclient.jar ln -sf /usr/share/java/httpcore.jar %{buildroot}%{_datadir}/pki/server/common/lib/httpcore.jar -- 2.5.5
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
