From e29527b47b61a09635bf9e746a866a58ff0392c1a21989d9b3d929c8d6ee04ce Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 2 Sep 2020 11:46:53 +0000 Subject: [PATCH 01/23] - Add patch multiple_flavors.patch which makes compile_macros.sh generate alternative flavours as well. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=107 --- multiple_flavors.patch | 15 +++++++++++++++ python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 13 ++++++++----- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 multiple_flavors.patch diff --git a/multiple_flavors.patch b/multiple_flavors.patch new file mode 100644 index 0000000..18dc1a6 --- /dev/null +++ b/multiple_flavors.patch @@ -0,0 +1,15 @@ +--- a/compile-macros.sh ++++ b/compile-macros.sh +@@ -1,10 +1,10 @@ + #!/bin/bash + +-FLAVORS="python2 python3 pypy3" ++FLAVORS="python2 python3 python36 python38 pypy3" + + # order of BUILDSET is important, it is copied to order of %pythons, + # and that determines the last installed binary +-BUILDSET="python2 python3" ++BUILDSET="python2 python36 python38" + + + ### flavor-specific: generate from flavor.in diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 8e0679d..cbb54a8 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 2 11:44:33 UTC 2020 - Matej Cepl + +- Add patch multiple_flavors.patch which makes compile_macros.sh + generate alternative flavours as well. + ------------------------------------------------------------------- Mon Aug 24 08:09:01 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 29108fc..1726c2d 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -23,11 +23,14 @@ Summary: RPM macros for building of Python modules License: WTFPL URL: https://github.com/opensuse/python-rpm-macros Source: python-rpm-macros-%{version}.tar.xz +# PATCH-FEATURE-OPENSUSE multiple_flavors.patch mcepl@suse.com +# make work with multiple python3 flavours. +Patch0: multiple_flavors.patch +# To keep user expectations reasonably sane +Recommends: python-rpm-generators # Fedora compatibility Provides: python2-rpm-macros Provides: python3-rpm-macros -# To keep user expectations reasonably sane -Recommends: python-rpm-generators BuildArch: noarch %description @@ -38,10 +41,10 @@ are only building for distros newer than Leap 42.2 %package -n python-rpm-generators Summary: Dependency generator dependencies for Python RPMs Requires: %{name} = %{version}-%{release} -# Fedora compatibility -Provides: python3-rpm-generators # For the dep generator macros Requires: python3-setuptools +# Fedora compatibility +Provides: python3-rpm-generators %description -n python-rpm-generators This package contains the dependencies for Python RPMs to generate @@ -55,7 +58,7 @@ dependencies automatically. mv macros-default-pythons macros/035-default-pythons %endif %if 0%{?suse_version} >= 1550 -sed -i -e '/^%system_python/s/python2/python3/' macros/010-common-defs +sed -i -e '/^%{system_python}/s/python2/python3/' macros/010-common-defs %endif %build From 41c3c050e8dbe4695a57e6b3e0815e6b20f9e0acac1ea08974a9752cc39f7c67 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 9 Sep 2020 18:03:37 +0000 Subject: [PATCH 02/23] - %__#FLAVOR# should be defined as /usr/bin/python%{#FLAVOR#_version} not just /usr/bin/#FLAVOR# OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=108 --- multiple_flavors.patch | 19 +++++++++++++++++++ python-rpm-macros.changes | 6 ++++++ 2 files changed, 25 insertions(+) diff --git a/multiple_flavors.patch b/multiple_flavors.patch index 18dc1a6..ac8861c 100644 --- a/multiple_flavors.patch +++ b/multiple_flavors.patch @@ -13,3 +13,22 @@ ### flavor-specific: generate from flavor.in +--- a/flavor.in ++++ b/flavor.in +@@ -1,7 +1,5 @@ + ##### macro definitions for flavor "#FLAVOR#" ##### + +-%__#FLAVOR# /usr/bin/#FLAVOR# +- + %#FLAVOR#_shbang_opts %py_shbang_opts + + %#FLAVOR#_prefix #FLAVOR# +@@ -10,6 +8,8 @@ + %#FLAVOR#_version %{_python_sysconfig_var #FLAVOR# py_version_short} + %#FLAVOR#_version_nodots %{_python_sysconfig_var #FLAVOR# py_version_nodot} + ++%__#FLAVOR# /usr/bin/python%{#FLAVOR#_version} ++ + %#FLAVOR#_sysconfig_path() %{_rec_macro_helper}%{lua:call_sysconfig("path", "#FLAVOR#")} + %#FLAVOR#_sysconfig_var() %{_rec_macro_helper}%{lua:call_sysconfig("var", "#FLAVOR#")} + diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index cbb54a8..71580b0 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 9 18:00:03 UTC 2020 - Matej Cepl + +- %__#FLAVOR# should be defined as + /usr/bin/python%{#FLAVOR#_version} not just /usr/bin/#FLAVOR# + ------------------------------------------------------------------- Wed Sep 2 11:44:33 UTC 2020 - Matej Cepl From 195c90ab54617e59f4123daea11af12888546f604eb577f67ba1407fdd82192c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 17 Sep 2020 16:12:44 +0000 Subject: [PATCH 03/23] OK, this is a bad typo OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=109 --- python-rpm-macros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 1726c2d..ddf0cf6 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -58,7 +58,7 @@ dependencies automatically. mv macros-default-pythons macros/035-default-pythons %endif %if 0%{?suse_version} >= 1550 -sed -i -e '/^%{system_python}/s/python2/python3/' macros/010-common-defs +sed -i -e '/^%system_python/s/python2/python3/' macros/010-common-defs %endif %build From 4153c7831fe174aab6d7898b2e4d76bc67d37b59172f26331c63b5d18701018b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 22 Sep 2020 19:30:00 +0000 Subject: [PATCH 04/23] - Update multiple_flavors.patch to generate correct names of the python binary. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=110 --- multiple_flavors.patch | 20 ++++++++++++-------- python-rpm-macros.changes | 6 ++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/multiple_flavors.patch b/multiple_flavors.patch index ac8861c..39396e7 100644 --- a/multiple_flavors.patch +++ b/multiple_flavors.patch @@ -15,20 +15,24 @@ ### flavor-specific: generate from flavor.in --- a/flavor.in +++ b/flavor.in -@@ -1,7 +1,5 @@ +@@ -1,14 +1,14 @@ ##### macro definitions for flavor "#FLAVOR#" ##### -%__#FLAVOR# /usr/bin/#FLAVOR# - %#FLAVOR#_shbang_opts %py_shbang_opts - %#FLAVOR#_prefix #FLAVOR# -@@ -10,6 +8,8 @@ - %#FLAVOR#_version %{_python_sysconfig_var #FLAVOR# py_version_short} - %#FLAVOR#_version_nodots %{_python_sysconfig_var #FLAVOR# py_version_nodot} - -+%__#FLAVOR# /usr/bin/python%{#FLAVOR#_version} ++%__#FLAVOR# /usr/bin/%{lua: print((string.gsub("#FLAVOR#", "(%w+%d)(%d)", "%1.%2")))} + + %#FLAVOR#_prefix #FLAVOR# +-%#FLAVOR#_sitelib %{_python_sysconfig_path #FLAVOR# purelib} +-%#FLAVOR#_sitearch %{_python_sysconfig_path #FLAVOR# platlib} +-%#FLAVOR#_version %{_python_sysconfig_var #FLAVOR# py_version_short} +-%#FLAVOR#_version_nodots %{_python_sysconfig_var #FLAVOR# py_version_nodot} ++%#FLAVOR#_sitelib %{_python_sysconfig_path %__#FLAVOR# purelib} ++%#FLAVOR#_sitearch %{_python_sysconfig_path %__#FLAVOR# platlib} ++%#FLAVOR#_version %{_python_sysconfig_var %__#FLAVOR# py_version_short} ++%#FLAVOR#_version_nodots %{_python_sysconfig_var %__#FLAVOR# py_version_nodot} + %#FLAVOR#_sysconfig_path() %{_rec_macro_helper}%{lua:call_sysconfig("path", "#FLAVOR#")} %#FLAVOR#_sysconfig_var() %{_rec_macro_helper}%{lua:call_sysconfig("var", "#FLAVOR#")} - diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 71580b0..5a16090 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 22 19:29:03 UTC 2020 - Matej Cepl + +- Update multiple_flavors.patch to generate correct names of the + python binary. + ------------------------------------------------------------------- Wed Sep 9 18:00:03 UTC 2020 - Matej Cepl From ec210273d1f88c627dd2542f2467eb6c44627de702c6f41b067db5f62ba758fb Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 16 Oct 2020 14:32:21 +0000 Subject: [PATCH 05/23] - Update to version 20201016.db09189: * Delete pycache files before compilealll * Update macros/010-common-defs * Reword compileall * mention pyproject.toml and link to PEP517 and PEP518 * add description for pyunittest macro * add description for python_compileall macro * add description for pyproject macros * add python_compileall macro and use it in pyproject_install * disable pip version check: no connection to pypi.org OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=111 --- _servicedata | 2 +- python-rpm-macros.changes | 14 ++++++++++++++ python-rpm-macros.spec | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/_servicedata b/_servicedata index b5688a9..fef3e46 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - 13628e66c3f31b07ef4a4227a1b45e766350f94c \ No newline at end of file + db091899c9ec160c43691b3fea6a1ae121d74722 \ No newline at end of file diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 5a16090..b7db1c1 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Oct 16 14:31:59 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201016.db09189: + * Delete pycache files before compilealll + * Update macros/010-common-defs + * Reword compileall + * mention pyproject.toml and link to PEP517 and PEP518 + * add description for pyunittest macro + * add description for python_compileall macro + * add description for pyproject macros + * add python_compileall macro and use it in pyproject_install + * disable pip version check: no connection to pypi.org + ------------------------------------------------------------------- Tue Sep 22 19:29:03 UTC 2020 - Matej Cepl diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index ddf0cf6..7d8ba4c 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20200824.8fa42a7 +Version: 20201016.db09189 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From da6cfbda1c585741d8875a5dc905468cc66bc194e747920ef4f7c957f98f974f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 16 Oct 2020 14:32:32 +0000 Subject: [PATCH 06/23] Add tarball OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=112 --- python-rpm-macros-20201016.db09189.tar.xz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 python-rpm-macros-20201016.db09189.tar.xz diff --git a/python-rpm-macros-20201016.db09189.tar.xz b/python-rpm-macros-20201016.db09189.tar.xz new file mode 100644 index 0000000..a8b4eab --- /dev/null +++ b/python-rpm-macros-20201016.db09189.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d797d82edde7e9f51b60b672b40bcadbc9517885841f2cede2e501ec7586159a +size 14308 From e08682b51adbcf49e5133da654269a6502d247d5d24390226c6d7309646cba26 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 16 Oct 2020 14:34:04 +0000 Subject: [PATCH 07/23] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=113 --- python-rpm-macros-20200824.8fa42a7.tar.xz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 python-rpm-macros-20200824.8fa42a7.tar.xz diff --git a/python-rpm-macros-20200824.8fa42a7.tar.xz b/python-rpm-macros-20200824.8fa42a7.tar.xz deleted file mode 100644 index 7ff36ba..0000000 --- a/python-rpm-macros-20200824.8fa42a7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:578529cdc0701f037630b4e9dc28148aa61b86a54a4605c39244952511389bc5 -size 13952 From 4a9905bac68eebf0d57a2e8bef4267f5142eba62f2e8664b79d3f5662ac63a46 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 16 Oct 2020 20:06:38 +0000 Subject: [PATCH 08/23] - Update to version 20201016.5d22545: * fix whitespace after escape in compileall macro OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=114 --- _servicedata | 2 +- python-rpm-macros-20201016.5d22545.tar.xz | 3 +++ python-rpm-macros-20201016.db09189.tar.xz | 3 --- python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 python-rpm-macros-20201016.5d22545.tar.xz delete mode 100644 python-rpm-macros-20201016.db09189.tar.xz diff --git a/_servicedata b/_servicedata index fef3e46..8bf2f9d 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - db091899c9ec160c43691b3fea6a1ae121d74722 \ No newline at end of file + a7b1da6dbe6de6f92ee0c3463d0ce521d3105913 \ No newline at end of file diff --git a/python-rpm-macros-20201016.5d22545.tar.xz b/python-rpm-macros-20201016.5d22545.tar.xz new file mode 100644 index 0000000..f282869 --- /dev/null +++ b/python-rpm-macros-20201016.5d22545.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21f604a33142a140c925b210ba0b0716c3125dafbf0badcd22eea3753d6c6650 +size 14308 diff --git a/python-rpm-macros-20201016.db09189.tar.xz b/python-rpm-macros-20201016.db09189.tar.xz deleted file mode 100644 index a8b4eab..0000000 --- a/python-rpm-macros-20201016.db09189.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d797d82edde7e9f51b60b672b40bcadbc9517885841f2cede2e501ec7586159a -size 14308 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index b7db1c1..e060f0c 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 16 20:05:52 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201016.5d22545: + * fix whitespace after escape in compileall macro + ------------------------------------------------------------------- Fri Oct 16 14:31:59 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 7d8ba4c..b6aa643 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201016.db09189 +Version: 20201016.5d22545 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From b4fd46a90f07b1cb8fc7ec9ef726d477526a077c6b00daa6b269db9e53e875e6 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 21 Oct 2020 11:22:08 +0000 Subject: [PATCH 09/23] Remove multiple_flavors.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=115 --- multiple_flavors.patch | 38 -------------------------------------- python-rpm-macros.spec | 6 +----- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 multiple_flavors.patch diff --git a/multiple_flavors.patch b/multiple_flavors.patch deleted file mode 100644 index 39396e7..0000000 --- a/multiple_flavors.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/compile-macros.sh -+++ b/compile-macros.sh -@@ -1,10 +1,10 @@ - #!/bin/bash - --FLAVORS="python2 python3 pypy3" -+FLAVORS="python2 python3 python36 python38 pypy3" - - # order of BUILDSET is important, it is copied to order of %pythons, - # and that determines the last installed binary --BUILDSET="python2 python3" -+BUILDSET="python2 python36 python38" - - - ### flavor-specific: generate from flavor.in ---- a/flavor.in -+++ b/flavor.in -@@ -1,14 +1,14 @@ - ##### macro definitions for flavor "#FLAVOR#" ##### - --%__#FLAVOR# /usr/bin/#FLAVOR# -- - %#FLAVOR#_shbang_opts %py_shbang_opts - -+%__#FLAVOR# /usr/bin/%{lua: print((string.gsub("#FLAVOR#", "(%w+%d)(%d)", "%1.%2")))} -+ - %#FLAVOR#_prefix #FLAVOR# --%#FLAVOR#_sitelib %{_python_sysconfig_path #FLAVOR# purelib} --%#FLAVOR#_sitearch %{_python_sysconfig_path #FLAVOR# platlib} --%#FLAVOR#_version %{_python_sysconfig_var #FLAVOR# py_version_short} --%#FLAVOR#_version_nodots %{_python_sysconfig_var #FLAVOR# py_version_nodot} -+%#FLAVOR#_sitelib %{_python_sysconfig_path %__#FLAVOR# purelib} -+%#FLAVOR#_sitearch %{_python_sysconfig_path %__#FLAVOR# platlib} -+%#FLAVOR#_version %{_python_sysconfig_var %__#FLAVOR# py_version_short} -+%#FLAVOR#_version_nodots %{_python_sysconfig_var %__#FLAVOR# py_version_nodot} - - %#FLAVOR#_sysconfig_path() %{_rec_macro_helper}%{lua:call_sysconfig("path", "#FLAVOR#")} - %#FLAVOR#_sysconfig_var() %{_rec_macro_helper}%{lua:call_sysconfig("var", "#FLAVOR#")} diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index b6aa643..f6caa2c 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -23,9 +23,6 @@ Summary: RPM macros for building of Python modules License: WTFPL URL: https://github.com/opensuse/python-rpm-macros Source: python-rpm-macros-%{version}.tar.xz -# PATCH-FEATURE-OPENSUSE multiple_flavors.patch mcepl@suse.com -# make work with multiple python3 flavours. -Patch0: multiple_flavors.patch # To keep user expectations reasonably sane Recommends: python-rpm-generators # Fedora compatibility @@ -51,8 +48,7 @@ This package contains the dependencies for Python RPMs to generate dependencies automatically. %prep -%setup -q -%autopatch -p1 +%autosetup %if 0%{?suse_version} < 1330 mv macros-default-pythons macros/035-default-pythons From ddf68088d147f593933c7fa7e1c2ca9ba08e285313337e0abf47d9fa632b4843 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 21 Oct 2020 11:22:54 +0000 Subject: [PATCH 10/23] - Update to version 20201021.adb6953: * Prepare for multiple python3 flavors OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=116 --- _servicedata | 2 +- python-rpm-macros-20201016.5d22545.tar.xz | 3 --- python-rpm-macros-20201021.adb6953.tar.xz | 3 +++ python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201016.5d22545.tar.xz create mode 100644 python-rpm-macros-20201021.adb6953.tar.xz diff --git a/_servicedata b/_servicedata index 8bf2f9d..67ea32a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - a7b1da6dbe6de6f92ee0c3463d0ce521d3105913 \ No newline at end of file + 97041ef948e5833411d87c323b7b41a3337e7fb2 \ No newline at end of file diff --git a/python-rpm-macros-20201016.5d22545.tar.xz b/python-rpm-macros-20201016.5d22545.tar.xz deleted file mode 100644 index f282869..0000000 --- a/python-rpm-macros-20201016.5d22545.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21f604a33142a140c925b210ba0b0716c3125dafbf0badcd22eea3753d6c6650 -size 14308 diff --git a/python-rpm-macros-20201021.adb6953.tar.xz b/python-rpm-macros-20201021.adb6953.tar.xz new file mode 100644 index 0000000..c6d48f3 --- /dev/null +++ b/python-rpm-macros-20201021.adb6953.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e672e091f98a022100f2d80750e739101bcb731674f12fb31f8ffeae0e8a5d1 +size 14396 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index e060f0c..3000673 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 21 11:22:16 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201021.adb6953: + * Prepare for multiple python3 flavors + ------------------------------------------------------------------- Fri Oct 16 20:05:52 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index f6caa2c..29da599 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201016.5d22545 +Version: 20201021.adb6953 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From 0448f2bdfb5c0963f55e5565617888e0aa8852ab24ff6c692d017ed9e73cb939 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 21 Oct 2020 11:43:42 +0000 Subject: [PATCH 11/23] Update changes OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=117 --- python-rpm-macros.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 3000673..145cc2b 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -3,6 +3,8 @@ Wed Oct 21 11:22:16 UTC 2020 - mcepl@cepl.eu - Update to version 20201021.adb6953: * Prepare for multiple python3 flavors +- Remove multiple_flavors.patch as it is included in the upstream + tarball. ------------------------------------------------------------------- Fri Oct 16 20:05:52 UTC 2020 - mcepl@cepl.eu From 8b35b012d0532014f5c8d1ac60c9d27be76f3234499501ed660a12af537438f9 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 22 Oct 2020 18:48:21 +0000 Subject: [PATCH 12/23] - Update to version 20201022.7f87908: * Add python36 and python38 flavours. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=118 --- _servicedata | 2 +- python-rpm-macros-20201021.adb6953.tar.xz | 3 --- python-rpm-macros-20201022.7f87908.tar.xz | 3 +++ python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201021.adb6953.tar.xz create mode 100644 python-rpm-macros-20201022.7f87908.tar.xz diff --git a/_servicedata b/_servicedata index 67ea32a..5ba91db 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - 97041ef948e5833411d87c323b7b41a3337e7fb2 \ No newline at end of file + b3a03fd3c948de234febd0f3b625c9ff5c3f5173 \ No newline at end of file diff --git a/python-rpm-macros-20201021.adb6953.tar.xz b/python-rpm-macros-20201021.adb6953.tar.xz deleted file mode 100644 index c6d48f3..0000000 --- a/python-rpm-macros-20201021.adb6953.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e672e091f98a022100f2d80750e739101bcb731674f12fb31f8ffeae0e8a5d1 -size 14396 diff --git a/python-rpm-macros-20201022.7f87908.tar.xz b/python-rpm-macros-20201022.7f87908.tar.xz new file mode 100644 index 0000000..767d1ea --- /dev/null +++ b/python-rpm-macros-20201022.7f87908.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1226ddb7ab7c3b7c4559a0a368a4f2021fd1ef965816ddcf55915dda4472c0a8 +size 14396 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 145cc2b..2436cdc 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 22 18:47:52 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201022.7f87908: + * Add python36 and python38 flavours. + ------------------------------------------------------------------- Wed Oct 21 11:22:16 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 29da599..58cc791 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201021.adb6953 +Version: 20201022.7f87908 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From a08f3bfdf4a3c1b2fd6ffd17ab3dd8b3f0e251603e5fddf3b0019c386f66ede0 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 2 Nov 2020 18:35:27 +0000 Subject: [PATCH 13/23] - Update to version 20201102.31ccfc2: * fix python_clone shebang replacement * one less expansion for python_exec * expand default %python_ macros earlier * update README for multiple flavors * more command delimiters for %python_expand OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=119 --- _servicedata | 2 +- python-rpm-macros-20201022.7f87908.tar.xz | 3 --- python-rpm-macros-20201102.31ccfc2.tar.xz | 3 +++ python-rpm-macros.changes | 10 ++++++++++ python-rpm-macros.spec | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201022.7f87908.tar.xz create mode 100644 python-rpm-macros-20201102.31ccfc2.tar.xz diff --git a/_servicedata b/_servicedata index 5ba91db..9034fe9 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - b3a03fd3c948de234febd0f3b625c9ff5c3f5173 \ No newline at end of file + d2e9e0e05e3ec284709de07c63d1d0d2c4765ddc \ No newline at end of file diff --git a/python-rpm-macros-20201022.7f87908.tar.xz b/python-rpm-macros-20201022.7f87908.tar.xz deleted file mode 100644 index 767d1ea..0000000 --- a/python-rpm-macros-20201022.7f87908.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1226ddb7ab7c3b7c4559a0a368a4f2021fd1ef965816ddcf55915dda4472c0a8 -size 14396 diff --git a/python-rpm-macros-20201102.31ccfc2.tar.xz b/python-rpm-macros-20201102.31ccfc2.tar.xz new file mode 100644 index 0000000..cca49c9 --- /dev/null +++ b/python-rpm-macros-20201102.31ccfc2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b206d779529ad5d10cce1a62fbdfa75452f6ca46cbab2793a4d43ab285eb42de +size 14644 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 2436cdc..1b8058e 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Nov 02 18:34:58 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201102.31ccfc2: + * fix python_clone shebang replacement + * one less expansion for python_exec + * expand default %python_ macros earlier + * update README for multiple flavors + * more command delimiters for %python_expand + ------------------------------------------------------------------- Thu Oct 22 18:47:52 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 58cc791..e5afa1c 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201022.7f87908 +Version: 20201102.31ccfc2 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From 4aa097955343014d709c15f1704f9fd18ebcb886297c847db71883d29067970c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 3 Nov 2020 20:59:23 +0000 Subject: [PATCH 14/23] - Update to version 20201103.cec67c2: * document python_find_lang * add python_find_lang and allow to specify in %python_files. Fixes #5 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=120 --- _servicedata | 2 +- python-rpm-macros-20201102.31ccfc2.tar.xz | 3 --- python-rpm-macros-20201103.cec67c2.tar.xz | 3 +++ python-rpm-macros.changes | 7 +++++++ python-rpm-macros.spec | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201102.31ccfc2.tar.xz create mode 100644 python-rpm-macros-20201103.cec67c2.tar.xz diff --git a/_servicedata b/_servicedata index 9034fe9..ba18e51 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - d2e9e0e05e3ec284709de07c63d1d0d2c4765ddc \ No newline at end of file + b9bce889e660be9de616eb9711f25659827bae7b \ No newline at end of file diff --git a/python-rpm-macros-20201102.31ccfc2.tar.xz b/python-rpm-macros-20201102.31ccfc2.tar.xz deleted file mode 100644 index cca49c9..0000000 --- a/python-rpm-macros-20201102.31ccfc2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b206d779529ad5d10cce1a62fbdfa75452f6ca46cbab2793a4d43ab285eb42de -size 14644 diff --git a/python-rpm-macros-20201103.cec67c2.tar.xz b/python-rpm-macros-20201103.cec67c2.tar.xz new file mode 100644 index 0000000..6f695a8 --- /dev/null +++ b/python-rpm-macros-20201103.cec67c2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c091112bd0b346139a3db064d0dd2ba2475fad1d68b46af1f1bc29254cff911 +size 14816 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 1b8058e..8ac193d 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 03 20:59:11 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201103.cec67c2: + * document python_find_lang + * add python_find_lang and allow to specify in %python_files. Fixes #5 + ------------------------------------------------------------------- Mon Nov 02 18:34:58 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index e5afa1c..78e8378 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201102.31ccfc2 +Version: 20201103.cec67c2 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From ff7eeca75f26c29294b50bca3731612a45d3cec52e39d05c7ee4c47fb7cdae39 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 12 Nov 2020 18:19:35 +0000 Subject: [PATCH 15/23] - Update to version 20201112.a4c80dc: * handle python_subpackage_only, fixes gh#openSUSE/python-rpm-macros#73 * define default providers for pythonX from pythonXY flavors: fixes #69 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=121 --- _servicedata | 2 +- python-rpm-macros-20201103.cec67c2.tar.xz | 3 --- python-rpm-macros-20201112.a4c80dc.tar.xz | 3 +++ python-rpm-macros.changes | 7 +++++++ python-rpm-macros.spec | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201103.cec67c2.tar.xz create mode 100644 python-rpm-macros-20201112.a4c80dc.tar.xz diff --git a/_servicedata b/_servicedata index ba18e51..45924fa 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - b9bce889e660be9de616eb9711f25659827bae7b \ No newline at end of file + 028fc2d837f5a25e30ed6ad98b4e1337b682effa \ No newline at end of file diff --git a/python-rpm-macros-20201103.cec67c2.tar.xz b/python-rpm-macros-20201103.cec67c2.tar.xz deleted file mode 100644 index 6f695a8..0000000 --- a/python-rpm-macros-20201103.cec67c2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c091112bd0b346139a3db064d0dd2ba2475fad1d68b46af1f1bc29254cff911 -size 14816 diff --git a/python-rpm-macros-20201112.a4c80dc.tar.xz b/python-rpm-macros-20201112.a4c80dc.tar.xz new file mode 100644 index 0000000..f74c420 --- /dev/null +++ b/python-rpm-macros-20201112.a4c80dc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:813e2920be3da995b0cc3da03bafdf63369ef3d28bcc44977cdf47eb402746e1 +size 15324 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 8ac193d..5bb093a 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 12 18:19:15 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201112.a4c80dc: + * handle python_subpackage_only, fixes gh#openSUSE/python-rpm-macros#73 + * define default providers for pythonX from pythonXY flavors: fixes #69 + ------------------------------------------------------------------- Tue Nov 03 20:59:11 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 78e8378..6c59aad 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201103.cec67c2 +Version: 20201112.a4c80dc Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From 9b8eb9efb840d59712a4604a2aec59a22c7d36e355f782c16bf5ec36c95f482d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 19 Nov 2020 07:56:21 +0000 Subject: [PATCH 16/23] - Update to version 20201119.6bb5f69: * add default provider properties * don't replace %name, for subpackage_only * expand parameters for subpackage_only packages OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=122 --- _servicedata | 2 +- python-rpm-macros-20201112.a4c80dc.tar.xz | 3 --- python-rpm-macros-20201119.6bb5f69.tar.xz | 3 +++ python-rpm-macros.changes | 8 ++++++++ python-rpm-macros.spec | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201112.a4c80dc.tar.xz create mode 100644 python-rpm-macros-20201119.6bb5f69.tar.xz diff --git a/_servicedata b/_servicedata index 45924fa..d4c592b 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - 028fc2d837f5a25e30ed6ad98b4e1337b682effa \ No newline at end of file + db304fe11b37fec8c3506601db61fe240a99effc \ No newline at end of file diff --git a/python-rpm-macros-20201112.a4c80dc.tar.xz b/python-rpm-macros-20201112.a4c80dc.tar.xz deleted file mode 100644 index f74c420..0000000 --- a/python-rpm-macros-20201112.a4c80dc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:813e2920be3da995b0cc3da03bafdf63369ef3d28bcc44977cdf47eb402746e1 -size 15324 diff --git a/python-rpm-macros-20201119.6bb5f69.tar.xz b/python-rpm-macros-20201119.6bb5f69.tar.xz new file mode 100644 index 0000000..676fbab --- /dev/null +++ b/python-rpm-macros-20201119.6bb5f69.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0286e23f3970ed7b03e94733e345212568cfefb4218edb0b635076244cce9be +size 15472 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 5bb093a..4f5a4d0 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 19 07:53:17 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201119.6bb5f69: + * add default provider properties + * don't replace %name, for subpackage_only + * expand parameters for subpackage_only packages + ------------------------------------------------------------------- Thu Nov 12 18:19:15 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 6c59aad..b4bf9ad 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201112.a4c80dc +Version: 20201119.6bb5f69 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From 245b0c64db0f427569314ddf38984db8f92f5d2075a42d38469b37e66747dbc6 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 23 Nov 2020 14:41:54 +0000 Subject: [PATCH 17/23] - Update to version 20201123.6978323: * also rewrite subpackage_only default providers * pytest: ignore _build dirs for all flavors OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=123 --- _servicedata | 2 +- python-rpm-macros.changes | 7 +++++++ python-rpm-macros.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/_servicedata b/_servicedata index d4c592b..36ad857 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - db304fe11b37fec8c3506601db61fe240a99effc \ No newline at end of file + 69783238fb6a88c66060f13d973bad008792017d \ No newline at end of file diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 4f5a4d0..7590e36 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 23 14:41:05 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201123.6978323: + * also rewrite subpackage_only default providers + * pytest: ignore _build dirs for all flavors + ------------------------------------------------------------------- Thu Nov 19 07:53:17 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index b4bf9ad..832f95e 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201119.6bb5f69 +Version: 20201123.6978323 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From 785b42c151ddd3dbf4759130cf0eb560ca11e0c1d13b9028c626a6bed5077465 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 23 Nov 2020 14:43:15 +0000 Subject: [PATCH 18/23] Add tarball. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=124 --- python-rpm-macros-20201119.6bb5f69.tar.xz | 3 --- python-rpm-macros-20201123.6978323.tar.xz | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 python-rpm-macros-20201119.6bb5f69.tar.xz create mode 100644 python-rpm-macros-20201123.6978323.tar.xz diff --git a/python-rpm-macros-20201119.6bb5f69.tar.xz b/python-rpm-macros-20201119.6bb5f69.tar.xz deleted file mode 100644 index 676fbab..0000000 --- a/python-rpm-macros-20201119.6bb5f69.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0286e23f3970ed7b03e94733e345212568cfefb4218edb0b635076244cce9be -size 15472 diff --git a/python-rpm-macros-20201123.6978323.tar.xz b/python-rpm-macros-20201123.6978323.tar.xz new file mode 100644 index 0000000..6781d03 --- /dev/null +++ b/python-rpm-macros-20201123.6978323.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:337830e488c6eced198810969e0f84115daab43c348cf9736b5fc4c698de3da2 +size 15508 From 2962d6244b1b99ab5266d9b172daed26c29430e3c2d7fda9b3424563c7be7520 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 28 Nov 2020 22:13:50 +0000 Subject: [PATCH 19/23] - Update to version 20201128.669edb3: * fix provides (for python-numpy f2py, in gh#openSUSE/python-rpm-macros#66) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=125 --- _servicedata | 2 +- python-rpm-macros-20201123.6978323.tar.xz | 3 --- python-rpm-macros-20201128.669edb3.tar.xz | 3 +++ python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201123.6978323.tar.xz create mode 100644 python-rpm-macros-20201128.669edb3.tar.xz diff --git a/_servicedata b/_servicedata index 36ad857..7e6c62b 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - 69783238fb6a88c66060f13d973bad008792017d \ No newline at end of file + 669edb3c0260ebdc06cf3a6be0b3b7a1521bb705 \ No newline at end of file diff --git a/python-rpm-macros-20201123.6978323.tar.xz b/python-rpm-macros-20201123.6978323.tar.xz deleted file mode 100644 index 6781d03..0000000 --- a/python-rpm-macros-20201123.6978323.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:337830e488c6eced198810969e0f84115daab43c348cf9736b5fc4c698de3da2 -size 15508 diff --git a/python-rpm-macros-20201128.669edb3.tar.xz b/python-rpm-macros-20201128.669edb3.tar.xz new file mode 100644 index 0000000..b7cdf3b --- /dev/null +++ b/python-rpm-macros-20201128.669edb3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:074113a5770b30ba725427fd7820eb2e96b6add05d61fd77d28b5addc2f885e2 +size 15524 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 7590e36..33709ff 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 28 22:11:52 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201128.669edb3: + * fix provides (for python-numpy f2py, in gh#openSUSE/python-rpm-macros#66) + ------------------------------------------------------------------- Mon Nov 23 14:41:05 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 832f95e..01f70a4 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201123.6978323 +Version: 20201128.669edb3 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From 5aa977608a701d808834df6739bc108a4d9c1175869a7e27192674d2c53e6737 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 3 Dec 2020 07:08:33 +0000 Subject: [PATCH 20/23] - Update to version 20201203.5331183: * fix print_provided_flavor OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=126 --- _servicedata | 2 +- python-rpm-macros-20201128.669edb3.tar.xz | 3 --- python-rpm-macros-20201203.5331183.tar.xz | 3 +++ python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201128.669edb3.tar.xz create mode 100644 python-rpm-macros-20201203.5331183.tar.xz diff --git a/_servicedata b/_servicedata index 7e6c62b..3442991 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - 669edb3c0260ebdc06cf3a6be0b3b7a1521bb705 \ No newline at end of file + eb4257878b26f8365dac6c3fad09bbe47694ad3b \ No newline at end of file diff --git a/python-rpm-macros-20201128.669edb3.tar.xz b/python-rpm-macros-20201128.669edb3.tar.xz deleted file mode 100644 index b7cdf3b..0000000 --- a/python-rpm-macros-20201128.669edb3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:074113a5770b30ba725427fd7820eb2e96b6add05d61fd77d28b5addc2f885e2 -size 15524 diff --git a/python-rpm-macros-20201203.5331183.tar.xz b/python-rpm-macros-20201203.5331183.tar.xz new file mode 100644 index 0000000..8aa2114 --- /dev/null +++ b/python-rpm-macros-20201203.5331183.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99146f392548ef80788c5910217b02b3f3514720f27c526f835f25bfd47e2265 +size 15516 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 33709ff..469bdfa 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 03 07:08:14 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201203.5331183: + * fix print_provided_flavor + ------------------------------------------------------------------- Sat Nov 28 22:11:52 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 01f70a4..0db9f5a 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201128.669edb3 +Version: 20201203.5331183 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From 50d49900562214f9927799d81bc8778c09188b5bb420ff830917c4af430ee592 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 4 Dec 2020 09:48:06 +0000 Subject: [PATCH 21/23] - Update to version 20201204.32a910e: * fix print_provided_flavor again OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=127 --- _servicedata | 2 +- python-rpm-macros-20201203.5331183.tar.xz | 3 --- python-rpm-macros-20201204.32a910e.tar.xz | 3 +++ python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201203.5331183.tar.xz create mode 100644 python-rpm-macros-20201204.32a910e.tar.xz diff --git a/_servicedata b/_servicedata index 3442991..ab8a1ea 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - eb4257878b26f8365dac6c3fad09bbe47694ad3b \ No newline at end of file + 2f11258b99309159221d1089946fac4aeda2c6d9 \ No newline at end of file diff --git a/python-rpm-macros-20201203.5331183.tar.xz b/python-rpm-macros-20201203.5331183.tar.xz deleted file mode 100644 index 8aa2114..0000000 --- a/python-rpm-macros-20201203.5331183.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99146f392548ef80788c5910217b02b3f3514720f27c526f835f25bfd47e2265 -size 15516 diff --git a/python-rpm-macros-20201204.32a910e.tar.xz b/python-rpm-macros-20201204.32a910e.tar.xz new file mode 100644 index 0000000..0f1b66e --- /dev/null +++ b/python-rpm-macros-20201204.32a910e.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f31091d1ad395c8b9d1819f4fe7a9c6599df18344bc2f9a518397cf584b2d952 +size 15544 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 469bdfa..e51b263 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 04 09:47:39 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201204.32a910e: + * fix print_provided_flavor again + ------------------------------------------------------------------- Thu Dec 03 07:08:14 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 0db9f5a..3cea590 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201203.5331183 +Version: 20201204.32a910e Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From f8ae7adf2a2e06c23f562c467b3fb587ebd73dbc46a2b1d533b055b4c6ecfaf3 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 7 Dec 2020 17:26:16 +0000 Subject: [PATCH 22/23] - Update to version 20201207.2177fcf: * README update after merge - Update to version 20201207.259cdda: * Update python_expand description in README * python_expand to basename only OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=128 --- _servicedata | 2 +- python-rpm-macros-20201204.32a910e.tar.xz | 3 --- python-rpm-macros-20201207.2177fcf.tar.xz | 3 +++ python-rpm-macros.changes | 13 +++++++++++++ python-rpm-macros.spec | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 python-rpm-macros-20201204.32a910e.tar.xz create mode 100644 python-rpm-macros-20201207.2177fcf.tar.xz diff --git a/_servicedata b/_servicedata index ab8a1ea..ccec626 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - 2f11258b99309159221d1089946fac4aeda2c6d9 \ No newline at end of file + 2177fcff4d870b936b0cecc87d4b124e617f7b58 \ No newline at end of file diff --git a/python-rpm-macros-20201204.32a910e.tar.xz b/python-rpm-macros-20201204.32a910e.tar.xz deleted file mode 100644 index 0f1b66e..0000000 --- a/python-rpm-macros-20201204.32a910e.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f31091d1ad395c8b9d1819f4fe7a9c6599df18344bc2f9a518397cf584b2d952 -size 15544 diff --git a/python-rpm-macros-20201207.2177fcf.tar.xz b/python-rpm-macros-20201207.2177fcf.tar.xz new file mode 100644 index 0000000..8716bed --- /dev/null +++ b/python-rpm-macros-20201207.2177fcf.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:155e21c6df3b46f92551e948f855c332a9765beea21f56cabd6300070b246665 +size 15664 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index e51b263..4c94409 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 07 17:09:23 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201207.2177fcf: + * README update after merge + +------------------------------------------------------------------- +Mon Dec 07 16:31:52 UTC 2020 - mcepl@cepl.eu + +- Update to version 20201207.259cdda: + * Update python_expand description in README + * python_expand to basename only + ------------------------------------------------------------------- Fri Dec 04 09:47:39 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 3cea590..f0c1375 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201204.32a910e +Version: 20201207.2177fcf Release: 0 Summary: RPM macros for building of Python modules License: WTFPL From e561710075532841e549634d3511f04416ad90c51d55354d1103c2b55d482604 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 12 Jan 2021 07:50:51 +0000 Subject: [PATCH 23/23] Accepting request 862531 from home:mcepl:neovim - Update to version 20210112.86f4d9d: * fix gh#openSUSE/python-rpm-macros#84: python_sysconfig_ macros OBS-URL: https://build.opensuse.org/request/show/862531 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=129 --- _servicedata | 2 +- python-rpm-macros-20201207.2177fcf.tar.xz | 3 --- python-rpm-macros-20210112.86f4d9d.tar.xz | 3 +++ python-rpm-macros.changes | 6 ++++++ python-rpm-macros.spec | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 python-rpm-macros-20201207.2177fcf.tar.xz create mode 100644 python-rpm-macros-20210112.86f4d9d.tar.xz diff --git a/_servicedata b/_servicedata index ccec626..140b90f 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/openSUSE/python-rpm-macros.git - 2177fcff4d870b936b0cecc87d4b124e617f7b58 \ No newline at end of file + 16d3497aadc60ea99a1e28894b8d9bd073ac3e29 \ No newline at end of file diff --git a/python-rpm-macros-20201207.2177fcf.tar.xz b/python-rpm-macros-20201207.2177fcf.tar.xz deleted file mode 100644 index 8716bed..0000000 --- a/python-rpm-macros-20201207.2177fcf.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:155e21c6df3b46f92551e948f855c332a9765beea21f56cabd6300070b246665 -size 15664 diff --git a/python-rpm-macros-20210112.86f4d9d.tar.xz b/python-rpm-macros-20210112.86f4d9d.tar.xz new file mode 100644 index 0000000..262b481 --- /dev/null +++ b/python-rpm-macros-20210112.86f4d9d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65333ee2c557f4437064dab547ad0b41396581f73f8b48984603bbe185644ccc +size 15608 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 4c94409..9b36174 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 12 07:18:43 UTC 2021 - mcepl@cepl.eu + +- Update to version 20210112.86f4d9d: + * fix gh#openSUSE/python-rpm-macros#84: python_sysconfig_ macros + ------------------------------------------------------------------- Mon Dec 07 17:09:23 UTC 2020 - mcepl@cepl.eu diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index f0c1375..677b161 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,7 +1,7 @@ # # spec file for package python-rpm-macros # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20201207.2177fcf +Version: 20210112.86f4d9d Release: 0 Summary: RPM macros for building of Python modules License: WTFPL