rpms/yumex/devel fix-python26-syntax-errors.patch, NONE, 1.1 yumex.spec, 1.69, 1.70

[Tim Lauridsen]

Author: timlau

Update of /cvs/pkgs/rpms/yumex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17267

Modified Files:
	yumex.spec 
Added Files:
	fix-python26-syntax-errors.patch 
Log Message:
bumped release and added patch to fix python 2.6

fix-python26-syntax-errors.patch:

--- NEW FILE fix-python26-syntax-errors.patch ---
>From 81891e5ec8b597bd04189c6493dfa3c1c0115883 Mon Sep 17 00:00:00 2001
From: tla at dk.ibm.com <tla at tlaws.local>
Date: Tue, 9 Dec 2008 13:04:50 +0100
Subject: [PATCH] update yumex to require yum-3.2.x and removed some yum-3.0 compability code, there is making syntax errors in python-2.6

---
 src/yumapi.py |   12 ++----------
 yumex.spec    |    6 ++++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/yumapi.py b/src/yumapi.py
index f270228..6ae87cd 100644
--- a/src/yumapi.py
+++ b/src/yumapi.py
@@ -441,17 +441,9 @@ class YumexYumHandler(yum.YumBase,YumexPackages):
     def doSackSetup(self):      
         yum.YumBase.doSackSetup(self)      
         if self.settings.filelist:
-            # Make it work with yum 3.0
-            if yum.__version__ < '3.2':
-                self.repos.populateSack(with='filelists')      
-            else:
-                self.repos.populateSack(mdtype='filelists')      
+            self.repos.populateSack(mdtype='filelists')      
         if self.settings.changelog:
-            # Make it work with yum 3.0
-            if yum.__version__ < '3.2':
-                self.repos.populateSack(with='otherdata')
-            else:
-                self.repos.populateSack(mdtype='otherdata')
+            self.repos.populateSack(mdtype='otherdata')
         
     
     def gpgsigcheck(self, pkgs):
diff --git a/yumex.spec b/yumex.spec
index 78aa152..16844aa 100755
--- a/yumex.spec
+++ b/yumex.spec
@@ -2,7 +2,7 @@
 
 Name:     yumex
 Version:  2.0.5
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -18,7 +18,7 @@ BuildRequires: gettext
 BuildRequires: intltool
 
 
-Requires: yum >= 3.0
+Requires: yum >= 3.2
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
@@ -68,6 +68,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Dec 9 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.5-2
+- Update Requires: yum to 3.2
 * Sat Nov 15 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.5-1
 - Release 2.0.5
 * Thu Feb 21 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.4-1
-- 
1.5.6.5



Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- yumex.spec	29 Nov 2008 17:35:15 -0000	1.69
+++ yumex.spec	9 Dec 2008 12:48:25 -0000	1.70
@@ -2,13 +2,15 @@
 
 Name:     yumex
 Version:  2.0.5
-Release:  4%{?dist}
+Release:  2%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
 License:  GPLv2+
 URL:      http://www.yum-extender.org
 Source0:  http://www.yum-extender.org/dnl/yumex/source/%{name}-%{version}.tar.gz
+Patch0:   fix-python26-syntax-errors.patch
+
 BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -18,7 +20,7 @@
 BuildRequires: intltool
 
 
-Requires: yum >= 3.0
+Requires: yum >= 3.2
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
@@ -29,7 +31,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 make
@@ -68,13 +70,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.5-4
-- Rebuild for Python 2.6
-
-* Sun Nov 16 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.5-3
-- bump release to make tag happy :(
-* Sun Nov 16 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.5-2
-- Forgot to change the version string :)
+* Tue Dec 9 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.5-2
+- Update Requires: yum to 3.2
+- Added patch to fix python 2.6 syntax errors
 * Sat Nov 15 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.5-1
 - Release 2.0.5
 * Thu Feb 21 2008 Tim Lauridsen <tla at rasmil.dk> - 2.0.4-1