From 1e2cacc308bc49049e21855b7852a3e9bc6f3ad664ef9727b0981d10254b620c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 25 Jun 2018 15:56:34 +0000 Subject: [PATCH 1/5] Accepting request 619005 from devel:languages:python:singlespec-staging Clean up SPEC file Upgrade to 0.3 ... just minor upgrades, py3k port OBS-URL: https://build.opensuse.org/request/show/619005 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-liblarch?expand=0&rev=8 --- liblarch-2.1.0.tar.gz | 3 --- python-liblarch.changes | 12 +++++++++ python-liblarch.spec | 56 ++++++++++++++++++++--------------------- v3.0.tar.gz | 3 +++ 4 files changed, 43 insertions(+), 31 deletions(-) delete mode 100644 liblarch-2.1.0.tar.gz create mode 100644 v3.0.tar.gz diff --git a/liblarch-2.1.0.tar.gz b/liblarch-2.1.0.tar.gz deleted file mode 100644 index ff665d2..0000000 --- a/liblarch-2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f55b8ce2c6350b614f46acf826c323b03bd64890288dd25b31cda3ccdb59d49b -size 26829 diff --git a/python-liblarch.changes b/python-liblarch.changes index a520f35..eb22f51 100644 --- a/python-liblarch.changes +++ b/python-liblarch.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 25 15:41:22 UTC 2018 - mcepl@suse.com + +- Clean up SPEC file +- Upgrade to 0.3 ... just minor upgrades, py3k port + +------------------------------------------------------------------- +Thu Aug 24 13:44:26 UTC 2017 - jmatejek@suse.com + +- singlespec auto-conversion + ------------------------------------------------------------------- Sat Jan 26 13:52:53 UTC 2013 - zaitor@opensuse.org @@ -25,3 +36,4 @@ Wed Feb 15 19:34:52 UTC 2012 - dimstar@opensuse.org - Initial package, version 0.1.0. + diff --git a/python-liblarch.spec b/python-liblarch.spec index 58553e8..1f79a54 100644 --- a/python-liblarch.spec +++ b/python-liblarch.spec @@ -1,7 +1,7 @@ # # spec file for package python-liblarch # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -17,30 +17,29 @@ # -Name: python-liblarch %define _name liblarch -Version: 2.1.0 +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +Name: python-liblarch +Version: 3.0 Release: 0 Summary: A python library to easily handle data structure -License: LGPL-3.0+ +License: LGPL-3.0-or-later Group: Development/Languages/Python -Url: https://live.gnome.org/liblarch -Source: http://gtg.fritalk.com/publique/gtg.fritalk.com/liblarch/2.1.0/%{_name}-%{version}.tar.gz +URL: https://live.gnome.org/liblarch +Source: https://github.com/getting-things-gnome/%{_name}/archive/v%{version}.tar.gz +BuildRequires: fdupes BuildRequires: python +BuildRequires: python-rpm-macros Requires: python-gobject2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{py_requires} -%else BuildArch: noarch -%endif +%python_subpackages %description -Liblarch is a python library built to easily handle data structure such are lists, trees and acyclic graphs -(tree where nodes can have multiple parents) +Liblarch is a python library built to easily handle data structure such +are lists, trees and acyclic graphs (tree where nodes can have multiple +parents) -%package -n python-liblarch_gtk +%package gtk %define _name_gtk liblarch_gtk Summary: GTK bindings for liblarch Group: Development/Languages/Python @@ -48,9 +47,10 @@ Requires: %{name} = %{version} Requires: python-gobject2 Requires: python-gtk -%description -n python-liblarch_gtk -Liblarch is a python library built to easily handle data structure such are lists, trees and acyclic graphs -(tree where nodes can have multiple parents) +%description gtk +Liblarch is a python library built to easily handle data structure such +are lists, trees and acyclic graphs (tree where nodes can have multiple +parents) This package provides GTK bindings for liblarch. @@ -58,20 +58,20 @@ This package provides GTK bindings for liblarch. %setup -q -n %{_name}-%{version} %build -python setup.py build +%python_build %install -python setup.py install --root %{buildroot} --prefix %{_prefix} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} -%files -%defattr(-,root,root) -%doc README LICENSE -%{python_sitelib}/%{_name}-%{version}-*.egg-info -%{python_sitelib}/%{_name}/ +%files %{python_files} +%license LICENSE +%doc README.md AUTHORS +%{python_sitelib}/%{_name} +%{python_sitelib}/%{_name}*.egg-info -%files -n python-liblarch_gtk -%defattr(-,root,root) -%doc README LICENSE +%files %{python_files gtk} +%license LICENSE %{python_sitelib}/%{_name_gtk}/ %changelog diff --git a/v3.0.tar.gz b/v3.0.tar.gz new file mode 100644 index 0000000..9a04198 --- /dev/null +++ b/v3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d8b337d7a71ea84387e90196b465f617649b59a1c8f0b0c49e6655987ac730c +size 55785 From ab66d92c1a7fc68afe8261fa9f48a707e816ad8f3fec52f20b4b6c503abb8b1e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 26 Jun 2018 19:16:53 +0000 Subject: [PATCH 2/5] Fix python-liblarch.changes OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-liblarch?expand=0&rev=9 --- python-liblarch.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-liblarch.changes b/python-liblarch.changes index eb22f51..7189668 100644 --- a/python-liblarch.changes +++ b/python-liblarch.changes @@ -2,7 +2,7 @@ Mon Jun 25 15:41:22 UTC 2018 - mcepl@suse.com - Clean up SPEC file -- Upgrade to 0.3 ... just minor upgrades, py3k port +- Upgrade to 3.0 ... just minor upgrades, py3k port ------------------------------------------------------------------- Thu Aug 24 13:44:26 UTC 2017 - jmatejek@suse.com From 0e47c8a55428241fe350861d3422b491bbb34d2511dfc2f5304f53ba921291d1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 28 Jun 2018 08:43:36 +0000 Subject: [PATCH 3/5] Fix BuildRequires OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-liblarch?expand=0&rev=10 --- python-liblarch.changes | 2 +- python-liblarch.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-liblarch.changes b/python-liblarch.changes index 7189668..ea20dd9 100644 --- a/python-liblarch.changes +++ b/python-liblarch.changes @@ -14,7 +14,7 @@ Sat Jan 26 13:52:53 UTC 2013 - zaitor@opensuse.org - Update to version 2.1.0: + Removed completely the "transparency" property. - + Added a new object : viewcount + + Added a new object : viewcount + The version number of liblarch will now be the API number + a number. - Added liblarch_gtk as a subpackage, it is no longer released as a diff --git a/python-liblarch.spec b/python-liblarch.spec index 1f79a54..d8f9041 100644 --- a/python-liblarch.spec +++ b/python-liblarch.spec @@ -27,8 +27,8 @@ License: LGPL-3.0-or-later Group: Development/Languages/Python URL: https://live.gnome.org/liblarch Source: https://github.com/getting-things-gnome/%{_name}/archive/v%{version}.tar.gz +BuildRequires: %{python_module nose} BuildRequires: fdupes -BuildRequires: python BuildRequires: python-rpm-macros Requires: python-gobject2 BuildArch: noarch From 9bf8259dcf0e28610a2d6ea6e34009ece098247571a5afd1b94c4af24ac40ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 28 Jul 2018 18:26:08 +0000 Subject: [PATCH 4/5] Accepting request 625954 from home:jengelh:branches:devel:languages:python - Trim bias from descriptions. OBS-URL: https://build.opensuse.org/request/show/625954 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-liblarch?expand=0&rev=11 --- python-liblarch.changes | 5 +++++ python-liblarch.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/python-liblarch.changes b/python-liblarch.changes index ea20dd9..232ad0d 100644 --- a/python-liblarch.changes +++ b/python-liblarch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 28 17:28:02 UTC 2018 - jengelh@inai.de + +- Trim bias from descriptions. + ------------------------------------------------------------------- Mon Jun 25 15:41:22 UTC 2018 - mcepl@suse.com diff --git a/python-liblarch.spec b/python-liblarch.spec index d8f9041..17c49eb 100644 --- a/python-liblarch.spec +++ b/python-liblarch.spec @@ -22,7 +22,7 @@ Name: python-liblarch Version: 3.0 Release: 0 -Summary: A python library to easily handle data structure +Summary: A Python library to handle data structure License: LGPL-3.0-or-later Group: Development/Languages/Python URL: https://live.gnome.org/liblarch @@ -35,7 +35,7 @@ BuildArch: noarch %python_subpackages %description -Liblarch is a python library built to easily handle data structure such +Liblarch is a Python library built to handle data structure such are lists, trees and acyclic graphs (tree where nodes can have multiple parents) @@ -48,7 +48,7 @@ Requires: python-gobject2 Requires: python-gtk %description gtk -Liblarch is a python library built to easily handle data structure such +Liblarch is a Python library built to handle data structure such are lists, trees and acyclic graphs (tree where nodes can have multiple parents) From 008e97047ff3aed73e1f6a9a73cff526150830017f4614f811ffa9bb422641bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 7 Aug 2018 09:21:03 +0000 Subject: [PATCH 5/5] - Reflect deps properly on what is needed - Add patch to work properly under py2: * libarch-py2compat.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-liblarch?expand=0&rev=12 --- libarch-py2compat.patch | 13 +++++++++++++ python-liblarch.changes | 7 +++++++ python-liblarch.spec | 18 ++++++++++++++---- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 libarch-py2compat.patch diff --git a/libarch-py2compat.patch b/libarch-py2compat.patch new file mode 100644 index 0000000..f8452ff --- /dev/null +++ b/libarch-py2compat.patch @@ -0,0 +1,13 @@ +Index: liblarch-3.0/liblarch/tree.py +=================================================================== +--- liblarch-3.0.orig/liblarch/tree.py ++++ liblarch-3.0/liblarch/tree.py +@@ -17,6 +17,8 @@ + # along with this program. If not, see . + # ----------------------------------------------------------------------------- + ++from __future__ import print_function ++ + from . import processqueue + from liblarch.treenode import _Node + diff --git a/python-liblarch.changes b/python-liblarch.changes index 232ad0d..1074db6 100644 --- a/python-liblarch.changes +++ b/python-liblarch.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 7 09:16:21 UTC 2018 - tchvatal@suse.com + +- Reflect deps properly on what is needed +- Add patch to work properly under py2: + * libarch-py2compat.patch + ------------------------------------------------------------------- Sat Jul 28 17:28:02 UTC 2018 - jengelh@inai.de diff --git a/python-liblarch.spec b/python-liblarch.spec index 17c49eb..e89dbb2 100644 --- a/python-liblarch.spec +++ b/python-liblarch.spec @@ -18,6 +18,7 @@ %define _name liblarch +%define _name_gtk liblarch_gtk %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-liblarch Version: 3.0 @@ -27,10 +28,15 @@ License: LGPL-3.0-or-later Group: Development/Languages/Python URL: https://live.gnome.org/liblarch Source: https://github.com/getting-things-gnome/%{_name}/archive/v%{version}.tar.gz +Patch0: libarch-py2compat.patch +BuildRequires: %{python_module gobject} BuildRequires: %{python_module nose} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-gobject2 +BuildRequires: xvfb-run +BuildRequires: typelib(Gtk) >= 3.0 +Requires: python-gobject BuildArch: noarch %python_subpackages @@ -40,12 +46,11 @@ are lists, trees and acyclic graphs (tree where nodes can have multiple parents) %package gtk -%define _name_gtk liblarch_gtk Summary: GTK bindings for liblarch Group: Development/Languages/Python Requires: %{name} = %{version} -Requires: python-gobject2 -Requires: python-gtk +Requires: python-gobject +Requires: typelib(Gtk) >= 3.0 %description gtk Liblarch is a Python library built to handle data structure such @@ -56,6 +61,7 @@ This package provides GTK bindings for liblarch. %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build %python_build @@ -64,6 +70,10 @@ This package provides GTK bindings for liblarch. %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +# TESTS fail with segf, local execution works +#%check +#%%python_expand xvfb-run nosetests-%{$python_bin_suffix} tests + %files %{python_files} %license LICENSE %doc README.md AUTHORS