summaryrefslogtreecommitdiffstats
path: root/specs
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2013-04-05 15:20:01 -0400
committerEndi Sukma Dewata <edewata@redhat.com>2013-04-09 09:40:09 -0400
commit62ccd4ca0addd8a4c74bcbdfca6aea0c9381907f (patch)
treead78a933e29a517bae7876248820c40b9b5db197 /specs
parent2e0194dd7791eaf07d6e9eb26df57e5a4677f426 (diff)
downloadpki-62ccd4ca0addd8a4c74bcbdfca6aea0c9381907f.tar.gz
pki-62ccd4ca0addd8a4c74bcbdfca6aea0c9381907f.tar.xz
pki-62ccd4ca0addd8a4c74bcbdfca6aea0c9381907f.zip
Renamed base/deploy to base/server.
The base/deploy folder has been renamed to base/server to match the package name. The pki.conf has been moved into pki-base package. Ticket #553, #564
Diffstat (limited to 'specs')
-rw-r--r--specs/pki-core.spec14
1 files changed, 9 insertions, 5 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 4bd4f0100..73c374d8e 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -5,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.0.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -810,6 +810,8 @@ fi
%doc base/common/LICENSE
%dir %{_datadir}/pki
%{_datadir}/pki/VERSION
+%dir %{_sysconfdir}/pki
+%config(noreplace) %{_sysconfdir}/pki/pki.conf
%dir %{_javadir}/pki
%{_javadir}/pki/pki-cmsutil.jar
%{_javadir}/pki/pki-nsutil.jar
@@ -857,9 +859,7 @@ fi
%files -n pki-server
%defattr(-,root,root,-)
%doc base/common/THIRD_PARTY_LICENSES
-%doc base/deploy/LICENSE
-%dir %{_sysconfdir}/pki/
-%config(noreplace) %{_sysconfdir}/pki/pki.conf
+%doc base/server/LICENSE
%{_sysconfdir}/pki/default.cfg
%{_sbindir}/pkispawn
%{_sbindir}/pkidestroy
@@ -902,7 +902,6 @@ fi
%config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-tomcat.conf
%{_datadir}/pki/setup/
-%dir %{_datadir}/pki/server
%{_datadir}/pki/server/
%if ! 0%{?rhel} && 0%{?fedora} <= 17
@@ -1007,6 +1006,11 @@ fi
%changelog
+* Fri Apr 5 2013 Endi S. Dewata <edewata@redhat.com> 10.0.1-9
+- Renamed base/deploy to base/server.
+- Moved pki.conf into pki-base.
+- Removed redundant pki/server folder declaration.
+
* Tue Mar 19 2013 Ade Lee <alee@redhat.com> 10.0.1-8
- Removed jython dependency