diff options
| author | Remi Collet <fedora@famillecollet.com> | 2011-04-30 10:01:24 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2011-04-30 10:01:24 +0200 |
| commit | e6c6bf47c30d8584ffffaaad5f8ab1a6eda63d28 (patch) | |
| tree | a8f3ac6358593bbaad0c7fd1e6e238ee63134684 | |
| parent | 8812d10e439424d83b4e837e91c5f88c15379355 (diff) | |
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | createrepo-checksum.patch | 42 | ||||
| -rw-r--r-- | createrepo.spec | 8 |
3 files changed, 54 insertions, 0 deletions
@@ -0,0 +1,4 @@ +Temporary available in remi repository only to fix + + https://bugzilla.redhat.com/500364 + diff --git a/createrepo-checksum.patch b/createrepo-checksum.patch new file mode 100644 index 0000000..f8ace69 --- /dev/null +++ b/createrepo-checksum.patch @@ -0,0 +1,42 @@ +diff -up createrepo-0.9.9/createrepo/__init__.py.orig createrepo-0.9.9/createrepo/__init__.py +--- createrepo-0.9.9/createrepo/__init__.py.orig 2011-04-30 09:53:30.075996090 +0200 ++++ createrepo-0.9.9/createrepo/__init__.py 2011-04-30 09:54:09.909152883 +0200 +@@ -612,7 +612,8 @@ class MetaDataGenerator: + worker_chunks = utils.split_list_into_equal_chunks(pkgfiles, self.conf.workers) + worker_cmd_dict = {} + worker_jobs = {} +- base_worker_cmdline = [self.conf.worker_cmd, ++ base_worker_cmdline = [self.conf.worker_cmd, ++ '--checksum=%s' % self.conf.sumtype, + '--pkgoptions=_reldir=%s' % reldir, + '--pkgoptions=_collapse_libc_requires=%s' % self.conf.collapse_glibc_requires, + '--pkgoptions=_cachedir=%s' % self.conf.cachedir, +diff -up createrepo-0.9.9/worker.py.orig createrepo-0.9.9/worker.py +--- createrepo-0.9.9/worker.py.orig 2011-04-30 09:53:30.076996094 +0200 ++++ createrepo-0.9.9/worker.py 2011-04-30 09:54:04.105129474 +0200 +@@ -20,6 +20,8 @@ from optparse import OptionParser + # and reassemble at the end + + def main(args): ++ _def = yum.misc._default_checksums[0] ++ + parser = OptionParser() + parser.add_option('--tmpmdpath', default=None, + help="path where the outputs should be dumped for this worker") +@@ -31,6 +33,8 @@ def main(args): + help="output errors and a total") + parser.add_option("--globalopts", default=[], action='append', + help="general options in the format of key=value") ++ parser.add_option("-s", "--checksum", default=_def, dest='sumtype', ++ help="specify the checksum type to use (default: %s)" % _def) + + + opts, pkgs = parser.parse_args(args) +@@ -80,6 +84,7 @@ def main(args): + print "reading %s" % (pkgfile) + + pkg = createrepo.yumbased.CreateRepoPackage(ts, package=pkgpath, ++ sumtype=opts.sumtype, + external_data=external_data) + pri.write(pkg.xml_dump_primary_metadata()) + fl.write(pkg.xml_dump_filelists_metadata()) diff --git a/createrepo.spec b/createrepo.spec index 42432ed..7c02dda 100644 --- a/createrepo.spec +++ b/createrepo.spec @@ -7,8 +7,12 @@ Release: 3%{?dist} License: GPLv2 Group: System Environment/Base Source: %{name}-%{version}.tar.gz + Patch0: ten-changelog-limit.patch Patch1: createrepo-head.patch +# https://bugzilla.redhat.com/500364 +Patch2: createrepo-checksum.patch + URL: http://createrepo.baseurl.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -24,6 +28,7 @@ packages. %setup -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 %build @@ -47,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/createrepo %changelog +* Sat Apr 30 2011 Remi Collet <Fedora@FamilleCollet.com> - 0.9.9-3 +- add patch for https://bugzilla.redhat.com/500364 + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild |