Changeset 787 for spec/trunk/SPECS/python.spec

Timestamp:

Jun 10, 2016, 9:39:20 AM (9 years ago)

Author:

Yuri Dario

Message:

spec: python, fixed Obsoletes vs Conflicts, fixed python2-devel and -tools version.

File:

• spec/trunk/SPECS/python.spec (modified) (5 diffs)

spec/trunk/SPECS/python.spec

@@ -50 +50 @@
 Name: %{python}
 Version: 2.7.6
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: Python
 Group: Development/Languages
@@ -77 +77 @@
 
 # YD because of ucs4
-Obsoletes: python-pycurl <= 7.19.5.1-1
-Obsoletes: rpm <= 4.13.0-7
-Obsoletes: yum-metadata-parser <= 1.1.4-5
+Conflicts: python-pycurl <= 7.19.5.1-1
+Conflicts: rpm <= 4.13.0-7
+Conflicts: yum-metadata-parser <= 1.1.4-5
 
 # YD unix adds this automatically by parsing elf binaries
@@ -176 +176 @@
 %if %{main_python}
 Obsoletes: python2-tools
-Provides: python2-tools = %{version}
+Provides: python2-tools = %{version}-%{release}
 %endif
 
@@ -191 +191 @@
 %if %{main_python}
 Obsoletes: tkinter2
-Provides: tkinter2 = %{version}
+Provides: tkinter2 = %{version}-%{release}
 %endif
 
@@ -511 +511 @@
 
 %changelog
+* Fri Jun 10 2016 yd <yd@os2power.com> 2.7.6-14
+- fixed Obsoletes vs Conflicts.
+- fixed python2-devel and -tools version.
+
 * Thu Jun 09 2016 yd <yd@os2power.com> 2.7.6-13
 - enable support for ucs4 unicode set. ticket#182.