From 18b0429cebd1fa406f1ed5b4f65715bfff20bd2ea89f0e8778c77698ac7c782a Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 26 Oct 2017 11:02:48 +0000 Subject: [PATCH] Update to last successful build d26bfbdc966f461b180490a359bb30a303ee8af7 changes 0.6 OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=16 --- zypp-plugin-0.5.tar.bz2 | 3 -- zypp-plugin-0.6.tar.bz2 | 3 ++ zypp-plugin.changes | 6 ++++ zypp-plugin.spec | 77 ++++++++++++++++++++++++++--------------- 4 files changed, 59 insertions(+), 30 deletions(-) delete mode 100644 zypp-plugin-0.5.tar.bz2 create mode 100644 zypp-plugin-0.6.tar.bz2 diff --git a/zypp-plugin-0.5.tar.bz2 b/zypp-plugin-0.5.tar.bz2 deleted file mode 100644 index 50aee3e..0000000 --- a/zypp-plugin-0.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed188e6d343bbddffe283f801d558ef3fb6fe589646f2645968ecae34bae3bc8 -size 4186 diff --git a/zypp-plugin-0.6.tar.bz2 b/zypp-plugin-0.6.tar.bz2 new file mode 100644 index 0000000..3bf4f86 --- /dev/null +++ b/zypp-plugin-0.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c7d4957b72e23bb1c3b1a70f3bfb21b80d90106494e2d74300098b6ce3211fc +size 4323 diff --git a/zypp-plugin.changes b/zypp-plugin.changes index 7fb4d43..267c766 100644 --- a/zypp-plugin.changes +++ b/zypp-plugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/zypp-plugin.spec b/zypp-plugin.spec index 4de330e..e10646a 100644 --- a/zypp-plugin.spec +++ b/zypp-plugin.spec @@ -16,8 +16,12 @@ # +%if 0%{?suse_version} >= 1320 +%global build_py3 1 +%endif + Name: zypp-plugin -Version: 0.5 +Version: 0.6 Release: 0 Url: https://gitorious.org/opensuse/zypp-plugin Summary: Helper that makes writing ZYpp plugins easier @@ -25,46 +29,65 @@ License: GPL-2.0 Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 - -# Actually libzypp(plugin) should be required. Unfortunately the corresponing -# provides was introduced to late for SUSE Manager/SLE-11-SP1. We do not want to -# enforce libzypp update to satisfy this, so the Requires should saty disabled, -# until libzypp on SUSE Manager/SLE-11-SP1 was updated and provides libzypp(plugin). -#Requires: libzypp(plugin) -BuildRequires: python-devel -Requires: python - -%{?!py_sitearch: %global py_sitearch %(python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(True)')} +%if 0%{?suse_version} >= 1210 +BuildArch: noarch +%endif %description Empty main package. Helper for different languages reside in subpackages. -%package python -Summary: Helper that makes writing ZYpp plugins in python easier -Group: System/Packages - -%description 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. - %prep %setup -q -n zypp-plugin %build %install -%{__mkdir_p} %{buildroot}%{py_sitearch} -%{__install} python/zypp_plugin.py %{buildroot}%{py_sitearch}/zypp_plugin.py -%if 0%{?suse_version} -pushd $RPM_BUILD_ROOT/%{python_sitearch} -python %py_libdir/py_compile.py *.py -python -O %py_libdir/py_compile.py *.py -popd +%{__mkdir_p} %{buildroot}%{python_sitelib} +%{__install} python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py +%py_compile -O %{buildroot}/%{python_sitelib} +%if 0%{?build_py3} +%{__mkdir_p} %{buildroot}%{python3_sitelib} +%{__install} python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py +%py3_compile -O %{buildroot}/%{python3_sitelib} %endif +%if 0%{?build_py3} +%package -n python3-%{name} +Summary: Helper that makes writing ZYpp plugins in python easier +Group: System/Packages +Requires: python3 +BuildRequires: python3-devel + +%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 + +%package python +Summary: Helper that makes writing ZYpp plugins in python easier +# Actually libzypp(plugin) should be required. Unfortunately the corresponing +# provides was introduced to late for SUSE Manager/SLE-11-SP1. We do not want to +# enforce libzypp update to satisfy this, so the Requires should saty disabled, +# until libzypp on SUSE Manager/SLE-11-SP1 was updated and provides libzypp(plugin). +#Requires: libzypp(plugin) +Group: System/Packages +BuildRequires: python-devel +Requires: python + +%description 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. + %files python %defattr(-,root,root) %doc COPYING -%{py_sitearch}/* +%{python_sitelib}/* + +%if 0%{?build_py3} +%files -n python3-%{name} +%defattr(-,root,root) +%doc COPYING +%{python3_sitelib}/* +%endif %changelog