Autoremove imported patches from packaging

Removed all imported patches from createrepo.spec
and patch files from the packaging dir.

diff --git a/packaging/createrepo-0.9.8-cache_utime.patch b/packaging/createrepo-0.9.8-cache_utime.patch
deleted file mode 100644 (file)
index 8ec1ce2..0000000
--- a/packaging/createrepo-0.9.8-cache_utime.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- createrepo/yumbased.py.orig        2010-04-09 10:22:09.000000000 +0200
-+++ createrepo/yumbased.py     2010-04-09 10:22:26.000000000 +0200
-@@ -70,7 +70,7 @@
-             csumo = open(csumfile, 'r')
-             checksum = csumo.readline()
-             csumo.close()
--
-+            os.path.os.utime(csumfile, None)
-         else:
-             checksum = misc.checksum(self.checksum_type, self.localpath)
- 

diff --git a/packaging/createrepo-0.9.8-cachefix.patch b/packaging/createrepo-0.9.8-cachefix.patch
deleted file mode 100644 (file)
index a7f391a..0000000
--- a/packaging/createrepo-0.9.8-cachefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- createrepo/yumbased.py.orig        2010-04-09 10:22:09.000000000 +0200
-+++ createrepo/yumbased.py     2010-04-09 10:28:58.000000000 +0200
-@@ -55,8 +55,8 @@
-             t.append("".join(self.hdr[rpm.RPMTAG_SIGGPG]))
-         if type(self.hdr[rpm.RPMTAG_SIGPGP]) is not types.NoneType:
-             t.append("".join(self.hdr[rpm.RPMTAG_SIGPGP]))
--        if type(self.hdr[rpm.RPMTAG_HDRID]) is not types.NoneType:
--            t.append("".join(self.hdr[rpm.RPMTAG_HDRID]))
-+        if type(self.hdr[rpm.RPMTAG_SHA1HEADER]) is not types.NoneType:
-+            t.append("".join(self.hdr[rpm.RPMTAG_SHA1HEADER]))
- 
-         kcsum = misc.Checksums(checksums=[self.checksum_type])
-         kcsum.update("".join(t))

diff --git a/packaging/createrepo-0.9.8-disable-deltarpm-1.patch b/packaging/createrepo-0.9.8-disable-deltarpm-1.patch
deleted file mode 100644 (file)
index a70dca4..0000000
--- a/packaging/createrepo-0.9.8-disable-deltarpm-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- createrepo/deltarpms.py.orig       2010-03-31 16:18:27.000000000 +0200
-+++ createrepo/deltarpms.py    2010-03-31 16:23:24.000000000 +0200
-@@ -18,7 +18,7 @@
- import os.path
- import commands
- from yum import misc
--import deltarpm
-+# import deltarpm
- from utils import MDError
- 
- class DeltaRPMPackage:
-@@ -62,10 +62,11 @@
-         return length
- 
-     def _getDRPMInfo(self, filename):
--        d = deltarpm.readDeltaRPM(filename)
--        self.oldnevrstring = d['old_nevr']
--        self.oldnevr = self._stringToNEVR(d['old_nevr'])
--        self.sequence = d['seq']
-+        # d = deltarpm.readDeltaRPM(filename)
-+        # self.oldnevrstring = d['old_nevr']
-+        # self.oldnevr = self._stringToNEVR(d['old_nevr'])
-+        # self.sequence = d['seq']
-+        return
- 
-     def _stringToVersion(self, strng):
-         i = strng.find(':')

diff --git a/packaging/createrepo-0.9.8-disable-deltarpm-2.patch b/packaging/createrepo-0.9.8-disable-deltarpm-2.patch
deleted file mode 100644 (file)
index 8726e71..0000000
--- a/packaging/createrepo-0.9.8-disable-deltarpm-2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- genpkgmetadata.py.orig     2010-03-31 16:55:03.000000000 +0200
-+++ genpkgmetadata.py  2010-03-31 16:55:14.000000000 +0200
-@@ -106,8 +106,8 @@
-         action="append", help="tags to describe the repository itself")
-     parser.add_option("--revision", default=None,
-         help="user-specified revision for this repository")
--    parser.add_option("--deltas", default=False, action="store_true",
--        help="create delta rpms and metadata")
-+    #parser.add_option("--deltas", default=False, action="store_true",
-+    #    help="create delta rpms and metadata")
-     parser.add_option("--oldpackagedirs", default=[], dest="oldpackage_paths",
-         action="append", help="paths to look for older pkgs to delta against")
-     parser.add_option("--num-deltas", default=1, dest='num_deltas', type='int',

diff --git a/packaging/createrepo-0.9.8-license-to-confirm.patch b/packaging/createrepo-0.9.8-license-to-confirm.patch
deleted file mode 100644 (file)
index 3cadf11..0000000
--- a/packaging/createrepo-0.9.8-license-to-confirm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- createrepo/__init__.py.orig        2010-04-09 11:09:01.000000000 +0200
-+++ createrepo/__init__.py     2010-04-09 11:13:01.000000000 +0200
-@@ -391,6 +392,7 @@
-         fo = _gzipOpen(primaryfilepath, 'w')
-         fo.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-         fo.write('<metadata xmlns="http://linux.duke.edu/metadata/common"' \
-+            ' xmlns:suse="http://novell.com/package/metadata/suse/common"' \
-             ' xmlns:rpm="http://linux.duke.edu/metadata/rpm" packages="%s">' %
-                        self.pkgcount)
-         return fo
-@@ -806,6 +829,7 @@
-         rpmns = reporoot.newNs("http://linux.duke.edu/metadata/rpm", 'rpm')
-         repopath = os.path.join(self.conf.outputdir, self.conf.tempdir)
-         repofilepath = os.path.join(repopath, self.conf.repomdfile)
-+        susens = reporoot.newNs("http://novell.com/package/metadata/suse/common", 'suse')
- 
-         revision = reporoot.newChild(None, 'revision', self.conf.revision)
-         if self.conf.content_tags or self.conf.distro_tags or self.conf.repo_tags:

diff --git a/packaging/createrepo.spec b/packaging/createrepo.spec
index f4882da90acc07f84960152825f08af400d11e85..01145b424f9330c0ba0a9bc1661931ce9a33f8d2 100644 (file)
--- a/packaging/createrepo.spec
+++ b/packaging/createrepo.spec
@@ -28,11 +28,6 @@ Summary:        Creates a Common Metadata Repository
 Group:          System/Packages
 Source:         %{name}-%{version}.tar.bz2
 Source1:        createrepo-rpmlintrc
-Patch0:         createrepo-0.9.8-disable-deltarpm-1.patch
-Patch1:         createrepo-0.9.8-disable-deltarpm-2.patch
-Patch2:         createrepo-0.9.8-cache_utime.patch
-Patch3:         createrepo-0.9.8-cachefix.patch
-Patch4:         createrepo-0.9.8-license-to-confirm.patch
 Url:            http://linux.duke.edu/metadata/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #BuildArch:      noarch
@@ -57,11 +52,6 @@ Authors:
 
 %prep
 %setup -q
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
 
 %build