Hello community, here is the log from the commit of package zypp-plugin for openSUSE:Factory checked in at 2017-10-28 14:21:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypp-plugin (Old) and /work/SRC/openSUSE:Factory/.zypp-plugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zypp-plugin" Sat Oct 28 14:21:18 2017 rev:11 rq:536916 version:0.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/zypp-plugin/zypp-plugin.changes 2015-05-06 11:18:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zypp-plugin.new/zypp-plugin.changes 2017-10-28 14:21:18.628372163 +0200 @@ -1,0 +2,13 @@ +Thu Oct 26 17:14:59 CEST 2017 - m...@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 - m...@suse.de + +- Fix specfile to be able to build for python3 +- version 0.6 + +------------------------------------------------------------------- Old: ---- zypp-plugin-0.5.tar.bz2 New: ---- zypp-plugin-0.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypp-plugin.spec ++++++ --- /var/tmp/diff_new_pack.GSHjV0/_old 2017-10-28 14:21:19.084355492 +0200 +++ /var/tmp/diff_new_pack.GSHjV0/_new 2017-10-28 14:21:19.088355347 +0200 @@ -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 @@ 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 +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 ++++++ zypp-plugin-0.5.tar.bz2 -> zypp-plugin-0.6.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-plugin/package/zypp-plugin.changes new/zypp-plugin/package/zypp-plugin.changes --- old/zypp-plugin/package/zypp-plugin.changes 2015-04-28 16:34:26.000000000 +0200 +++ new/zypp-plugin/package/zypp-plugin.changes 2017-10-26 17:24:36.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Oct 26 17:14:59 CEST 2017 - m...@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 - m...@suse.de + +- Fix specfile to be able to build for python3 +- version 0.6 + +------------------------------------------------------------------- Tue Mar 10 17:18:59 CET 2015 - lchiqui...@suse.de - Add COPYING file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-plugin/package/zypp-plugin.spec new/zypp-plugin/package/zypp-plugin.spec --- old/zypp-plugin/package/zypp-plugin.spec 2015-04-28 16:34:26.000000000 +0200 +++ new/zypp-plugin/package/zypp-plugin.spec 2017-10-26 17:24:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package zypp-plugin # -# Copyright (c) 2011-2012 SUSE LINUX Products 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 @@ -11,55 +11,78 @@ # 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 http://bugs.opensuse.org/ # -Name: zypp-plugin -Version: 0.5 -Release: 0 -Group: System/Packages -License: GPL-2.0 -Url: https://gitorious.org/opensuse/zypp-plugin -Summary: Helper that makes writing ZYpp plugins easier -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 +%if 0%{?suse_version} >= 1320 +%global build_py3 1 +%endif -%{?!py_sitearch: %global py_sitearch %(python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(True)')} +Name: zypp-plugin +Version: 0.6.1 +Release: 0 +Url: https://gitorious.org/opensuse/zypp-plugin +Summary: Helper that makes writing ZYpp plugins easier +License: GPL-2.0 +Group: System/Packages +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: %{name}-%{version}.tar.bz2 +%if 0%{?suse_version} >= 1210 +BuildArch: noarch +%endif %description Empty main package. Helper for different languages reside in subpackages. -%package python -Group: System/Packages -License: GPL-2.0 -Summary: Helper that makes writing ZYpp plugins in python easier - -%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 +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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-plugin/python/zypp_plugin.py new/zypp-plugin/python/zypp_plugin.py --- old/zypp-plugin/python/zypp_plugin.py 2015-04-28 16:34:26.000000000 +0200 +++ new/zypp-plugin/python/zypp_plugin.py 2017-10-26 17:24:36.000000000 +0200 @@ -98,8 +98,8 @@ self.answer( "ERROR", headers, body ) def _DISCONNECT(self, headers, body): - sys.stdin.close() - self.ack( {'exit':'0'}, 'Disconnect' ) + sys.stdin.close() + self.ack( {'exit':'0'}, 'Disconnect' ) def current_frame(self): return self.framestack[len(self.framestack) - 1] @@ -109,12 +109,12 @@ if frame: self.state = "START" self.framestack = [] - try: - method = getattr(self, frame.command) - except: - self.answer( "_ENOMETHOD", { "Command":frame.command } ) - else: - method(frame.headers, frame.body) + try: + method = getattr(self, frame.command) + except: + self.answer( "_ENOMETHOD", { "Command":frame.command } ) + else: + method(frame.headers, frame.body) def main(self): for line in iter(sys.stdin.readline, ''): @@ -133,18 +133,18 @@ result = re.match("(\w+)\:\s*(.+)", line) if line == "": self.state = "BODY" - #print "wating for body" + #print( "wating for body" ) while 1: c = sys.stdin.read(1) if c == chr(0): - #print "got it" + #print( "got it" ) break else: - #print "no" + #print( "no" ) self.current_frame().body = self.current_frame().body + c self.__collect_frame() if ( sys.stdin.closed ): - break + break continue elif result: