diff options
author | Endi S. Dewata <edewata@redhat.com> | 2017-06-13 20:57:42 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2017-06-13 21:31:06 +0200 |
commit | bd82be4999b066bdf2fd91683432de6f7bdcf667 (patch) | |
tree | 6113518240a722fff6c91ca8628656edca7ea95b /specs | |
parent | 8096811531aaf2040bfcd0e4f14b11aa9ff66e7a (diff) | |
download | pki-bd82be4999b066bdf2fd91683432de6f7bdcf667.tar.gz pki-bd82be4999b066bdf2fd91683432de6f7bdcf667.tar.xz pki-bd82be4999b066bdf2fd91683432de6f7bdcf667.zip |
Added RESTEasy paths into pki-console.spec.
The pki-core.spec has been modified to define RESTEasy paths for
different platforms.
https://pagure.io/dogtagpki/issue/2671
Change-Id: I5519daf199e5c9d0b2c7f894a97e0158beaccb4d
Diffstat (limited to 'specs')
-rw-r--r-- | specs/pki-console.spec | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/specs/pki-console.spec b/specs/pki-console.spec index 3321b8464..17ef7b267 100644 --- a/specs/pki-console.spec +++ b/specs/pki-console.spec @@ -11,6 +11,20 @@ URL: http://pki.fedoraproject.org/ License: GPLv2 Group: System Environment/Base +# RESTEasy +%if 0%{?rhel} +%define jaxrs_api_jar /usr/share/java/resteasy-base/jaxrs-api.jar +%define resteasy_lib /usr/share/java/resteasy-base +%else +%if 0%{?fedora} >= 24 +%define jaxrs_api_jar /usr/share/java/jboss-jaxrs-2.0-api.jar +%define resteasy_lib /usr/share/java/resteasy +%else +%define jaxrs_api_jar /usr/share/java/resteasy/jaxrs-api.jar +%define resteasy_lib /usr/share/java/resteasy +%endif +%endif + %bcond_without javadoc %if 0%{?rhel} @@ -103,9 +117,11 @@ following "Mutually-Exclusive" PKI Theme packages: %{__mkdir_p} build cd build %cmake -DVERSION=%{version}-%{release} \ - -DVAR_INSTALL_DIR:PATH=/var \ + -DVAR_INSTALL_DIR:PATH=/var \ -DBUILD_PKI_CONSOLE:BOOL=ON \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ + -DJAXRS_API_JAR=%{jaxrs_api_jar} \ + -DRESTEASY_LIB=%{resteasy_lib} \ %if ! %{with javadoc} -DWITH_JAVADOC:BOOL=OFF \ %endif |