Hello community, here is the log from the commit of package createrepo for openSUSE:Factory checked in at 2014-02-28 16:22:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/createrepo (Old) and /work/SRC/openSUSE:Factory/.createrepo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "createrepo" Changes: -------- --- /work/SRC/openSUSE:Factory/createrepo/createrepo.changes 2013-08-23 13:53:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.createrepo.new/createrepo.changes 2014-02-28 16:22:14.000000000 +0100 @@ -1,0 +2,30 @@ +Mon Feb 24 19:09:39 UTC 2014 - suse-...@gmx.de + +- fix bnc#841280 + new patch: createrepo-0.10.3-fix_MetaDataGenerator.patch + modified patch: createrepo-0.9.9-sort-packages-before-writing-repodata.patch + +------------------------------------------------------------------- +Mon Feb 24 18:43:22 CET 2014 - m...@suse.de + +- allow 'sha' checksum type in modifyrepo + new patch: createrepo-0.10.3-modifyrepo-sha.patch +- make it build on sles11 (fix from adrian) + +------------------------------------------------------------------- +Mon Feb 24 13:47:00 CET 2014 - m...@suse.de + +- update to version 0.10.3 + dropped patches: + * createrepo-0.9.8-workaround-umask-reset.patch + * createrepo-0.9.9-add-lzma-option-to-generate-primary.xml.lzma.patch + * createrepo-0.9.9-clean_tmp_files.patch + * createrepo-0.9.9-generate-gzip-headers.patch + * createrepo-0.9.9-pass_checksum_to_workers.patch + * createrepo-0.9.9-use_integer_timestamps.patch + * createrepo-0.9.9-worker-clog_limit.patch + new patch: + * createrepo-0.9.9-by_default_no_database.patch +- fix filename of bash completion script + +------------------------------------------------------------------- Old: ---- createrepo-0.9.8-workaround-umask-reset.patch createrepo-0.9.9-add-lzma-option-to-generate-primary.xml.lzma.patch createrepo-0.9.9-clean_tmp_files.patch createrepo-0.9.9-generate-gzip-headers.patch createrepo-0.9.9-pass_checksum_to_workers.patch createrepo-0.9.9-use_integer_timestamps.patch createrepo-0.9.9-worker-clog_limit.patch createrepo-0.9.9.tar.gz New: ---- createrepo-0.10.3-fix_MetaDataGenerator.patch createrepo-0.10.3-modifyrepo-sha.patch createrepo-0.10.3.tar.gz createrepo-0.9.9-by_default_no_database.patch createrepo.dsc debian.changelog debian.rules debian.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ createrepo.spec ++++++ --- /var/tmp/diff_new_pack.c19mdv/_old 2014-02-28 16:22:15.000000000 +0100 +++ /var/tmp/diff_new_pack.c19mdv/_new 2014-02-28 16:22:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package createrepo # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,32 +17,23 @@ Name: createrepo -Version: 0.9.9 +Version: 0.10.3 Release: 0 Summary: Creates a Common Metadata Repository License: GPL-2.0+ Group: System/Packages Url: http://linux.duke.edu/metadata/ Source: http://createrepo.baseurl.org/download/%{name}-%{version}.tar.gz -Patch2: createrepo-0.9.9-cache_utime.patch -Patch3: createrepo-0.9.9-cachefix.patch -Patch4: createrepo-0.9.9-license-to-confirm.patch -Patch5: createrepo-0.9.9-sort-packages-before-writing-repodata.patch -Patch6: createrepo-0.9.9-add-lzma-option-to-generate-primary.xml.lzma.patch -Patch7: createrepo-0.9.9-generate-gzip-headers.patch -Patch8: createrepo-0.9.9-disable-symlinks.patch -Patch9: createrepo-0.9.8-workaround-umask-reset.patch -Patch10: createrepo-0.9.9-worker-clog_limit.patch -# Pass checksum option to workers, taken from upstream. See BNC#802001 -Patch11: createrepo-0.9.9-pass_checksum_to_workers.patch -# Upstream patch to clean up tmp files (BNC#812071) -Patch12: createrepo-0.9.9-clean_tmp_files.patch -# Upstream patch to write timestamps in seconds (BNC#823652) -Patch13: createrepo-0.9.9-use_integer_timestamps.patch - +Patch1: createrepo-0.9.9-cache_utime.patch +Patch2: createrepo-0.9.9-cachefix.patch +Patch3: createrepo-0.9.9-license-to-confirm.patch +Patch4: createrepo-0.9.9-sort-packages-before-writing-repodata.patch +Patch5: createrepo-0.9.9-disable-symlinks.patch +Patch6: createrepo-0.9.9-by_default_no_database.patch +Patch7: createrepo-0.10.3-modifyrepo-sha.patch +Patch8: createrepo-0.10.3-fix_MetaDataGenerator.patch BuildRequires: python-devel Requires: python-deltarpm -Requires: python-libxml2 Requires: python-lxml Requires: python-urlgrabber Requires: rpm >= 4.1.1 @@ -50,9 +41,6 @@ Requires: yum-common >= 3.2.25 Requires: yum-metadata-parser BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitearch: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%endif %description This utility generates a common metadata repository from a directory of @@ -60,34 +48,40 @@ %prep %setup -q +%patch1 %patch2 %patch3 -%patch4 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%patch4 -p1 +%patch5 +%patch6 +%patch7 %patch8 -p1 -%patch9 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 sed -i "1d" createrepo/{readMetadata,yumbased,utils,deltarpms,merge}.py # Fix non-executable scripts (remove she-bang line) %build + %install # Fix the install paths: sed -i -e 's|PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)|PYLIBDIR = %{py_libdir}|g' \ - -e 's|PKGDIR = $(PYLIBDIR)/site-packages/$(PKGNAME)|PKGDIR = %{python_sitearch}/%{name}|g' createrepo/Makefile -%make_install sysconfdir=%{_sysconfdir} +%if %{suse_version} < 1120 + -e 's|PKGDIR = $(PYLIBDIR)/site-packages/$(PKGNAME)|PKGDIR = %{_datadir}/%{name}/$(PKGNAME)|g' \ +%else + -e 's|PKGDIR = $(PYLIBDIR)/site-packages/$(PKGNAME)|PKGDIR = %{python_sitearch}/%{name}|g' \ +%endif + createrepo/Makefile +%makeinstall sysconfdir=%{_sysconfdir} +mv $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/createrepo $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/createrepo.sh +for i in genpkgmetadata.py mergerepo mergerepo.py modifyrepo modifyrepo.py ; do rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/$i ; done %files %defattr(-,root,root) %doc ChangeLog COPYING COPYING.lib README %{_bindir}/* %{_mandir}/*/* -%config %{_sysconfdir}/bash_completion.d/createrepo.bash +%config %{_sysconfdir}/bash_completion.d/createrepo.sh %{_datadir}/%{name}/ +%if %{suse_version} >= 1120 %{python_sitearch}/* +%endif %changelog ++++++ createrepo-0.10.3-fix_MetaDataGenerator.patch ++++++ Index: createrepo-0.10.3/createrepo/__init__.py =================================================================== --- createrepo-0.10.3.orig/createrepo/__init__.py +++ createrepo-0.10.3/createrepo/__init__.py @@ -407,7 +407,8 @@ class MetaDataGenerator: if self.conf.pkglist: packages = [] for pkg in self.conf.pkglist: - if '://' in pkg: # remote + if isinstance(pkg, YumAvailablePackage) or '://' in pkg: + # either a package object or a remote file packages.append(pkg) continue path = os.path.join(self.conf.basedir, self.conf.directory, pkg) ++++++ createrepo-0.10.3-modifyrepo-sha.patch ++++++ --- ./modifyrepo.py.orig 2014-02-24 17:40:42.748172650 +0000 +++ ./modifyrepo.py 2014-02-25 13:25:12.138046860 +0000 @@ -147,7 +147,7 @@ class RepoMetadata: new_rd.checksum = (self.checksum_type, csum) new_rd.size = str(os.stat(destmd).st_size) if self.compress: - new_rd.openchecksum = oldmd.checksums.hexdigests().popitem() + new_rd.openchecksum = (self.checksum_type, oldmd.checksums.hexdigests().popitem()[1]) new_rd.opensize = str(oldmd.checksums.length) new_rd.timestamp = str(int(os.stat(destmd).st_mtime)) self.repoobj.repoData[new_rd.type] = new_rd @@ -236,7 +236,7 @@ def main(args): if opts.compress_type not in _available_compression: print "Compression %s not available: Please choose from: %s" % (opts.compress_type, ', '.join(_available_compression)) return 1 - if opts.sumtype not in _available_checksums: + if opts.sumtype != 'sha' and opts.sumtype not in _available_checksums: print "Checksum %s not available: Please choose from: %s" % (opts.sumtype, ', '.join(_available_checksums)) return 1 repomd.compress_type = opts.compress_type ++++++ createrepo-0.9.9.tar.gz -> createrepo-0.10.3.tar.gz ++++++ ++++ 2334 lines of diff (skipped) ++++++ createrepo-0.9.9-by_default_no_database.patch ++++++ --- ./createrepo/__init__.py.orig 2014-02-24 12:31:40.702205468 +0000 +++ ./createrepo/__init__.py 2014-02-24 12:31:54.565205444 +0000 @@ -82,7 +82,7 @@ class MetaDataConfig(object): self.max_delta_rpm_size = 100000000 self.update_md_path = None self.skip_stat = False - self.database = True + self.database = False self.outputdir = None self.file_patterns = ['.*bin\/.*', '^\/etc\/.*', '^\/usr\/lib\/sendmail$'] self.dir_patterns = ['.*bin\/.*', '^\/etc\/.*'] --- ./genpkgmetadata.py.orig 2014-02-24 12:26:37.150206006 +0000 +++ ./genpkgmetadata.py 2014-02-24 12:28:29.876205806 +0000 @@ -71,8 +71,8 @@ def parse_args(args, conf): parser.add_option("-C", "--checkts", default=False, action="store_true", help="check timestamps on files vs the metadata to see " \ "if we need to update") - parser.add_option("-d", "--database", default=True, action="store_true", - help="create sqlite database files: now default, see --no-database to disable") + parser.add_option("-d", "--database", default=False, action="store_true", + help="create sqlite database files") parser.add_option("--no-database", default=False, dest="nodatabase", action="store_true", help="do not create sqlite dbs of metadata") # temporarily disabled --- ./mergerepo.py.orig 2014-02-24 12:28:35.926205795 +0000 +++ ./mergerepo.py 2014-02-24 12:30:05.740205636 +0000 @@ -40,7 +40,7 @@ def parse_args(args): help="repo url") parser.add_option("-a", "--archlist", default=[], action="append", help="Defaults to all arches - otherwise specify arches") - parser.add_option("-d", "--database", default=True, action="store_true") + parser.add_option("-d", "--database", default=False, action="store_true") parser.add_option( "--no-database", default=False, action="store_true", dest="nodatabase") parser.add_option("-o", "--outputdir", default=None, help="Location to create the repository") @@ -75,6 +75,8 @@ def main(args): rmbase.archlist = opts.archlist if opts.outputdir: rmbase.outputdir = opts.outputdir + if opts.database: + rmbase.mdconf.database = True if opts.nodatabase: rmbase.mdconf.database = False if opts.nogroups: ++++++ createrepo-0.9.9-disable-symlinks.patch ++++++ --- /var/tmp/diff_new_pack.c19mdv/_old 2014-02-28 16:22:15.000000000 +0100 +++ /var/tmp/diff_new_pack.c19mdv/_new 2014-02-28 16:22:15.000000000 +0100 @@ -1,15 +1,14 @@ -diff -ru a/createrepo/__init__.py b/createrepo/__init__.py ---- a/createrepo/__init__.py 2011-01-26 18:14:30.000000000 +0100 -+++ b/createrepo/__init__.py 2012-01-25 14:58:01.560497445 +0100 -@@ -84,6 +84,7 @@ +--- ./createrepo/__init__.py.orig 2014-02-24 12:45:33.874203994 +0000 ++++ ./createrepo/__init__.py 2014-02-24 12:45:42.527203978 +0000 +@@ -87,6 +87,7 @@ class MetaDataConfig(object): self.file_patterns = ['.*bin\/.*', '^\/etc\/.*', '^\/usr\/lib\/sendmail$'] self.dir_patterns = ['.*bin\/.*', '^\/etc\/.*'] self.skip_symlinks = False + self.skip_symlinked_dirs = False self.pkglist = [] self.database_only = False - self.primaryfile = 'primary.xml.gz' -@@ -280,6 +281,8 @@ + self.primaryfile = 'primary.xml' +@@ -299,6 +300,8 @@ class MetaDataGenerator: func(arg, top, names) for name in names: name = os.path.join(top, name) @@ -18,11 +17,9 @@ if os.path.isdir(name): self._os_path_walk(name, func, arg) def getFileList(self, directory, ext): -Only in b/createrepo: .__init__.py.swp -diff -ru a/genpkgmetadata.py b/genpkgmetadata.py ---- a/genpkgmetadata.py 2011-01-26 18:14:30.000000000 +0100 -+++ b/genpkgmetadata.py 2012-01-25 14:57:19.262496442 +0100 -@@ -92,6 +92,8 @@ +--- ./genpkgmetadata.py.orig 2014-01-28 12:28:48.000000000 +0000 ++++ ./genpkgmetadata.py 2014-02-24 12:45:42.527203978 +0000 +@@ -99,6 +99,8 @@ def parse_args(args, conf): help="<dir> = optional directory to output to") parser.add_option("-S", "--skip-symlinks", dest="skip_symlinks", default=False, action="store_true", help="ignore symlinks of packages") @@ -31,4 +28,3 @@ parser.add_option("--changelog-limit", dest="changelog_limit", default=None, help="only import the last N changelog entries") parser.add_option("--unique-md-filenames", dest="unique_md_filenames", -Only in b: .genpkgmetadata.py.swp ++++++ createrepo-0.9.9-license-to-confirm.patch ++++++ --- /var/tmp/diff_new_pack.c19mdv/_old 2014-02-28 16:22:15.000000000 +0100 +++ /var/tmp/diff_new_pack.c19mdv/_new 2014-02-28 16:22:15.000000000 +0100 @@ -1,7 +1,7 @@ ---- createrepo/__init__.py.orig 2010-04-09 11:09:01.000000000 +0200 -+++ createrepo/__init__.py 2010-04-09 11:13:01.000000000 +0200 -@@ -417,6 +418,7 @@ - fo = _gzipOpen(primaryfilepath, 'w') +--- ./createrepo/__init__.py.orig 2014-01-28 12:28:49.000000000 +0000 ++++ ./createrepo/__init__.py 2014-02-24 12:15:04.686207231 +0000 +@@ -445,6 +445,7 @@ class MetaDataGenerator: + fo = compressOpen(primaryfilepath, 'w', 'gz') 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";' \ ++++++ createrepo-0.9.9-sort-packages-before-writing-repodata.patch ++++++ --- /var/tmp/diff_new_pack.c19mdv/_old 2014-02-28 16:22:15.000000000 +0100 +++ /var/tmp/diff_new_pack.c19mdv/_new 2014-02-28 16:22:15.000000000 +0100 @@ -1,15 +1,16 @@ -diff -ru a/createrepo/__init__.py b/createrepo/__init__.py ---- a/createrepo/__init__.py 2011-01-26 18:14:30.000000000 +0100 -+++ b/createrepo/__init__.py 2012-01-25 16:05:55.627594528 +0100 -@@ -24,6 +24,7 @@ +Index: createrepo-0.10.3/createrepo/__init__.py +=================================================================== +--- createrepo-0.10.3.orig/createrepo/__init__.py ++++ createrepo-0.10.3/createrepo/__init__.py +@@ -24,6 +24,7 @@ from bz2 import BZ2File from urlgrabber import grabber import tempfile import stat +import re import fcntl import subprocess - -@@ -504,6 +505,30 @@ + from select import select +@@ -540,6 +541,38 @@ class MetaDataGenerator: " add it" % po return po @@ -17,17 +18,25 @@ + def sortPackages(self, pkglist): + class PackageKey: + def __init__(self, package): ++ self.n, self.vr, self.a = self._nvra(package) ++ ++ def _nvra(self, package): ++ # package might be a filename or a ++ # yum.sqlitesack.YumAvailablePackageSqlite object ++ try: ++ return (package.name, ++ package.version + '-' + package.release, ++ package.arch) ++ except AttributeError: ++ return self._parse_filename(package) ++ ++ def _parse_filename(self, filename): + m = re.search(r"([^/]+)-([^/-]+-[^/-]+)\.([^/.]+)\.rpm$", -+ package) ++ filename) + if m: -+ self.n = m.group(1) -+ self.vr = m.group(2) -+ self.a = m.group(3) -+ else: -+ # give up on sorting -+ self.n = package -+ self.vr = 0 -+ self.a = 0 ++ return m.groups() ++ # give up on sorting ++ return package, 0, 0 + def __lt__(self, other): + if self.n != other.n: + return self.n < other.n @@ -40,7 +49,7 @@ def writeMetadataDocs(self, pkglist=[], pkgpath=None): -@@ -515,6 +540,8 @@ +@@ -551,6 +584,8 @@ class MetaDataGenerator: else: directory = pkgpath @@ -49,4 +58,3 @@ # for worker/forked model # iterate the pkglist - see which ones are handled by --update and let them # go on their merry way -Only in b/createrepo: .__init__.py.swp ++++++ createrepo.dsc ++++++ Format: 1.0 Source: createrepo Version: 0.9.9 Binary: createrepo Maintainer: Adrian Schroeter <adr...@suse.de> Architecture: all Standards-Version: 3.7.2 Build-Depends: debhelper (>= 4), python-dev, travis-deps, python-libxml2, python-urlgrabber, python-rpm, yum, python-sqlitecachec ++++++ debian.changelog ++++++ createrepo (2014.02.24-1) unstable; urgency=low * update to version 10.0.3 -- Michael Schroeder <m...@suse.de> Mon, 24 Feb 2014 13:48:22 +0200 createrepo (2011.10.10-1) unstable; urgency=low * initial debian packaging for travis -- Adrian Schroeter <adr...@suse.de> Tue, 11 Jun 2013 19:30:22 +0200 ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany # This file and all modifications and additions to the pristine package # are under the same license as the package itself. # # Please submit bugfixes or commens via http://bugs.opensuse.org # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 SHELL=/bin/bash configure: configure-stamp configure-stamp: dh_testdir touch configure-stamp build: build-stamp build-stamp: configure-stamp dh_testdir touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs make install 'PKGDIR=$$(PYLIBDIR)/$$(PKGNAME)' DESTDIR=$(CURDIR)/debian/createrepo/ binary-arch: build install dh_testdir dh_testroot dh_installchangelogs dh_installdocs dh_installexamples dh_installman dh_link dh_strip dh_compress dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary-indep: build install binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
