summaryrefslogtreecommitdiffstats
path: root/specs/pki-core.spec
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-12-06 13:06:14 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-12-06 21:23:11 -0500
commit9996d71e1a4fb7a8ca6752b83e4f2393dbefa76b (patch)
tree449a55d01c5092a59192e0dffd28bbeb1c6e17f9 /specs/pki-core.spec
parent883e0ec158eec04547da6856dbdaef0a8f640cb0 (diff)
downloadpki-9996d71e1a4fb7a8ca6752b83e4f2393dbefa76b.tar.gz
pki-9996d71e1a4fb7a8ca6752b83e4f2393dbefa76b.tar.xz
pki-9996d71e1a4fb7a8ca6752b83e4f2393dbefa76b.zip
Parameterizing RESTEasy paths.
The paths to RESTEasy jar files have been modified such that it can be configured globally at build time using the spec file to support different distributions, and at deployment time using a system-wide configuration in /etc/pki/pki.conf. Ticket #422, #423.
Diffstat (limited to 'specs/pki-core.spec')
-rw-r--r--specs/pki-core.spec23
1 files changed, 14 insertions, 9 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 8c3c7913e..f7481548c 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.0.0
-Release: %{?relprefix}54%{?prerel}%{?dist}
+Release: %{?relprefix}55%{?prerel}%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -462,7 +462,6 @@ This package is a part of the PKI Core used by the Certificate System.
%clean
%{__rm} -rf %{buildroot}
-
%build
%{__mkdir_p} build
cd build
@@ -471,6 +470,11 @@ cd build
-DBUILD_PKI_CORE:BOOL=ON \
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
+%if 0%{?rhel}
+ -DRESTEASY_LIB=/usr/share/java/resteasy-base \
+%else
+ -DRESTEASY_LIB=/usr/share/java/resteasy \
+%endif
%{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \
%if ! 0%{?rhel} && 0%{?fedora} <= 17
-DBUILD_PKI_SELINUX:BOOL=ON \
@@ -809,7 +813,7 @@ fi
%files -n pki-server
%defattr(-,root,root,-)
%doc base/deploy/LICENSE
-%{_sysconfdir}/pki/default.cfg
+%{_sysconfdir}/pki/
%{_sbindir}/pkispawn
%{_sbindir}/pkidestroy
#%{_bindir}/pki-setup-proxy
@@ -820,6 +824,9 @@ fi
%{_datadir}/pki/deployment/config/
%dir %{_datadir}/pki/scripts
%{_datadir}/pki/scripts/operations
+%{_datadir}/pki/scripts/pkicommon.pm
+%{_datadir}/pki/scripts/functions
+%{_datadir}/pki/scripts/pki_apache_initscript
%dir %{_localstatedir}/lock/pki
%dir %{_localstatedir}/run/pki
%{_bindir}/pkidaemon
@@ -837,13 +844,7 @@ fi
%{_bindir}/pkiremove
%{_bindir}/pki-setup-proxy
%{_bindir}/pkisilent
-%dir %{_datadir}/pki/scripts
-%{_datadir}/pki/scripts/pkicommon.pm
-%{_datadir}/pki/scripts/functions
-%{_datadir}/pki/scripts/pki_apache_initscript
%{_datadir}/pki/silent/
-%dir %{_localstatedir}/lock/pki
-%dir %{_localstatedir}/run/pki
%{_bindir}/pkicontrol
# Details:
@@ -959,6 +960,10 @@ fi
%changelog
+* Thu Dec 6 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.55.b3
+- Added system-wide configuration /etc/pki/pki.conf.
+- Removed redundant lines in %files.
+
* Tue Dec 4 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.54.b3
- Moved default deployment configuration to /etc/pki.