diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-06-01 06:37:37 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-06-02 17:32:02 +0200 |
| commit | 87eff25bcbd476183cf6378f0d8c5540fa776ec5 (patch) | |
| tree | 82b70f6340cd95926b6435b9b35d6cad6a91c5c8 /specs | |
| parent | b3d851b864dc986a9af8ffcb1962f8e7b4de3114 (diff) | |
| download | pki-87eff25bcbd476183cf6378f0d8c5540fa776ec5.tar.gz pki-87eff25bcbd476183cf6378f0d8c5540fa776ec5.tar.xz pki-87eff25bcbd476183cf6378f0d8c5540fa776ec5.zip | |
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
Diffstat (limited to 'specs')
| -rw-r--r-- | specs/pki-core.spec | 31 |
1 files changed, 29 insertions, 2 deletions
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 |