Accepting request 536916 from zypp:Head

Softwarestack update

OBS-URL: https://build.opensuse.org/request/show/536916
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zypp-plugin?expand=0&rev=11

zypp-plugin-0.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ee902e0ee3a585055ded861d2220a36b4c029d188ff635d56f8d926bea387c0
-size 4189

zypp-plugin-0.6.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3415652bcf5d73e49bd54fd41563083430b0732303078888a020ba5927f0b8c1
+size 4220

zypp-plugin.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+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
 

zypp-plugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package zypp-plugin
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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
@@ -16,8 +16,12 @@
 #
 
 
+%if 0%{?suse_version} >= 1320
+%global build_py3 1
+%endif
+
 Name:           zypp-plugin
-Version:        0.5
+Version:        0.6.1
 Release:        0
 Url:            https://gitorious.org/opensuse/zypp-plugin
 Summary:        Helper that makes writing ZYpp plugins easier
@@ -25,46 +29,61 @@ License:        GPL-2.0
 Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
-
+%if 0%{?suse_version} >= 1210
-# Actually libzypp(plugin) should be required. Unfortunately the corresponing
+BuildArch:      noarch
-# provides was introduced to late for SUSE Manager/SLE-11-SP1. We do not want to
+%endif
-# 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)')}
 
 %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}
+%{__mkdir_p} %{buildroot}%{python_sitelib}
-%{__install} python/zypp_plugin.py %{buildroot}%{py_sitearch}/zypp_plugin.py
+%{__install} python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py
-%if 0%{?suse_version}
+%py_compile -O %{buildroot}/%{python_sitelib}
-pushd $RPM_BUILD_ROOT/%{python_sitearch}
+%if 0%{?build_py3}
-python %py_libdir/py_compile.py *.py
+%{__mkdir_p} %{buildroot}%{python3_sitelib}
-python -O %py_libdir/py_compile.py *.py
+%{__install} python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py
-popd
+%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
+Group:          System/Packages
+Provides:       python2-%{name}
+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