From aaf491705e42fc4ce1635dbd213da4a5dde4048a9ee0e3d1edb14d60419ba77c Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 15 Mar 2022 15:56:28 +0000 Subject: [PATCH 1/4] Update to last successful build c7dd256efbcc0a1f4771eb6f0fefa3df7f080c30 Merge pull request #3 from bnavigator/multiple-python3-flavors 4154576ce2fdf4157e1ca3e05f66427d40d53dc6 python_expand to support multiple python3 flavors OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=26 --- .gitattributes | 23 +++++++ .gitignore | 1 + zypp-plugin-0.6.3.tar.bz2 | 3 + zypp-plugin.changes | 93 ++++++++++++++++++++++++++ zypp-plugin.spec | 133 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 253 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 zypp-plugin-0.6.3.tar.bz2 create mode 100644 zypp-plugin.changes create mode 100644 zypp-plugin.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/zypp-plugin-0.6.3.tar.bz2 b/zypp-plugin-0.6.3.tar.bz2 new file mode 100644 index 0000000..0145718 --- /dev/null +++ b/zypp-plugin-0.6.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3836f2676494de3a61a99a9592b29a02ae34339b29058774ade9a5f90586874d +size 4951 diff --git a/zypp-plugin.changes b/zypp-plugin.changes new file mode 100644 index 0000000..af7479a --- /dev/null +++ b/zypp-plugin.changes @@ -0,0 +1,93 @@ +------------------------------------------------------------------- +Fri Oct 23 21:31:23 UTC 2020 - Benjamin Greiner + +- singlespec in Tumbleweed must support multiple python3 flavors + in the future gh#openSUSE/python-rpm-macros#66 + +------------------------------------------------------------------- +Tue Mar 13 14:51:18 CET 2018 - ma@suse.com + +- Provide python3-zypp-plugin down to SLE12 (bsc#1081596) + +------------------------------------------------------------------- +Mon Feb 19 15:53:29 CET 2018 - ma@suse.com + +- Provide python3-zypp-plugin in SLE12-SP3 (bsc#1081596) + +------------------------------------------------------------------- +Fri Jan 19 15:15:38 CET 2018 - ma@suse.de + +- Disable singlespec packaging in SLE12* and older distros while it's + not working there. They provide python2 packages only. + +------------------------------------------------------------------- +Wed Jan 3 15:53:28 UTC 2018 - tchvatal@suse.com + +- Fix a bit the obsoletes/provides to allow migration, previously + was overwritten by macros +- BR python-rpm-macros to build on older distributions +- Fix bit python detection conditions on install phase to be better + readable and uniform + +------------------------------------------------------------------- +Mon Dec 11 14:15:36 UTC 2017 - tchvatal@suse.com + +- Switch to singlespec packaging to make it easy to disable either + python3 or python2 plugin and make sure all is buildable +- version 0.6.3 + +------------------------------------------------------------------- +Thu Nov 9 17:46:45 CET 2017 - ma@suse.de + +- Don't use a shebang in the module +- version 0.6.2 + +------------------------------------------------------------------- +Thu Oct 26 17:14:59 CEST 2017 - ma@suse.de + +- Let zypp-plugin-python provide python2-zypp-plugin to be + consistent with python3-zypp-plugin. +- version 0.6.1 + +------------------------------------------------------------------- +Thu Oct 26 12:43:19 CEST 2017 - ma@suse.de + +- Fix specfile to be able to build for python3 +- version 0.6 + +------------------------------------------------------------------- +Tue Mar 10 17:18:59 CET 2015 - lchiquitto@suse.de + +- Add COPYING file + +------------------------------------------------------------------- +Mon Aug 18 13:31:39 CEST 2014 - ma@suse.de + +- Force usage of the official python VM; no longer use + "/usr/bin/env python" (bnc#889363) +- version 0.5 + +------------------------------------------------------------------- +Sat Jan 25 17:21:49 CET 2014 - ma@suse.de + +- Add .pyc/.pyo to package +- version 0.4 + +------------------------------------------------------------------- +Wed May 9 10:01:48 UTC 2012 - coolo@suse.com + +- patch license to be in spdx.org format + +------------------------------------------------------------------- +Tue Jul 5 12:19:37 CEST 2011 - ma@suse.de + +- Fix specfile for factory + +------------------------------------------------------------------- +Mon Jul 4 15:16:39 CEST 2011 - ma@suse.de + +- Provide zypp-plugin-python as stand alone package so + that it can be used in other zypp plugins like snapper. + (formerly a subpackage of zypp-plugin-spacewalk) +- version 0.3 + diff --git a/zypp-plugin.spec b/zypp-plugin.spec new file mode 100644 index 0000000..a3af52b --- /dev/null +++ b/zypp-plugin.spec @@ -0,0 +1,133 @@ +# +# spec file for package zypp-plugin +# +# Copyright (c) 2022 SUSE LLC +# +# 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 https://bugs.opensuse.org/ +# + + +%define singlespec_py3 ( 0%{?suse_version} > 1330 ) + +Name: zypp-plugin +Version: 0.6.3 +Release: 0 +Summary: Helper that makes writing ZYpp plugins easier +License: GPL-2.0-only +Group: System/Packages +URL: https://github.com/openSUSE/zypp-plugin +Source0: %{name}-%{version}.tar.bz2 +BuildArch: noarch + +%if %{singlespec_py3} +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +BuildRequires: %{python_module devel} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +Requires: python-base +# provide old names for py2 package +%if "%{python_flavor}" == "python2" +Obsoletes: zypp-plugin-python < %{version}-%{release} +Provides: zypp-plugin-python = %{version}-%{release} +%endif +%python_subpackages +### ---------------------------------------- +### SLE-12* and even older +%else +%define have_python2 1 +%if ( 0%{?suse_version} == 1315 ) +%define have_python3 1 +%else +%define have_python3 0 +%endif +%endif +### ---------------------------------------- + +%description +This API allows writing ZYpp plugins by just subclassing from a python class +and implementing the commands you want to respond to as python methods. + +%prep +%setup -q -n zypp-plugin + +%build +: + +%install +%if %{singlespec_py3} +%{python_expand # +mkdir -p %{buildroot}%{$python_sitelib} +install -m 0644 python/zypp_plugin.py %{buildroot}%{$python_sitelib}/zypp_plugin.py +# TODO: replace by $python_compileall as soon as it is available sr#843481 +$python -m compileall %{buildroot}%{$python_sitelib} +$python -O -m compileall %{buildroot}%{$python_sitelib} +%fdupes %{buildroot}%{$python_sitelib} +} +%else +%if 0%{?have_python2} +mkdir -p %{buildroot}%{python_sitelib} +install -m 0644 python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py +%py_compile -O %{buildroot}/%{python_sitelib} +%endif +%if 0%{?have_python3} +mkdir -p %{buildroot}%{python3_sitelib} +install -m 0644 python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py +%py3_compile -O %{buildroot}/%{python3_sitelib} +%endif +%endif + +%if %{singlespec_py3} +%files %{python_files} +%doc COPYING +%{python_sitelib}/zypp_plugin* +%pycache_only %{python_sitelib}/__pycache__/* + +### ---------------------------------------- +### SLE-12* and even older +%else + +%package -n %{name}-python +Summary: Helper that makes writing ZYpp plugins in python easier +Group: System/Packages +Provides: python2-%{name} = %{version}-%{release} +BuildRequires: python-devel +Requires: python + +%files -n %{name}-python +%defattr(-,root,root) +%doc COPYING +%{python_sitelib}/* + +%description -n %{name}-python +This API allows writing ZYpp plugins by just subclassing from a python class +and implementing the commands you want to respond to as python methods. + +%if 0%{?have_python3} +%package -n python3-%{name} +Summary: Helper that makes writing ZYpp plugins in python easier +Group: System/Packages +Requires: python3 +BuildRequires: python3-devel + +%files -n python3-%{name} +%defattr(-,root,root) +%doc COPYING +%{python3_sitelib}/* + +%description -n python3-%{name} +This API allows writing ZYpp plugins by just subclassing from a python class +and implementing the commands you want to respond to as python methods. +%endif +%endif +### ---------------------------------------- + +%changelog From 444562ebc108142f25643fe66a6bbcfd2d07a3ad91be0bf85e9a3bd6e745b122 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 6 Feb 2023 18:36:40 +0000 Subject: [PATCH 2/4] gitrev c7dd256 (Merge pull request #3 from bnavigator/multiple-python3-flavors, 2020-10-28) 4154576 (python_expand to support multiple python3 flavors, 2020-10-23) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=27 --- zypp-plugin.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/zypp-plugin.spec b/zypp-plugin.spec index a3af52b..241b42d 100644 --- a/zypp-plugin.spec +++ b/zypp-plugin.spec @@ -1,7 +1,7 @@ # # spec file for package zypp-plugin # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2018 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -22,17 +22,17 @@ Name: zypp-plugin Version: 0.6.3 Release: 0 Summary: Helper that makes writing ZYpp plugins easier -License: GPL-2.0-only +License: GPL-2.0 Group: System/Packages -URL: https://github.com/openSUSE/zypp-plugin +Url: https://github.com/openSUSE/zypp-plugin Source0: %{name}-%{version}.tar.bz2 BuildArch: noarch %if %{singlespec_py3} %{?!python_module:%define python_module() python-%{**} python3-%{**}} BuildRequires: %{python_module devel} -BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: fdupes Requires: python-base # provide old names for py2 package %if "%{python_flavor}" == "python2" @@ -94,7 +94,6 @@ install -m 0644 python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin ### ---------------------------------------- ### SLE-12* and even older %else - %package -n %{name}-python Summary: Helper that makes writing ZYpp plugins in python easier Group: System/Packages From 085e2186f13ffddbfbf30e2fd915cbfe1782c5da96bb4d2aaccda3df851ba9cc Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 15 Jul 2024 14:00:20 +0000 Subject: [PATCH 3/4] gitrev 7e8a5b5 (changes 0.6.4, 2024-07-15) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=28 --- zypp-plugin-0.6.3.tar.bz2 | 3 --- zypp-plugin-0.6.4.tar.bz2 | 3 +++ zypp-plugin.changes | 6 ++++++ zypp-plugin.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 zypp-plugin-0.6.3.tar.bz2 create mode 100644 zypp-plugin-0.6.4.tar.bz2 diff --git a/zypp-plugin-0.6.3.tar.bz2 b/zypp-plugin-0.6.3.tar.bz2 deleted file mode 100644 index 0145718..0000000 --- a/zypp-plugin-0.6.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3836f2676494de3a61a99a9592b29a02ae34339b29058774ade9a5f90586874d -size 4951 diff --git a/zypp-plugin-0.6.4.tar.bz2 b/zypp-plugin-0.6.4.tar.bz2 new file mode 100644 index 0000000..1980453 --- /dev/null +++ b/zypp-plugin-0.6.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fdeccb19e5ed0659707308a709ee3961b85d88bef789bd540408fc3d01ecf59 +size 4999 diff --git a/zypp-plugin.changes b/zypp-plugin.changes index af7479a..ee4e9bb 100644 --- a/zypp-plugin.changes +++ b/zypp-plugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon 15 Jul 15:51:49 CEST 2024 - ma@suse.com + +- Fix stomp header regex to include '-' (bsc#1227793) +- version 0.6.4 + ------------------------------------------------------------------- Fri Oct 23 21:31:23 UTC 2020 - Benjamin Greiner diff --git a/zypp-plugin.spec b/zypp-plugin.spec index 241b42d..aa0b7d2 100644 --- a/zypp-plugin.spec +++ b/zypp-plugin.spec @@ -19,7 +19,7 @@ %define singlespec_py3 ( 0%{?suse_version} > 1330 ) Name: zypp-plugin -Version: 0.6.3 +Version: 0.6.4 Release: 0 Summary: Helper that makes writing ZYpp plugins easier License: GPL-2.0 From 71a2daadcfad1bd3d881c3db99212bf8c00e42fd5775c7e3c37f810f7cf4f48b Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 15 Jul 2024 15:12:24 +0000 Subject: [PATCH 4/4] gitrev 031e8e9 (fix date in changes, 2024-07-15) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=29 --- zypp-plugin-0.6.4.tar.bz2 | 4 ++-- zypp-plugin.changes | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zypp-plugin-0.6.4.tar.bz2 b/zypp-plugin-0.6.4.tar.bz2 index 1980453..b9cf200 100644 --- a/zypp-plugin-0.6.4.tar.bz2 +++ b/zypp-plugin-0.6.4.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fdeccb19e5ed0659707308a709ee3961b85d88bef789bd540408fc3d01ecf59 -size 4999 +oid sha256:30ed39c4f9cac8115b75a01ce3dbc55aa3dded29f1b25afec88c94363cb9cf2d +size 5004 diff --git a/zypp-plugin.changes b/zypp-plugin.changes index ee4e9bb..f5847b3 100644 --- a/zypp-plugin.changes +++ b/zypp-plugin.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon 15 Jul 15:51:49 CEST 2024 - ma@suse.com +Mon Jul 15 15:51:49 CEST 2024 - ma@suse.com - Fix stomp header regex to include '-' (bsc#1227793) - version 0.6.4