summaryrefslogtreecommitdiffstats
path: root/specs
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-09-06 22:56:49 +0200
committerEndi S. Dewata <edewata@redhat.com>2016-09-07 00:59:10 +0200
commit238d14bb8790037c8d1ca6d9123362ba3bb9fbf1 (patch)
tree8d9c3b74461c41517d2ee55f41f3534a77ab04a4 /specs
parent76b3ae5062aef22eece89117a28bd9b86ddef92d (diff)
downloadpki-238d14bb8790037c8d1ca6d9123362ba3bb9fbf1.tar.gz
pki-238d14bb8790037c8d1ca6d9123362ba3bb9fbf1.tar.xz
pki-238d14bb8790037c8d1ca6d9123362ba3bb9fbf1.zip
Updated RPM spec.
The code in the RPM spec that moves the upgrade scripts has been updated to reflect the FixSELinuxContexts deletion. The libselinux-python is used by deployment and upgrade scripts to set the SELinux contexts, so a direct runtime dependency has been added to the RPM spec file. The duplicate python-ldap and python-lxml dependencies have been removed. https://fedorahosted.org/pki/ticket/2452
Diffstat (limited to 'specs')
-rw-r--r--specs/pki-core.spec7
1 files changed, 2 insertions, 5 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 76ef0440f..efdde69e6 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -505,9 +505,6 @@ Requires: java-1.8.0-openjdk-headless
Requires: hostname
Requires: net-tools
-Requires: python-ldap
-Requires: python-lxml
-
%if 0%{?rhel}
Requires: nuxwdog-client-java >= 1.0.1-11
%else
@@ -521,6 +518,7 @@ Requires: pki-base-java = %{version}-%{release}
Requires: pki-tools = %{version}-%{release}
Requires: python-ldap
Requires: python-lxml
+Requires: libselinux-python
Requires: policycoreutils-python
%if 0%{?fedora} >= 23
Requires: policycoreutils-python-utils
@@ -924,8 +922,7 @@ fi
# Customize server upgrade scripts in /usr/share/pki/server/upgrade
%if 0%{?rhel}
mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/01-FixServerLibrary %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/02-FixServerLibrary
-mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/02-FixSELinuxContexts %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/03-FixSELinuxContexts
-mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/03-FixDeploymentDescriptor %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/04-FixDeploymentDescriptor
+mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/02-FixDeploymentDescriptor %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/03-FixDeploymentDescriptor
/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.3.4
/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5
%endif