Browse code
Merge pull request #5362 from sdodson/obsolete-3.0
| ... | ... |
@@ -11,6 +11,9 @@ |
| 11 | 11 |
%global tuned_version 2.3 |
| 12 | 12 |
# openvswitch_version is the version of openvswitch requires by packages |
| 13 | 13 |
%global openvswitch_version 2.3.1 |
| 14 |
+# this is the version we obsolete up to. The packaging changed for Origin |
|
| 15 |
+# 1.0.6 and OSE 3.1 such that 'openshift' package names were no longer used. |
|
| 16 |
+%global package_refector_version 3.0.2.900 |
|
| 14 | 17 |
# %commit and %ldflags are intended to be set by tito custom builders provided |
| 15 | 18 |
# in the .tito/lib directory. The values in this spec file will not be kept up to date. |
| 16 | 19 |
%{!?commit:
|
| ... | ... |
@@ -44,7 +47,7 @@ BuildRequires: systemd |
| 44 | 44 |
BuildRequires: golang >= 1.4 |
| 45 | 45 |
Requires: %{name}-clients = %{version}-%{release}
|
| 46 | 46 |
Requires: iptables |
| 47 |
-Obsoletes: openshift < 1.0.6 |
|
| 47 |
+Obsoletes: openshift < %{package_refector_version}
|
|
| 48 | 48 |
|
| 49 | 49 |
%description |
| 50 | 50 |
%{summary}
|
| ... | ... |
@@ -55,7 +58,7 @@ Requires: %{name} = %{version}-%{release}
|
| 55 | 55 |
Requires(post): systemd |
| 56 | 56 |
Requires(preun): systemd |
| 57 | 57 |
Requires(postun): systemd |
| 58 |
-Obsoletes: openshift-master < 1.0.6 |
|
| 58 |
+Obsoletes: openshift-master < %{package_refector_version}
|
|
| 59 | 59 |
|
| 60 | 60 |
%description master |
| 61 | 61 |
%{summary}
|
| ... | ... |
@@ -72,7 +75,7 @@ Requires: ethtool |
| 72 | 72 |
Requires(post): systemd |
| 73 | 73 |
Requires(preun): systemd |
| 74 | 74 |
Requires(postun): systemd |
| 75 |
-Obsoletes: openshift-node < 1.0.6 |
|
| 75 |
+Obsoletes: openshift-node < %{package_refector_version}
|
|
| 76 | 76 |
|
| 77 | 77 |
%description node |
| 78 | 78 |
%{summary}
|
| ... | ... |
@@ -80,14 +83,14 @@ Obsoletes: openshift-node < 1.0.6 |
| 80 | 80 |
%package -n tuned-profiles-%{name}-node
|
| 81 | 81 |
Summary: Tuned profiles for %{product_name} Node hosts
|
| 82 | 82 |
Requires: tuned >= %{tuned_version}
|
| 83 |
-Obsoletes: tuned-profiles-openshift-node < 1.0.6 |
|
| 83 |
+Obsoletes: tuned-profiles-openshift-node < %{package_refector_version}
|
|
| 84 | 84 |
|
| 85 | 85 |
%description -n tuned-profiles-%{name}-node
|
| 86 | 86 |
%{summary}
|
| 87 | 87 |
|
| 88 | 88 |
%package clients |
| 89 | 89 |
Summary: %{product_name} Client binaries for Linux
|
| 90 |
-Obsoletes: openshift-clients < 1.0.6 |
|
| 90 |
+Obsoletes: openshift-clients < %{package_refector_version}
|
|
| 91 | 91 |
|
| 92 | 92 |
%description clients |
| 93 | 93 |
%{summary}
|
| ... | ... |
@@ -96,7 +99,7 @@ Obsoletes: openshift-clients < 1.0.6 |
| 96 | 96 |
Summary: %{product_name} Client binaries for Linux, Mac OSX, and Windows
|
| 97 | 97 |
BuildRequires: golang-pkg-darwin-amd64 |
| 98 | 98 |
BuildRequires: golang-pkg-windows-386 |
| 99 |
-Obsoletes: openshift-clients-redistributable < 1.0.6 |
|
| 99 |
+Obsoletes: openshift-clients-redistributable < %{package_refector_version}
|
|
| 100 | 100 |
|
| 101 | 101 |
%description clients-redistributable |
| 102 | 102 |
%{summary}
|
| ... | ... |
@@ -121,7 +124,7 @@ Requires: openvswitch >= %{openvswitch_version}
|
| 121 | 121 |
Requires: %{name}-node = %{version}-%{release}
|
| 122 | 122 |
Requires: bridge-utils |
| 123 | 123 |
Requires: ethtool |
| 124 |
-Obsoletes: openshift-sdn-ovs < 1.0.6 |
|
| 124 |
+Obsoletes: openshift-sdn-ovs < %{package_refector_version}
|
|
| 125 | 125 |
|
| 126 | 126 |
%description sdn-ovs |
| 127 | 127 |
%{summary}
|