From c4aba4f5a457836ac6c8ff9a7ac1d9c397a4b83d341f8740f1ec4bdc43285b4a Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Tue, 3 May 2016 12:33:33 +0000
Subject: [PATCH 1/5] Update to last successful build

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=14
---
 zypp-plugin.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zypp-plugin.spec b/zypp-plugin.spec
index b80425d..10a2fb5 100644
--- a/zypp-plugin.spec
+++ b/zypp-plugin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package zypp-plugin
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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

From 7c0898aebd34d73f5f08b1a23e5a1249853147c95462842b683589919074780c Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 26 Oct 2017 10:00:18 +0000
Subject: [PATCH 2/5] Update to last successful build 
 3016a43c84ba7d02444274f367b5e4279b1c41c0 python3 save indentation

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=15
---
 zypp-plugin-0.5.tar.bz2 | 4 ++--
 zypp-plugin.spec        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zypp-plugin-0.5.tar.bz2 b/zypp-plugin-0.5.tar.bz2
index 7b24282..50aee3e 100644
--- a/zypp-plugin-0.5.tar.bz2
+++ b/zypp-plugin-0.5.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ee902e0ee3a585055ded861d2220a36b4c029d188ff635d56f8d926bea387c0
-size 4189
+oid sha256:ed188e6d343bbddffe283f801d558ef3fb6fe589646f2645968ecae34bae3bc8
+size 4186
diff --git a/zypp-plugin.spec b/zypp-plugin.spec
index 10a2fb5..4de330e 100644
--- a/zypp-plugin.spec
+++ b/zypp-plugin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package zypp-plugin
 #
-# Copyright (c) 2016 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

From 18b0429cebd1fa406f1ed5b4f65715bfff20bd2ea89f0e8778c77698ac7c782a Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 26 Oct 2017 11:02:48 +0000
Subject: [PATCH 3/5] 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

From 0d44c6293a9ad8739025f6d73d5bce123ccb2451cc68099a3bcd534c59dbe552 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 26 Oct 2017 15:20:09 +0000
Subject: [PATCH 4/5] Update to last successful build 
 a45b614e348a3cdfa467873e2a6b6d627c331570 changes 0.6.1

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=17
---
 zypp-plugin-0.6.1.tar.bz2 | 3 +++
 zypp-plugin-0.6.tar.bz2   | 3 ---
 zypp-plugin.changes       | 7 +++++++
 zypp-plugin.spec          | 8 ++------
 4 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 zypp-plugin-0.6.1.tar.bz2
 delete mode 100644 zypp-plugin-0.6.tar.bz2

diff --git a/zypp-plugin-0.6.1.tar.bz2 b/zypp-plugin-0.6.1.tar.bz2
new file mode 100644
index 0000000..06be91a
--- /dev/null
+++ b/zypp-plugin-0.6.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c250a7058437e53bbafc5f516d3ecef852f282690c119097d65d55c64423ecf
+size 4227
diff --git a/zypp-plugin-0.6.tar.bz2 b/zypp-plugin-0.6.tar.bz2
deleted file mode 100644
index 3bf4f86..0000000
--- a/zypp-plugin-0.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c7d4957b72e23bb1c3b1a70f3bfb21b80d90106494e2d74300098b6ce3211fc
-size 4323
diff --git a/zypp-plugin.changes b/zypp-plugin.changes
index 267c766..036d110 100644
--- a/zypp-plugin.changes
+++ b/zypp-plugin.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
 
diff --git a/zypp-plugin.spec b/zypp-plugin.spec
index e10646a..8fdf734 100644
--- a/zypp-plugin.spec
+++ b/zypp-plugin.spec
@@ -21,7 +21,7 @@
 %endif
 
 Name:           zypp-plugin
-Version:        0.6
+Version:        0.6.1
 Release:        0
 Url:            https://gitorious.org/opensuse/zypp-plugin
 Summary:        Helper that makes writing ZYpp plugins easier
@@ -65,12 +65,8 @@ and implementing the commands you want to respond to as python methods.
 
 %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
+Provides:       python2-%{name}
 BuildRequires:  python-devel
 Requires:       python
 

From 991acbf4dca30f8676b58276991c92b69e977d1b0d21b5a1f86da2e2827362a8 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 26 Oct 2017 15:25:01 +0000
Subject: [PATCH 5/5] Update to last successful build 
 5c19b05d9ff94a4b8e36308eb334e24d09cb2aae typo

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=18
---
 zypp-plugin-0.6.1.tar.bz2 | 4 ++--
 zypp-plugin.changes       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zypp-plugin-0.6.1.tar.bz2 b/zypp-plugin-0.6.1.tar.bz2
index 06be91a..59609cb 100644
--- a/zypp-plugin-0.6.1.tar.bz2
+++ b/zypp-plugin-0.6.1.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c250a7058437e53bbafc5f516d3ecef852f282690c119097d65d55c64423ecf
-size 4227
+oid sha256:3415652bcf5d73e49bd54fd41563083430b0732303078888a020ba5927f0b8c1
+size 4220
diff --git a/zypp-plugin.changes b/zypp-plugin.changes
index 036d110..154ae0c 100644
--- a/zypp-plugin.changes
+++ b/zypp-plugin.changes
@@ -2,7 +2,7 @@
 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.
+  consistent with python3-zypp-plugin.
 - version 0.6.1
 
 -------------------------------------------------------------------