Hello community, here is the log from the commit of package python-rpm-macros for openSUSE:Factory checked in at 2018-12-19 13:27:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.python-rpm-macros.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-rpm-macros" Wed Dec 19 13:27:15 2018 rev:13 rq:657144 version:20181211.ab6f37c Changes: -------- --- /work/SRC/openSUSE:Factory/python-rpm-macros/python-rpm-macros.changes 2018-11-06 14:18:02.342371185 +0100 +++ /work/SRC/openSUSE:Factory/.python-rpm-macros.new.28833/python-rpm-macros.changes 2018-12-19 13:27:17.209098285 +0100 @@ -1,0 +2,19 @@ +Tue Dec 11 11:27:17 UTC 2018 - [email protected] + +- Update to version 20181211.ab6f37c: + * Fix an issue with epoch printing having too many \ + * Remove packaging/ dir + +------------------------------------------------------------------- +Mon Dec 10 20:09:43 UTC 2018 - [email protected] + +- Update to version 1540475376.149a499: + * add epoch while printing "Provides:" +- Update URL +- Add _service and use the tar_scm/recompress/set_version source + services to update the package. + Package updates can now be done with "osc service run" +- Drop README.packaging +- Drop update.sh . This is now handled via the source services + +------------------------------------------------------------------- Old: ---- README.packaging python-rpm-macros-2018.08.15.ada6d63.tar.bz2 update.sh New: ---- _service _servicedata python-rpm-macros-20181211.ab6f37c.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.olblAC/_old 2018-12-19 13:27:17.741097589 +0100 +++ /var/tmp/diff_new_pack.olblAC/_new 2018-12-19 13:27:17.745097583 +0100 @@ -12,20 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: python-rpm-macros -Version: 2018.08.15.ada6d63 +Version: 20181211.ab6f37c Release: 0 Summary: RPM macros for building of Python modules License: WTFPL Group: Development/Tools/Other -Url: https://github.com/opensuse/multipython-macros +Url: https://github.com/opensuse/python-rpm-macros Source: python-rpm-macros-%{version}.tar.bz2 -Source100: README.packaging -Source101: update.sh # Fedora compatibility Provides: python2-rpm-macros Provides: python3-rpm-macros ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">git://github.com/openSUSE/python-rpm-macros.git</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="revision">master</param> <param name="versionformat">%cd.%h</param> <param name="changesgenerate">enable</param> <param name="filename">python-rpm-macros</param> </service> <service mode="disabled" name="recompress"> <param name="file">python-rpm-macros-*.tar</param> <param name="compression">bz2</param> </service> <service mode="disabled" name="set_version"> <param name="basename">python-rpm-macros</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/python-rpm-macros.git</param> <param name="changesrevision">ab6f37cab7f992b3ad8a148877854129e0c0cd4b</param></service></servicedata>++++++ python-rpm-macros-2018.08.15.ada6d63.tar.bz2 -> python-rpm-macros-20181211.ab6f37c.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-2018.08.15.ada6d63/.gitignore new/python-rpm-macros-20181211.ab6f37c/.gitignore --- old/python-rpm-macros-2018.08.15.ada6d63/.gitignore 2018-08-15 13:02:07.000000000 +0200 +++ new/python-rpm-macros-20181211.ab6f37c/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -/macros.python_all -/macros/020-flavor-* -/macros/035-default-pythons -/macros/040-buildset -/macros/050-automagic -*.swp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-2018.08.15.ada6d63/macros.lua new/python-rpm-macros-20181211.ab6f37c/macros.lua --- old/python-rpm-macros-2018.08.15.ada6d63/macros.lua 2018-08-15 13:02:07.000000000 +0200 +++ new/python-rpm-macros-20181211.ab6f37c/macros.lua 2018-12-11 12:26:44.000000000 +0100 @@ -189,8 +189,8 @@ local function print_obsoletes(modname) if current_flavor == "python2" then - print(rpm.expand("Obsoletes: python-" .. modname .. " < %{version}-%{release}\n")) - print(rpm.expand("Provides: python-" .. modname .. " = %{version}-%{release}\n")) + print(rpm.expand("Obsoletes: python-" .. modname .. " < %{?epoch:%{epoch}:}%{version}-%{release}\n")) + print(rpm.expand("Provides: python-" .. modname .. " = %{?epoch:%{epoch}:}%{version}-%{release}\n")) end end @@ -281,7 +281,7 @@ -- before we start, print Provides: python2-modname if is_called_python and old_python2 then - print(rpm.expand("Provides: python2-" .. modname .. " = %{version}-%{release}\n")) + print(rpm.expand("Provides: python2-" .. modname .. " = %{?epoch:%{epoch}:}%{version}-%{release}\n")) end for _,python in ipairs(pythons) do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-2018.08.15.ada6d63/packaging/README.packaging new/python-rpm-macros-20181211.ab6f37c/packaging/README.packaging --- old/python-rpm-macros-2018.08.15.ada6d63/packaging/README.packaging 2018-08-15 13:02:07.000000000 +0200 +++ new/python-rpm-macros-20181211.ab6f37c/packaging/README.packaging 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -This file contains information for OpenBuildService packagers. - -To update this package from git, run the file update.sh - -It pulls the latest version from github, assigns a date-based version -number, removes previous tarball and creates a new one, inputs the -version number in the spec file, and notes the version bump in changelog. - -In the future, changelog should also be maintained in git and auto-dumped -into the changes file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-2018.08.15.ada6d63/packaging/python-rpm-macros.spec new/python-rpm-macros-20181211.ab6f37c/packaging/python-rpm-macros.spec --- old/python-rpm-macros-2018.08.15.ada6d63/packaging/python-rpm-macros.spec 2018-08-15 13:02:07.000000000 +0200 +++ new/python-rpm-macros-20181211.ab6f37c/packaging/python-rpm-macros.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -# -# spec file for package python-rpm-macros -# -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -Name: python-rpm-macros -Version: 1.0 -Release: 0 -Summary: RPM macros for building of Python modules -License: WTFPL -Group: Development/Tools/Other -Url: https://github.com/opensuse/multipython-macros -Source: python-rpm-macros-%{version}.tar.bz2 -Source100: README.packaging -Source101: update.sh -# Fedora compatibility -Provides: python2-rpm-macros -Provides: python3-rpm-macros -#!BuildIgnore: python-rpm-macros -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -This package contains SUSE RPM macros for Python build automation. -You should BuildRequire this package unless you are sure that you -are only building for distros newer than Leap 42.2 - -%prep -%setup -q -%if 0%{?suse_version} < 1330 -mv macros-default-pythons macros/035-default-pythons -%endif - -%build -./compile-macros.sh - -%install -mkdir -p %{buildroot}%{_sysconfdir}/rpm -install -m 644 macros.python_all %{buildroot}%{_sysconfdir}/rpm - -%files -%defattr(-,root,root) -%{_sysconfdir}/rpm/macros.python_all - -%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-2018.08.15.ada6d63/packaging/update.sh new/python-rpm-macros-20181211.ab6f37c/packaging/update.sh --- old/python-rpm-macros-2018.08.15.ada6d63/packaging/update.sh 2018-08-15 13:02:07.000000000 +0200 +++ new/python-rpm-macros-20181211.ab6f37c/packaging/update.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -#!/bin/bash - -GIT_URL=https://github.com/openSUSE/python-rpm-macros.git -SPEC_FILE_NAME=python-rpm-macros.spec - -PREV_VERSION=$(sed -rn 's/^Version:\s+(.*)$/\1/p' $SPEC_FILE_NAME) -rm python-rpm-macros-$PREV_VERSION.tar.bz2 - -tmpdir=tmp.$RANDOM - -git clone --depth=1 $GIT_URL $tmpdir -cd $tmpdir -cp packaging/* .. - -VERSION=$(git log -n 1 --date=format:%Y.%m.%d --format=format:%cd.%h) -git archive --format=tar --prefix=python-rpm-macros-$VERSION/ HEAD \ - | bzip2 -c > ../python-rpm-macros-$VERSION.tar.bz2 - -cd .. -rm -rf $tmpdir -sed -i -r 's/^(Version:\s+)(.*)$/\1'$VERSION'/' $SPEC_FILE_NAME - -osc vc -m "version bump to $VERSION"
