Hello community,
here is the log from the commit of package createrepo for openSUSE:Factory
checked in at Tue Apr 13 22:12:58 CEST 2010.
--------
--- createrepo/createrepo.changes 2009-05-01 02:19:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/createrepo/createrepo.changes 2010-04-12 12:48:32.000000000 +0200
@@ -1,0 +2,26 @@
+Mon Apr 12 10:46:24 UTC 2010 - mbarringer@novell.com
+
+- Porting patches from 0.4.11:
+ - EULA support, in conjunction with a yum patch
+ - Explicitly working with older RPMs in the checksum cache
+- Removing 0.4.11 patches. The other functionality in them is either
+ in upstream createrepo, or has been moved into yum.
+-------------------------------------------------------------------
+Thu Apr 1 08:22:23 UTC 2010 - mbarringer@novell.com
+
+- Patching out the deltarpm support, as we use a different format
+
+-------------------------------------------------------------------
+Mon Mar 15 12:01:39 UTC 2010 - mbarringer@novell.com
+
+- Updating to the latest source
+ + Adds repo tags to the generated metadata
+ + Adds a --repo option to describe this metadata
+ + Adds bash completion
+
+-------------------------------------------------------------------
+Wed Oct 14 14:11:51 UTC 2009 - dmacvicar@novell.com
+
+- update to 0.9.8, disable all patches for now
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
createrepo-0.4.11-cache_utime.patch
createrepo-0.4.11-cachefix.patch
createrepo-0.4.11-filenamefix.patch
createrepo-0.4.11-fixsymlinks.patch
createrepo-0.4.11-hashfix.patch
createrepo-0.4.11-license-to-confirm.patch
createrepo-0.4.11-missing-tags.patch
createrepo-0.4.11-modifyrepo-prettyxml.patch
createrepo-0.4.11-suse-changelogs.patch
createrepo-0.4.11.tar.bz2
New:
----
createrepo-0.9.8-cache_utime.patch
createrepo-0.9.8-cachefix.patch
createrepo-0.9.8-disable-deltarpm-1.patch
createrepo-0.9.8-disable-deltarpm-2.patch
createrepo-0.9.8-license-to-confirm.patch
createrepo-0.9.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ createrepo.spec ++++++
--- /var/tmp/diff_new_pack.gRvTzK/_old 2010-04-13 22:11:17.000000000 +0200
+++ /var/tmp/diff_new_pack.gRvTzK/_new 2010-04-13 22:11:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package createrepo (Version 0.4.11)
+# spec file for package createrepo (Version 0.9.8)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,25 +20,22 @@
Name: createrepo
BuildRequires: python
-Version: 0.4.11
-Release: 82
+Version: 0.9.8
+Release: 2
License: GPLv2+
Summary: Creates a Common Metadata Repository
Group: System/Packages
Source: %{name}-%{version}.tar.bz2
Source1: createrepo-rpmlintrc
-Patch: createrepo-0.4.11-missing-tags.patch
-Patch1: createrepo-0.4.11-suse-changelogs.patch
-Patch2: createrepo-0.4.11-modifyrepo-prettyxml.patch
-Patch3: createrepo-0.4.11-cache_utime.patch
-Patch4: createrepo-0.4.11-fixsymlinks.patch
-Patch5: createrepo-0.4.11-cachefix.patch
-Patch6: createrepo-0.4.11-license-to-confirm.patch
-Patch7: createrepo-0.4.11-hashfix.patch
-Patch8: createrepo-0.4.11-filenamefix.patch
+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
+#BuildArch: noarch
+Requires: yum-common >= 3.2.23
Requires: rpm >= 4.1.1
Requires: rpm-python
Requires: libxml2-python
@@ -59,21 +56,23 @@
%prep
%setup -q
-%patch
+%patch0
%patch1
%patch2
%patch3
%patch4
-%patch5
-%patch6
-%patch7
-%if %{suse_version} > 1100
-%patch8
-%endif
%build
%install
+
+# fix the install paths
+cp createrepo/Makefile createrepo/Makefile.old
+sed -e 's,PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER),PYLIBDIR = %{py_libdir},g' createrepo/Makefile.old > createrepo/Makefile
+cp createrepo/Makefile createrepo/Makefile.old
+sed -e 's,PKGDIR = $(PYLIBDIR)/site-packages/$(PKGNAME),PKGDIR = %{py_sitedir}/%{name},g' createrepo/Makefile.old > createrepo/Makefile
+rm createrepo/Makefile.old
+
%if %{suse_version} <= 1010
sed -e "s,rpm.RPMTAG_ENHANCESNAME,1159," \
-e "s,rpm.RPMTAG_ENHANCESFLAGS,1161," \
@@ -85,7 +84,7 @@
dumpMetadata.py > dumpMetadata.py.patched
mv dumpMetadata.py.patched dumpMetadata.py
%endif
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT sysconfdir=/etc
%clean
rm -rf $RPM_BUILD_ROOT
@@ -95,7 +94,10 @@
%doc ChangeLog README
%{_mandir}/*/*
%{_bindir}/*
+%config /etc/bash_completion.d/createrepo.bash
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
+%dir %{py_sitedir}/createrepo
+%{py_sitedir}/createrepo/*
%changelog
++++++ createrepo-0.4.11-cache_utime.patch -> createrepo-0.9.8-cache_utime.patch ++++++
--- createrepo/createrepo-0.4.11-cache_utime.patch 2009-05-01 02:19:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/createrepo/createrepo-0.9.8-cache_utime.patch 2010-04-12 12:48:31.000000000 +0200
@@ -1,12 +1,11 @@
-Index: dumpMetadata.py
-===================================================================
---- dumpMetadata.py.orig
-+++ dumpMetadata.py
-@@ -618,6 +618,7 @@ class RpmMetaData:
+--- 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 = getChecksum(self.options['sumtype'], fo)
+ checksum = misc.checksum(self.checksum_type, self.localpath)
+
++++++ createrepo-0.4.11-cachefix.patch -> createrepo-0.9.8-cachefix.patch ++++++
--- createrepo/createrepo-0.4.11-cachefix.patch 2009-05-01 02:19:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/createrepo/createrepo-0.9.8-cachefix.patch 2010-04-12 12:48:32.000000000 +0200
@@ -1,9 +1,7 @@
-Index: dumpMetadata.py
-===================================================================
---- dumpMetadata.py.orig
-+++ dumpMetadata.py
-@@ -605,8 +605,8 @@ class RpmMetaData:
- t.append("".join(self.hdr[rpm.RPMTAG_SIGGPG]))
+--- 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:
@@ -11,5 +9,5 @@
+ if type(self.hdr[rpm.RPMTAG_SHA1HEADER]) is not types.NoneType:
+ t.append("".join(self.hdr[rpm.RPMTAG_SHA1HEADER]))
- key = md5.new("".join(t)).hexdigest()
-
+ kcsum = misc.Checksums(checksums=[self.checksum_type])
+ kcsum.update("".join(t))
++++++ createrepo-0.9.8-disable-deltarpm-1.patch ++++++
--- 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(':')
++++++ createrepo-0.9.8-disable-deltarpm-2.patch ++++++
--- 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',
++++++ createrepo-0.4.11-license-to-confirm.patch -> createrepo-0.9.8-license-to-confirm.patch ++++++
--- createrepo/createrepo-0.4.11-license-to-confirm.patch 2009-05-01 02:19:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/createrepo/createrepo-0.9.8-license-to-confirm.patch 2010-04-12 12:48:32.000000000 +0200
@@ -1,76 +1,18 @@
-Index: dumpMetadata.py
-===================================================================
---- dumpMetadata.py.orig
-+++ dumpMetadata.py
-@@ -18,6 +18,7 @@
-
- # $Id$
-
-+import glob
- import os
- import rpm
- import exceptions
-@@ -630,7 +631,7 @@ class RpmMetaData:
-
-
-
--def generateXML(doc, node, formatns, rpmObj, sumtype):
-+def generateXML(doc, node, formatns, susens, rpmObj, sumtype):
- """takes an xml doc object and a package metadata entry node, populates a
- package node with the md information"""
- ns = node.ns()
-@@ -664,6 +665,27 @@ def generateXML(doc, node, formatns, rpm
- if rpmObj.localurl is not None:
- location.newProp('xml:base', rpmObj.localurl)
- location.newProp('href', rpmObj.relativepath)
-+
-+ eulas = glob.glob("%s.eula.*" % os.path.join(rpmObj.options['basedir'], rpmObj.relativepath))
-+ if eulas is not None:
-+ for eula in eulas:
-+ match = re.match("(.*eula)\.(.*)", eula)
-+ lang = match.group(2)
-+
-+ eulaContent = None
-+
-+ try:
-+ fd = open(eula, "r")
-+ eulaContent = fd.read()
-+ fd.close()
-+ except IOError:
-+ raise MDError, "Failed read contents of %s" % eula
-+
-+ if eulaContent is not None:
-+ eulaNode = pkgNode.newChild(susens, 'license-to-confirm', None)
-+ eulaNode.newProp('lang', lang)
-+ eulaNode.addContent(utf8String(eulaContent))
-+
- format = pkgNode.newChild(ns, 'format', None)
- for tag in ['license', 'vendor', 'group', 'buildhost', 'sourcerpm']:
- value = rpmObj.tagByName(tag)
-Index: genpkgmetadata.py
-===================================================================
---- genpkgmetadata.py.orig
-+++ genpkgmetadata.py
-@@ -181,11 +181,12 @@ class MetaDataGenerator:
- self.baseroot = self.basedoc.newChild(None, "metadata", None)
- basens = self.baseroot.newNs('http://linux.duke.edu/metadata/common', None)
- self.formatns = self.baseroot.newNs('http://linux.duke.edu/metadata/rpm', 'rpm')
-+ self.susens = self.baseroot.newNs('http://novell.com/package/metadata/suse/common', 'suse')
- self.baseroot.setNs(basens)
- basefilepath = os.path.join(self.cmds['outputdir'], self.cmds['tempdir'], self.cmds['primaryfile'])
- self.basefile = _gzipOpen(basefilepath, 'w')
- self.basefile.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-- self.basefile.write('<metadata xmlns="http://linux.duke.edu/metadata/common" xmlns:rpm="http://linux.duke.edu/metadata/rpm" packages="%s">\n' %
-+ self.basefile.write('<metadata xmlns="http://linux.duke.edu/metadata/common" xmlns:rpm="http://linux.duke.edu/metadata/rpm" xmlns:suse="http://novell.com/package/metadata/suse/common" packages="%s">\n' %
+--- 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('