From 87eff25bcbd476183cf6378f0d8c5540fa776ec5 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 1 Jun 2017 06:37:37 +0200 Subject: Reorganized upgrade scripts. Since the PKI version may be different on different platforms, upgrade scripts that are newer than the latest available version on a particular platform have been moved to the folder matching the latest available version. https://pagure.io/dogtagpki/issue/2687 Change-Id: Iced8c27bdccab0764131ecf4b495251033dc20b1 --- specs/pki-core.spec | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'specs') diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 18273afaa..348a34f4e 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -950,8 +950,17 @@ ln -s %{_mandir}/man1/KRATool.1.gz %{buildroot}%{_mandir}/man1/DRMTool.1.gz # Customize system upgrade scripts in /usr/share/pki/upgrade %if 0%{?rhel} + +# merge newer upgrade scripts into 10.3.3 for RHEL /bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.3.4 /bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.3.5 + +# merge newer upgrade scripts into 10.4.1 for RHEL +/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.2 +/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.3 +/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.4 +/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.5 +/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.6 %endif # Customize client library links in /usr/share/pki/lib @@ -982,10 +991,28 @@ 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-FixDeploymentDescriptor %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/03-FixDeploymentDescriptor + +# merge newer upgrade scripts into 10.3.3 for 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-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 + +# merge newer upgrade scripts into 10.4.1 for RHEL +mv %{buildroot}%{_datadir}/pki/server/upgrade/10.4.2/01-AddSessionAuthenticationPlugin \ + %{buildroot}%{_datadir}/pki/server/upgrade/10.4.1/01-AddSessionAuthenticationPlugin +mv %{buildroot}%{_datadir}/pki/server/upgrade/10.4.2/02-AddKRAWrappingParams \ + %{buildroot}%{_datadir}/pki/server/upgrade/10.4.1/02-AddKRAWrappingParams +mv %{buildroot}%{_datadir}/pki/server/upgrade/10.4.6/01-UpdateKeepAliveTimeout \ + %{buildroot}%{_datadir}/pki/server/upgrade/10.4.1/03-UpdateKeepAliveTimeout +/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.2 +/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.3 +/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.4 +/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.5 +/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.6 + %endif # Customize server library links in /usr/share/pki/server/common/lib -- cgit