From 6e893ccd6d2ab59316857ee74c6596a73319d3e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Mon, 11 Aug 2008 23:58:01 +0000 Subject: [PATCH 01/13] - Fix license tag. --- yum-arch.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yum-arch.spec b/yum-arch.spec index 336c87f..609690d 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,8 +1,8 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz Patch1: yum-arch-folder.patch @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Mon Aug 11 2008 Jason L Tibbitts III - 2.2.2-3 +- Fix license tag. + * Sun Feb 18 2007 Remi Collet - 2.2.2-2 - from package review (#229123) own /usr/share/yum-arch From 7e45f67d04d0a131027c8b86b1843a02a1bb044c Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Mon, 1 Dec 2008 15:00:56 +0000 Subject: [PATCH 02/13] Rebuild for Python 2.6 --- yum-arch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-arch.spec b/yum-arch.spec index 609690d..ff85e4f 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,7 +1,7 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 2.2.2-4 +- Rebuild for Python 2.6 + * Mon Aug 11 2008 Jason L Tibbitts III - 2.2.2-3 - Fix license tag. From 9eecab6b93a39e5285a7343a7caa8cc23b0aafcb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:21:35 +0000 Subject: [PATCH 03/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- yum-arch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-arch.spec b/yum-arch.spec index ff85e4f..1ef7619 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,7 +1,7 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 01 2008 Ignacio Vazquez-Abrams - 2.2.2-4 - Rebuild for Python 2.6 From cac20c69462b8e1119c0aeb854473d3adea7f058 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 16 May 2009 19:01:30 +0000 Subject: [PATCH 04/13] fix python 2.6 issue (with is a reserved keyword) --- yum-arch-python26.patch | 54 +++++++++++++++++++++++++++++++++++++++++ yum-arch.spec | 8 +++++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 yum-arch-python26.patch diff --git a/yum-arch-python26.patch b/yum-arch-python26.patch new file mode 100644 index 0000000..796ac44 --- /dev/null +++ b/yum-arch-python26.patch @@ -0,0 +1,54 @@ +diff -up yum-2.2.2/yum/depsolve.py.p26 yum-2.2.2/yum/depsolve.py +--- yum-2.2.2/yum/depsolve.py.p26 2009-05-16 19:34:02.000000000 +0200 ++++ yum-2.2.2/yum/depsolve.py 2009-05-16 19:35:07.000000000 +0200 +@@ -67,7 +67,7 @@ class Depsolve: + matched = 1 + if not matched: + self.log(2, 'Importing Additional filelist information for dependency resolution') +- self.repos.populateSack(with='filelists') ++ self.repos.populateSack(mdtype='filelists') + + pkgs = self.pkgSack.searchProvides(name) + if flags == 0: +diff -up yum-2.2.2/yum/__init__.py.p26 yum-2.2.2/yum/__init__.py +--- yum-2.2.2/yum/__init__.py.p26 2009-05-16 19:33:54.000000000 +0200 ++++ yum-2.2.2/yum/__init__.py 2009-05-16 19:34:56.000000000 +0200 +@@ -904,7 +904,7 @@ class YumBase(depsolve.Depsolve): + matched = 1 + if not matched: + self.log(2, 'Importing Additional filelist information for packages') +- self.repos.populateSack(with='filelists') ++ self.repos.populateSack(mdtype='filelists') + + for arg in args: + restring = self._refineSearchPattern(arg) +diff -up yum-2.2.2/yum/pgpmsg.py.p26 yum-2.2.2/yum/pgpmsg.py +diff -up yum-2.2.2/yum/repos.py.p26 yum-2.2.2/yum/repos.py +--- yum-2.2.2/yum/repos.py.p26 2009-05-16 19:34:10.000000000 +0200 ++++ yum-2.2.2/yum/repos.py 2009-05-16 19:35:39.000000000 +0200 +@@ -202,10 +202,10 @@ class RepoStorage: + repo.setupGrab() + + +- def populateSack(self, which='enabled', with='metadata', callback=None, pickleonly=0): ++ def populateSack(self, which='enabled', mdtype='metadata', callback=None, pickleonly=0): + """This populates the package sack from the repositories, two optional + arguments: which='repoid, enabled, all' +- with='metadata, filelists, otherdata, all'""" ++ mdtype='metadata, filelists, otherdata, all'""" + + if not callback: + callback = self.callback +@@ -223,10 +223,10 @@ class RepoStorage: + repobj = self.getRepo(which) + myrepos.append(repobj) + +- if with == 'all': ++ if mdtype == 'all': + data = ['metadata', 'filelists', 'otherdata'] + else: +- data = [ with ] ++ data = [ mdtype ] + + for repo in myrepos: + if not hasattr(repo, 'cacheHandler'): diff --git a/yum-arch.spec b/yum-arch.spec index 1ef7619..5e49106 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,11 +1,13 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz Patch1: yum-arch-folder.patch +Patch2: yum-arch-python26.patch + URL: http://linux.duke.edu/yum/ BuildArch: noarch @@ -24,6 +26,7 @@ and RedHat Enterprise Linux < 4. %prep %setup -q -n yum-%{version} %patch1 -p0 -b .folder +%patch2 -p1 -b .p26 # to avoid rpmlint warnings for source in *.py {repomd,rpmUtils,yum}/*.py; do @@ -49,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Sat May 16 2009 Remi Collet - 2.2.2-6 +- fix python 2.6 issue + * Wed Feb 25 2009 Fedora Release Engineering - 2.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 5842f0fa4f77e428d7c195baa7d5c045163e411d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:56:58 +0000 Subject: [PATCH 05/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- yum-arch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-arch.spec b/yum-arch.spec index 5e49106..58bb3f8 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,7 +1,7 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 2.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sat May 16 2009 Remi Collet - 2.2.2-6 - fix python 2.6 issue From 064a8c6c1616277b1e8c0e6b096081244be4ab2d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 26 Sep 2009 13:55:32 +0000 Subject: [PATCH 06/13] fix python 2.6 warnings (#521869) --- yum-arch-python26.patch | 39 +++++++++++++++++++++++++++++++++++++++ yum-arch.spec | 6 +++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/yum-arch-python26.patch b/yum-arch-python26.patch index 796ac44..92202b3 100644 --- a/yum-arch-python26.patch +++ b/yum-arch-python26.patch @@ -52,3 +52,42 @@ diff -up yum-2.2.2/yum/repos.py.p26 yum-2.2.2/yum/repos.py for repo in myrepos: if not hasattr(repo, 'cacheHandler'): +--- yum-2.2.2/rpmUtils/oldUtils.py.orig 2009-05-16 20:10:54.000000000 +0100 ++++ yum-2.2.2/rpmUtils/oldUtils.py 2009-09-08 15:19:47.494521706 +0100 +@@ -151,7 +151,10 @@ + def _write_gzip_header(self): + self.fileobj.write('\037\213') # magic header + self.fileobj.write('\010') # compression method +- fname = self.filename[:-3] ++ if self.name[-3:] != ".gz": ++ fname = self.name ++ else: ++ fname = self.name[:-3] + flags = 0 + if fname: + flags = FNAME +--- yum-2.2.2/yum/pgpmsg.py.orig 2009-05-16 20:10:54.000000000 +0100 ++++ yum-2.2.2/yum/pgpmsg.py 2009-09-08 15:31:53.921273337 +0100 +@@ -13,7 +13,12 @@ + ##You should have received a copy of the GNU General Public License + ##along with this program; if not, write to the Free Software + ##Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-import string, struct, time, cStringIO, base64, types, sha ++import string, struct, time, cStringIO, base64, types ++try: ++ from hashlib import sha1 as sha ++except: ++ from sha import new as sha ++ + + debug = None + +@@ -385,7 +390,7 @@ + #XXX do the v3 fingerprint here + + elif self.version == 4: +- s = sha.new() ++ s = sha() + s.update(self.pkttag) + s.update(struct.pack(">H", pkt_len)) + s.update(msg[idx_save:idx_save+pkt_len]) diff --git a/yum-arch.spec b/yum-arch.spec index 58bb3f8..7676163 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,10 +1,11 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz + Patch1: yum-arch-folder.patch Patch2: yum-arch-python26.patch @@ -52,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Sat Sep 26 2009 Remi Collet - 2.2.2-8 +- fix python 2.6 warnings (#521869) + * Mon Jul 27 2009 Fedora Release Engineering - 2.2.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 5007f4a43499793d83b55f45d271dc58d75611b5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:36 +0000 Subject: [PATCH 07/13] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d2aa6c0..97af54c 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: yum-arch -# $Id$ +# $Id: Makefile,v 1.1 2007/02/20 01:24:25 wtogami Exp $ NAME := yum-arch SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From bcf909398109a3d90d0b619e2f3ea2800a7b4ad4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 14 Feb 2010 07:08:50 +0000 Subject: [PATCH 08/13] improve python 2.6 patch - fix FTBFS #564994 --- yum-arch-python26.patch | 24 ++++++++++++++++++++++++ yum-arch.spec | 5 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/yum-arch-python26.patch b/yum-arch-python26.patch index 92202b3..c7f54f9 100644 --- a/yum-arch-python26.patch +++ b/yum-arch-python26.patch @@ -91,3 +91,27 @@ diff -up yum-2.2.2/yum/repos.py.p26 yum-2.2.2/yum/repos.py s.update(self.pkttag) s.update(struct.pack(">H", pkt_len)) s.update(msg[idx_save:idx_save+pkt_len]) +--- yum-2.2.2/cli.py.p26 2010-02-14 08:00:21.000000000 +0100 ++++ yum-2.2.2/cli.py 2010-02-14 08:00:59.000000000 +0100 +@@ -491,7 +491,7 @@ + needrepos.append(po.repoid) + + self.log(2, 'Importing Changelog Metadata') +- self.repos.populateSack(with='otherdata', which=needrepos) ++ self.repos.populateSack(mdtype='otherdata', which=needrepos) + self.log(2, 'Generating RSS File for %s' % pkgtype) + + self.listPkgs(this_pkg_list, titles[pkgtype], outputType='rss') +@@ -602,9 +602,9 @@ + self.log(3, '%s' % self.pickleRecipe()) + try: + self.doRepoSetup(nosack=1) +- self.repos.populateSack(with='metadata', pickleonly=1) +- self.repos.populateSack(with='filelists', pickleonly=1) +- self.repos.populateSack(with='otherdata', pickleonly=1) ++ self.repos.populateSack(mdtype='metadata', pickleonly=1) ++ self.repos.populateSack(mdtype='filelists', pickleonly=1) ++ self.repos.populateSack(mdtype='otherdata', pickleonly=1) + + except yum.Errors.YumBaseError, e: + return 1, [str(e)] diff --git a/yum-arch.spec b/yum-arch.spec index 7676163..7ab3a23 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,7 +1,7 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Sun Feb 14 2010 Remi Collet - 2.2.2-9 +- improve python 2.6 patch (fix FTBFS #564994) + * Sat Sep 26 2009 Remi Collet - 2.2.2-8 - fix python 2.6 warnings (#521869) From 3ea8656ad70ba1c9e57bb1f36ad75d7c502c258c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:25:50 +0000 Subject: [PATCH 09/13] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 97af54c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yum-arch -# $Id: Makefile,v 1.1 2007/02/20 01:24:25 wtogami Exp $ -NAME := yum-arch -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From b8468c39c9214e9f99f3631efe4d4ae929b89e83 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 11 Aug 2010 18:42:56 -0400 Subject: [PATCH 10/13] recompiling .py files against Python 2.7 (rhbz#623421) --- yum-arch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-arch.spec b/yum-arch.spec index 7ab3a23..a75069b 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,7 +1,7 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Wed Aug 11 2010 David Malcolm - 2.2.2-10 +- recompiling .py files against Python 2.7 (rhbz#623421) + * Sun Feb 14 2010 Remi Collet - 2.2.2-9 - improve python 2.6 patch (fix FTBFS #564994) From 0d04b30dccdb88cf8969cec7b304432811e16e1a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 02:18:21 -0600 Subject: [PATCH 11/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- yum-arch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-arch.spec b/yum-arch.spec index a75069b..bee3748 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,7 +1,7 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Aug 11 2010 David Malcolm - 2.2.2-10 - recompiling .py files against Python 2.7 (rhbz#623421) From 752b62676cab5d8e0202c54c5adb957686bca712 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:31:01 -0600 Subject: [PATCH 12/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- yum-arch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-arch.spec b/yum-arch.spec index bee3748..6746c99 100644 --- a/yum-arch.spec +++ b/yum-arch.spec @@ -1,7 +1,7 @@ Summary: Extract headers from rpm in a old yum repository Name: yum-arch Version: 2.2.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/%{name}* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 2.2.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 2.2.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From cf4357f4aab916f32308280ad21ee3885728c86b Mon Sep 17 00:00:00 2001 From: remi Date: Thu, 1 Mar 2012 16:48:19 +0100 Subject: [PATCH 13/13] EL-4 is now EOL, so become unuseful --- .gitignore | 1 - dead.package | 1 + sources | 1 - yum-arch-folder.patch | 91 ------------------------------- yum-arch-python26.patch | 117 ---------------------------------------- yum-arch.spec | 92 ------------------------------- 6 files changed, 1 insertion(+), 302 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 yum-arch-folder.patch delete mode 100644 yum-arch-python26.patch delete mode 100644 yum-arch.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 097636e..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -yum-2.2.2.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5028492 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +EL-4 is now EOL, so become unuseful diff --git a/sources b/sources deleted file mode 100644 index 2a7ee78..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -734cc68e26c2fd07629616ab597acac6 yum-2.2.2.tar.gz diff --git a/yum-arch-folder.patch b/yum-arch-folder.patch deleted file mode 100644 index 7ab0121..0000000 --- a/yum-arch-folder.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- ./docs/Makefile.remi 2004-10-13 07:36:58.000000000 +0200 -+++ ./docs/Makefile 2007-02-16 17:11:37.000000000 +0100 -@@ -5,7 +5,5 @@ - rm -f *.pyc *.pyo *~ - - install: -- mkdir -p $(DESTDIR)/usr/share/man/man{5,8} -- install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8 -+ mkdir -p $(DESTDIR)/usr/share/man/man8 - install -m 644 yum-arch.8 $(DESTDIR)/usr/share/man/man8/yum-arch.8 -- install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5 ---- ./yum/Makefile.remi 2004-08-31 06:20:04.000000000 +0200 -+++ ./yum/Makefile 2007-02-16 17:11:37.000000000 +0100 -@@ -3,7 +3,7 @@ - PYVER := $(shell python -c 'import sys; print "%.3s" %(sys.version)') - PYSYSDIR := $(shell python -c 'import sys; print sys.prefix') - PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER) --PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE) -+PKGDIR = /usr/share/yum-arch/$(PACKAGE) - - all: - echo "Nothing to do" ---- ./repomd/Makefile.remi 2004-08-31 06:20:03.000000000 +0200 -+++ ./repomd/Makefile 2007-02-16 17:11:37.000000000 +0100 -@@ -3,7 +3,7 @@ - PYVER := $(shell python -c 'import sys; print "%.3s" %(sys.version)') - PYSYSDIR := $(shell python -c 'import sys; print sys.prefix') - PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER) --PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE) -+PKGDIR = /usr/share/yum-arch/$(PACKAGE) - - all: - echo "Nothing to do" ---- ./bin/yum-arch.remi 2004-10-13 07:57:34.000000000 +0200 -+++ ./bin/yum-arch 2007-02-16 17:11:37.000000000 +0100 -@@ -18,6 +18,6 @@ - - import sys - --sys.path.insert(1,'/usr/share/yum-cli') -+sys.path.insert(0,'/usr/share/yum-arch') - import pullheaders - pullheaders.main(sys.argv[1:]) ---- ./Makefile.remi 2005-01-25 06:56:43.000000000 +0100 -+++ ./Makefile 2007-02-16 17:13:59.000000000 +0100 -@@ -1,4 +1,4 @@ --SUBDIRS = repomd rpmUtils urlgrabber yum etc docs -+SUBDIRS = repomd rpmUtils urlgrabber yum docs - PYFILES = $(wildcard *.py) - - PKGNAME = yum -@@ -17,14 +17,13 @@ - for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done - - install: -- mkdir -p $(DESTDIR)/usr/share/yum-cli -+ mkdir -p $(DESTDIR)/usr/share/yum-arch - for p in $(PYFILES) ; do \ -- install -m 644 $$p $(DESTDIR)/usr/share/yum-cli/$$p; \ -+ install -m 644 $$p $(DESTDIR)/usr/share/yum-arch/$$p; \ - done -- $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)" -+ $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-arch', 1, '$(PYDIR)', 1)" - - mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/bin -- install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum - install -m 755 bin/yum-arch $(DESTDIR)/usr/bin/yum-arch - - mkdir -p $(DESTDIR)/var/cache/yum ---- ./urlgrabber/Makefile.remi 2004-08-31 06:20:04.000000000 +0200 -+++ ./urlgrabber/Makefile 2007-02-16 17:11:37.000000000 +0100 -@@ -3,7 +3,7 @@ - PYVER := $(shell python -c 'import sys; print "%.3s" %(sys.version)') - PYSYSDIR := $(shell python -c 'import sys; print sys.prefix') - PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER) --PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE) -+PKGDIR = /usr/share/yum-arch/$(PACKAGE) - - all: - echo "Nothing to do" ---- ./rpmUtils/Makefile.remi 2004-08-31 06:20:03.000000000 +0200 -+++ ./rpmUtils/Makefile 2007-02-16 17:11:37.000000000 +0100 -@@ -3,7 +3,7 @@ - PYVER := $(shell python -c 'import sys; print "%.3s" %(sys.version)') - PYSYSDIR := $(shell python -c 'import sys; print sys.prefix') - PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER) --PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE) -+PKGDIR = /usr/share/yum-arch/$(PACKAGE) - - all: - echo "Nothing to do" diff --git a/yum-arch-python26.patch b/yum-arch-python26.patch deleted file mode 100644 index c7f54f9..0000000 --- a/yum-arch-python26.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -up yum-2.2.2/yum/depsolve.py.p26 yum-2.2.2/yum/depsolve.py ---- yum-2.2.2/yum/depsolve.py.p26 2009-05-16 19:34:02.000000000 +0200 -+++ yum-2.2.2/yum/depsolve.py 2009-05-16 19:35:07.000000000 +0200 -@@ -67,7 +67,7 @@ class Depsolve: - matched = 1 - if not matched: - self.log(2, 'Importing Additional filelist information for dependency resolution') -- self.repos.populateSack(with='filelists') -+ self.repos.populateSack(mdtype='filelists') - - pkgs = self.pkgSack.searchProvides(name) - if flags == 0: -diff -up yum-2.2.2/yum/__init__.py.p26 yum-2.2.2/yum/__init__.py ---- yum-2.2.2/yum/__init__.py.p26 2009-05-16 19:33:54.000000000 +0200 -+++ yum-2.2.2/yum/__init__.py 2009-05-16 19:34:56.000000000 +0200 -@@ -904,7 +904,7 @@ class YumBase(depsolve.Depsolve): - matched = 1 - if not matched: - self.log(2, 'Importing Additional filelist information for packages') -- self.repos.populateSack(with='filelists') -+ self.repos.populateSack(mdtype='filelists') - - for arg in args: - restring = self._refineSearchPattern(arg) -diff -up yum-2.2.2/yum/pgpmsg.py.p26 yum-2.2.2/yum/pgpmsg.py -diff -up yum-2.2.2/yum/repos.py.p26 yum-2.2.2/yum/repos.py ---- yum-2.2.2/yum/repos.py.p26 2009-05-16 19:34:10.000000000 +0200 -+++ yum-2.2.2/yum/repos.py 2009-05-16 19:35:39.000000000 +0200 -@@ -202,10 +202,10 @@ class RepoStorage: - repo.setupGrab() - - -- def populateSack(self, which='enabled', with='metadata', callback=None, pickleonly=0): -+ def populateSack(self, which='enabled', mdtype='metadata', callback=None, pickleonly=0): - """This populates the package sack from the repositories, two optional - arguments: which='repoid, enabled, all' -- with='metadata, filelists, otherdata, all'""" -+ mdtype='metadata, filelists, otherdata, all'""" - - if not callback: - callback = self.callback -@@ -223,10 +223,10 @@ class RepoStorage: - repobj = self.getRepo(which) - myrepos.append(repobj) - -- if with == 'all': -+ if mdtype == 'all': - data = ['metadata', 'filelists', 'otherdata'] - else: -- data = [ with ] -+ data = [ mdtype ] - - for repo in myrepos: - if not hasattr(repo, 'cacheHandler'): ---- yum-2.2.2/rpmUtils/oldUtils.py.orig 2009-05-16 20:10:54.000000000 +0100 -+++ yum-2.2.2/rpmUtils/oldUtils.py 2009-09-08 15:19:47.494521706 +0100 -@@ -151,7 +151,10 @@ - def _write_gzip_header(self): - self.fileobj.write('\037\213') # magic header - self.fileobj.write('\010') # compression method -- fname = self.filename[:-3] -+ if self.name[-3:] != ".gz": -+ fname = self.name -+ else: -+ fname = self.name[:-3] - flags = 0 - if fname: - flags = FNAME ---- yum-2.2.2/yum/pgpmsg.py.orig 2009-05-16 20:10:54.000000000 +0100 -+++ yum-2.2.2/yum/pgpmsg.py 2009-09-08 15:31:53.921273337 +0100 -@@ -13,7 +13,12 @@ - ##You should have received a copy of the GNU General Public License - ##along with this program; if not, write to the Free Software - ##Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --import string, struct, time, cStringIO, base64, types, sha -+import string, struct, time, cStringIO, base64, types -+try: -+ from hashlib import sha1 as sha -+except: -+ from sha import new as sha -+ - - debug = None - -@@ -385,7 +390,7 @@ - #XXX do the v3 fingerprint here - - elif self.version == 4: -- s = sha.new() -+ s = sha() - s.update(self.pkttag) - s.update(struct.pack(">H", pkt_len)) - s.update(msg[idx_save:idx_save+pkt_len]) ---- yum-2.2.2/cli.py.p26 2010-02-14 08:00:21.000000000 +0100 -+++ yum-2.2.2/cli.py 2010-02-14 08:00:59.000000000 +0100 -@@ -491,7 +491,7 @@ - needrepos.append(po.repoid) - - self.log(2, 'Importing Changelog Metadata') -- self.repos.populateSack(with='otherdata', which=needrepos) -+ self.repos.populateSack(mdtype='otherdata', which=needrepos) - self.log(2, 'Generating RSS File for %s' % pkgtype) - - self.listPkgs(this_pkg_list, titles[pkgtype], outputType='rss') -@@ -602,9 +602,9 @@ - self.log(3, '%s' % self.pickleRecipe()) - try: - self.doRepoSetup(nosack=1) -- self.repos.populateSack(with='metadata', pickleonly=1) -- self.repos.populateSack(with='filelists', pickleonly=1) -- self.repos.populateSack(with='otherdata', pickleonly=1) -+ self.repos.populateSack(mdtype='metadata', pickleonly=1) -+ self.repos.populateSack(mdtype='filelists', pickleonly=1) -+ self.repos.populateSack(mdtype='otherdata', pickleonly=1) - - except yum.Errors.YumBaseError, e: - return 1, [str(e)] diff --git a/yum-arch.spec b/yum-arch.spec deleted file mode 100644 index 6746c99..0000000 --- a/yum-arch.spec +++ /dev/null @@ -1,92 +0,0 @@ -Summary: Extract headers from rpm in a old yum repository -Name: yum-arch -Version: 2.2.2 -Release: 12%{?dist} -License: GPLv2+ -Group: System Environment/Base -Source0: http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz - -Patch1: yum-arch-folder.patch -Patch2: yum-arch-python26.patch - -URL: http://linux.duke.edu/yum/ - -BuildArch: noarch -BuildRequires: python, gettext - -Requires: python, rpm-python, rpm >= 0:4.1.1, libxml2-python -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%description -Extract headers from rpm in a old yum repository. - -This package only provides the old yum-arch command from yum-%{version} -It should be used to generate repository informations for Fedora Core < 3 -and RedHat Enterprise Linux < 4. - -%prep -%setup -q -n yum-%{version} -%patch1 -p0 -b .folder -%patch2 -p1 -b .p26 - -# to avoid rpmlint warnings -for source in *.py {repomd,rpmUtils,yum}/*.py; do - sed -i -e '/^#!\/usr/d' $source -done - -%build -make - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-, root, root, -) -%doc README AUTHORS COPYING TODO INSTALL ChangeLog -%{_datadir}/%{name} -%{_bindir}/%{name} -%{_mandir}/man8/%{name}* - -%changelog -* Sat Jan 14 2012 Fedora Release Engineering - 2.2.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 2.2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Aug 11 2010 David Malcolm - 2.2.2-10 -- recompiling .py files against Python 2.7 (rhbz#623421) - -* Sun Feb 14 2010 Remi Collet - 2.2.2-9 -- improve python 2.6 patch (fix FTBFS #564994) - -* Sat Sep 26 2009 Remi Collet - 2.2.2-8 -- fix python 2.6 warnings (#521869) - -* Mon Jul 27 2009 Fedora Release Engineering - 2.2.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat May 16 2009 Remi Collet - 2.2.2-6 -- fix python 2.6 issue - -* Wed Feb 25 2009 Fedora Release Engineering - 2.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 2.2.2-4 -- Rebuild for Python 2.6 - -* Mon Aug 11 2008 Jason L Tibbitts III - 2.2.2-3 -- Fix license tag. - -* Sun Feb 18 2007 Remi Collet - 2.2.2-2 -- from package review (#229123) - own /usr/share/yum-arch - del shellbang in libs - -* Sat Feb 17 2007 Remi Collet - 2.2.2-1 -- initial spec for Extras