From d20380c108500d49b6fb4b6d5e75c0bbc8c91e8d1f710ef493a41458bf584578 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 7 Mar 2019 11:28:40 +0000 Subject: [PATCH 1/4] Accepting request 682429 from home:mcepl:branches:devel:languages:python:Factory - Update to version 20190307.fbaed33: * Add --ignore to pytest calls to ignore build directories. OBS-URL: https://build.opensuse.org/request/show/682429 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=60 --- _service | 1 + _servicedata | 2 +- python-rpm-macros-20190221.08f1194.tar.bz2 | 3 --- python-rpm-macros-20190307.fbaed33.tar.bz2 | 3 +++ python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20190221.08f1194.tar.bz2 create mode 100644 python-rpm-macros-20190307.fbaed33.tar.bz2 diff --git a/_service b/_service index 10767bb..a3776a8 100644 --- a/_service +++ b/_service @@ -7,6 +7,7 @@ %cd.%h enable python-rpm-macros + mcepl@cepl.eu python-rpm-macros-*.tar diff --git a/_servicedata b/_servicedata index 60c331d..3252348 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - 08f1194ef62051e001ee026485678fa622990e02 \ No newline at end of file + fbaed3356f98f9070e92e4de9b7d2c0f2049cc06 \ No newline at end of file diff --git a/python-rpm-macros-20190221.08f1194.tar.bz2 b/python-rpm-macros-20190221.08f1194.tar.bz2 deleted file mode 100644 index cf60f53..0000000 --- a/python-rpm-macros-20190221.08f1194.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:493ba3e4022af1952c764d6c445b18477fc2247830aff74d57037ead09310886 -size 12526 diff --git a/python-rpm-macros-20190307.fbaed33.tar.bz2 b/python-rpm-macros-20190307.fbaed33.tar.bz2 new file mode 100644 index 0000000..a398384 --- /dev/null +++ b/python-rpm-macros-20190307.fbaed33.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f17486bfb3b62124fb16dae0cbf3aec7f61d4d6e78e04fa2b92786b1bc4ce7f +size 12571 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index d2706fb..3efe8cf 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 07 11:18:35 UTC 2019 - mcepl@cepl.eu + +- Update to version 20190307.fbaed33: + * Add --ignore to pytest calls to ignore build directories. + ------------------------------------------------------------------- Thu Feb 21 17:54:59 UTC 2019 - opensuse-packaging@opensuse.org diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index ea51cc8..485c4ba 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20190221.08f1194 +Version: 20190307.fbaed33 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From 130a10ae53c37caad538385a71cf549231d76363c5c9f20bec4df50121975a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 7 Mar 2019 11:53:09 +0000 Subject: [PATCH 2/4] - Update to version 20190307.fbaed33 bsc#1128323: OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=61 --- python-rpm-macros.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 3efe8cf..a2ab2ee 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Mar 07 11:18:35 UTC 2019 - mcepl@cepl.eu -- Update to version 20190307.fbaed33: +- Update to version 20190307.fbaed33 bsc#1128323: * Add --ignore to pytest calls to ignore build directories. ------------------------------------------------------------------- From fd3006512c6b851fe8227f87791cf1f655942d398f31c2d0ba5b1e9e3fd8beab Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 7 Mar 2019 12:30:28 +0000 Subject: [PATCH 3/4] Accepting request 682447 from home:mcepl:branches:devel:languages:python:Factory - bsc#1128323: Update to version 20190307.fbaed33 bsc#1128323: * Add --ignore to pytest calls to ignore build directories. - Update to version 20190221.08f1194: * Actually make pytest into function to capture arguments as well * Add pytest definitions. - Use upstream-recommended %{_rpmconfigdir}/macros.d directory for the rpm macros. - Include license and readme. - Update to version 20181211.ab6f37c: * Fix an issue with epoch printing having too many \ * Remove packaging/ dir - 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 - version bump to 2018.08.15.ada6d63 - version bump to 2017.12.22.d9968ab * better fix for macro usage in rpm 4.14 - version bump to 2017.12.07.9d4e9eb * Fix macro usage for rpm 4.14 - version bump to 2017.08.09.32550d0 - use %_specfile macro to locate the spec file, this should help with factory-auto bot problems as well as issue#3 - version bump to 2017.06.29.107ac7a - fix skip_python2 in environment where python2 is not actually present - version bump to 2017.06.21.6641889 - introduce smarter buildset support - fix %python_files on nonstandard build sets - introduce %python_for_executables in favor of magically taking "last python in %pythons" - fix %licence tag handling (gh#opensuse/python-rpm-macros#4) - version bump to 2017.05.09.fc237de - fix badly generated %posttrans snippets in cases where old %python_install_alternative syntax is used for secondary files - rework %if-macros - introduce %python_flavor, which configures behavior of generic %python_* macros, and can be overriden by the user - add --force to %python_install, to make install order fully deterministic - version bump to 2017.04.27.d2ca08c - switch versioning scheme to date-based - switch from using service to a custom script update.sh - auto-generate Provides: python2-modname in old distributions (only for main package though) - generate %posttrans sections to fix up alternatives after package rename - fix condition where %python_files would emit wrong thing when %have_python2 is undefined - add --quiet to uninstall_alternative, to silence spurious errors - check for file existence instead of package number in uninstall_alternative - remove spurious warnings about "unknown arguments" (by making ALL possible arguments known) - fix a bug with %python_clone not working without %python_install_alternative being used - in %python_files, detect and emit an error if %python_subpackages is not used - more intelligent %python_install_alternatives - multiline macro support - support for %requires_ge and %requires_eq as well as Requires(pre) and friends - "%python_clone -a" auto-creates alternative entries - implement %python_clone to clone files for alternatives - support "Supplements" and "Enhances" tags - support packageand() expression - fix handling of %name in requires - make macros more resilient to missing %python_subpackages - expand %python_bin_suffix properly - let %python_module expand *all* its arguments, not just the first (so that %{python_module x >= 1.0} works as intended) - copy BuildArch to subpackages - on requires/provides etc., perform macro expansion *after* replacing 'python' name, to allow for tricking the rewriter to not replace - add BuildRoot to make SLE11 happy - check presence of %python_files even on new-style distros - better visibility of the %python_files error - update service, use repository and tarball name "python-rpm-macros" - introduce %python_prefix - Set RPM group - change service version generator to use "1.0.git" instead of "1.0git" - rework %python_alternative and remove support for %python_alternative_man - tell service to compress the tar file - set service to localonly mode - current macro version - initial commit OBS-URL: https://build.opensuse.org/request/show/682447 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=62 --- python-rpm-macros.changes | 2 +- python-rpm-macros.spec | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index a2ab2ee..3d1e87d 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Mar 07 11:18:35 UTC 2019 - mcepl@cepl.eu -- Update to version 20190307.fbaed33 bsc#1128323: +- bsc#1128323: Update to version 20190307.fbaed33 bsc#1128323: * Add --ignore to pytest calls to ignore build directories. ------------------------------------------------------------------- diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 485c4ba..1752232 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -22,12 +22,11 @@ Release: 0 Summary: RPM macros for building of Python modules License: WTFPL Group: Development/Tools/Other -Url: https://github.com/opensuse/python-rpm-macros +URL: https://github.com/opensuse/python-rpm-macros Source: python-rpm-macros-%{version}.tar.bz2 # Fedora compatibility Provides: python2-rpm-macros Provides: python3-rpm-macros -#!BuildIgnore: python-rpm-macros BuildArch: noarch %description From 8217d029dc8a1e48c72b7e0cf017570102984505437d67589d3ad21ab6279f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 7 Mar 2019 13:41:19 +0000 Subject: [PATCH 4/4] - Update to version 20190307.81ca329: * We should preserve existing PYTHONPATH. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=63 --- _servicedata | 2 +- python-rpm-macros-20190307.81ca329.tar.bz2 | 3 +++ python-rpm-macros-20190307.fbaed33.tar.bz2 | 3 --- python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 python-rpm-macros-20190307.81ca329.tar.bz2 delete mode 100644 python-rpm-macros-20190307.fbaed33.tar.bz2 diff --git a/_servicedata b/_servicedata index 3252348..aef9930 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - fbaed3356f98f9070e92e4de9b7d2c0f2049cc06 \ No newline at end of file + 81ca329ee2ac053848f0dffa7ec54c8e22aac23f \ No newline at end of file diff --git a/python-rpm-macros-20190307.81ca329.tar.bz2 b/python-rpm-macros-20190307.81ca329.tar.bz2 new file mode 100644 index 0000000..4c779a2 --- /dev/null +++ b/python-rpm-macros-20190307.81ca329.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:086883d9c04a858ae7ca682ff6a0ecc9d1a4ff946114c7a84676dc9183a17eda +size 12569 diff --git a/python-rpm-macros-20190307.fbaed33.tar.bz2 b/python-rpm-macros-20190307.fbaed33.tar.bz2 deleted file mode 100644 index a398384..0000000 --- a/python-rpm-macros-20190307.fbaed33.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f17486bfb3b62124fb16dae0cbf3aec7f61d4d6e78e04fa2b92786b1bc4ce7f -size 12571 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 3d1e87d..56c5cf2 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 07 13:40:24 UTC 2019 - mcepl@cepl.eu + +- Update to version 20190307.81ca329: + * We should preserve existing PYTHONPATH. + ------------------------------------------------------------------- Thu Mar 07 11:18:35 UTC 2019 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 1752232..1d7887a 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20190307.fbaed33 +Version: 20190307.81ca329 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL