Browse code
Fix an upgrade conflict between old release of tcl-devel and new release of tcl that have same files
Change-Id: Id8c00bfdd207f964b62ead1ac4e7c368a065dc3c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3712
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
Danut Moraru authored on 2017/09/07 07:52:18Showing 1 changed files
| ... | ... |
@@ -2,7 +2,7 @@ Summary: Tool Command Language - the language and library. |
| 2 | 2 |
Name: tcl |
| 3 | 3 |
Version: 8.6.6 |
| 4 | 4 |
%define majorver 8.6 |
| 5 |
-Release: 2%{?dist}
|
|
| 5 |
+Release: 3%{?dist}
|
|
| 6 | 6 |
URL: http://tcl.sourceforge.net/ |
| 7 | 7 |
License: LGPLv2+ |
| 8 | 8 |
Group: System Environment/Libraries |
| ... | ... |
@@ -12,6 +12,7 @@ Source0: http://downloads.sourceforge.net/sourceforge/tcl/tcl-core%{versi
|
| 12 | 12 |
%define sha1 tcl-core=6a1bc424faeef44fed5e44d32198c7ff4ff05658 |
| 13 | 13 |
|
| 14 | 14 |
BuildRequires: cmake |
| 15 |
+Obsoletes: tcl < 8.6.6-3 |
|
| 15 | 16 |
|
| 16 | 17 |
%description |
| 17 | 18 |
Tcl provides a powerful platform for creating integration applications that |
| ... | ... |
@@ -24,7 +25,8 @@ powerful command languages for applications. |
| 24 | 24 |
%package devel |
| 25 | 25 |
Summary: Headers and development libraries for tcl |
| 26 | 26 |
Group: Development/Libraries |
| 27 |
-Requires: %{name} = %{version}
|
|
| 27 |
+Requires: %{name} = %{version}-%{release}
|
|
| 28 |
+Obsoletes: tcl-devel < 8.6.6-3 |
|
| 28 | 29 |
|
| 29 | 30 |
%description devel |
| 30 | 31 |
Headers and development libraries for tcl |
| ... | ... |
@@ -98,6 +100,9 @@ make test |
| 98 | 98 |
|
| 99 | 99 |
|
| 100 | 100 |
%changelog |
| 101 |
+* Wed Sep 06 2017 Danut Moraru <dmoraru@vmware.com> 8.6.6-3 |
|
| 102 |
+- Release 3 obsoletes 1 and 2, as upgrade from rel 1 to rel 2 may bring in conflict files in tcl-devel rel 1 that have |
|
| 103 |
+ been moved to tcl rel 2. |
|
| 101 | 104 |
* Mon Aug 28 2017 Danut Moraru <dmoraru@vmware.com> 8.6.6-2 |
| 102 | 105 |
- Ported previous change from dev to 1.0 branch |
| 103 | 106 |
* Thu Jul 13 2017 Alexey Makhalov <amakhalov@vmware.com> 8.6.6-2 |