From a198c1fc190a922d76f35a327fbd4cc064b2d80b58f07f350484b48d874f3dff Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 24 Apr 2017 16:29:37 +0000 Subject: [PATCH 1/4] Accepting request 487790 from home:alois:branches:devel:languages:python 2nd attempt OBS-URL: https://build.opensuse.org/request/show/487790 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyxdg?expand=0&rev=4 --- python-pyxdg.changes | 6 ++++++ python-pyxdg.spec | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/python-pyxdg.changes b/python-pyxdg.changes index 095b59b..52bd35c 100644 --- a/python-pyxdg.changes +++ b/python-pyxdg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 13 09:16:00 UTC 2017 - aloisio@gmx.com + +- Converted to single-spec +- Updated source URL + ------------------------------------------------------------------- Thu Oct 22 09:16:26 UTC 2015 - toddrme2178@gmail.com diff --git a/python-pyxdg.spec b/python-pyxdg.spec index 175a0ec..f38970b 100644 --- a/python-pyxdg.spec +++ b/python-pyxdg.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyxdg # -# 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,6 +16,7 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyxdg Version: 0.25 Release: 0 @@ -23,22 +24,20 @@ Summary: Implementations of freedesktop.org standards in python License: LGPL-2.1 Group: Development/Languages/Python Url: http://freedesktop.org/wiki/Software/pyxdg -Source: https://pypi.python.org/packages/source/p/pyxdg/pyxdg-%{version}.tar.gz +Source: https://files.python.org/packages/source/p/pyxdg/pyxdg-%{version}.tar.gz Source1: http://people.freedesktop.org/~takluyver/pyxdg-%{version}.tar.gz.asc Source2: %{name}.keyring +BuildRequires: %{python_module devel} +BuildRequires: %{python_module nose} BuildRequires: hicolor-icon-theme -BuildRequires: python-devel -BuildRequires: python-nose +BuildRequires: python-rpm-macros BuildRequires: shared-mime-info Requires: shared-mime-info BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif Provides: python-xdg = %{version} Obsoletes: python-xdg <= %{version} +%python_subpackages %description PyXDG is a python library to access freedesktop.org standards. Currently supported are: @@ -53,19 +52,20 @@ PyXDG is a python library to access freedesktop.org standards. Currently support %setup -q -n pyxdg-%{version} %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install -%if 0%{?suse_version} && 0%{?suse_version} >= 1320 +%if 0%{?sle_version} > 120100 || 0%{?suse_version} > 1320 %check -nosetests +%python_expand nosetests-%{$python_bin_suffix} %endif -%files +%files %{python_files} %defattr(-,root,root,-) %doc README AUTHORS COPYING ChangeLog -%{python_sitelib}/* +%{python_sitelib}/xdg +%{python_sitelib}/pyxdg-%{version}-py%{python_version}.egg-info %changelog From c3fb7f790a09bc262ef3e0cf98194276ec1e7bdc0540d1697a7e74febf5f962e Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 24 Apr 2017 17:36:28 +0000 Subject: [PATCH 2/4] Accepting request 490831 from home:TheBlackCat:branches:devel:languages:python - Fix source URL - Various small spec file cleanups. OBS-URL: https://build.opensuse.org/request/show/490831 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyxdg?expand=0&rev=5 --- python-pyxdg.changes | 6 ++++++ python-pyxdg.spec | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/python-pyxdg.changes b/python-pyxdg.changes index 52bd35c..a8e5ae8 100644 --- a/python-pyxdg.changes +++ b/python-pyxdg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 24 17:35:04 UTC 2017 - toddrme2178@gmail.com + +- Fix source url +- Various small spec file cleanups. + ------------------------------------------------------------------- Thu Apr 13 09:16:00 UTC 2017 - aloisio@gmx.com diff --git a/python-pyxdg.spec b/python-pyxdg.spec index f38970b..f0cd66c 100644 --- a/python-pyxdg.spec +++ b/python-pyxdg.spec @@ -16,6 +16,12 @@ # +%if 0%{?sle_version} > 120100 || 0%{?suse_version} > 1320 +%bcond_without tests +%else +%bcond_with tests +%endif + %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyxdg Version: 0.25 @@ -24,11 +30,13 @@ Summary: Implementations of freedesktop.org standards in python License: LGPL-2.1 Group: Development/Languages/Python Url: http://freedesktop.org/wiki/Software/pyxdg -Source: https://files.python.org/packages/source/p/pyxdg/pyxdg-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/pyxdg/pyxdg-%{version}.tar.gz Source1: http://people.freedesktop.org/~takluyver/pyxdg-%{version}.tar.gz.asc Source2: %{name}.keyring BuildRequires: %{python_module devel} +%if %{with tests} BuildRequires: %{python_module nose} +%endif BuildRequires: hicolor-icon-theme BuildRequires: python-rpm-macros BuildRequires: shared-mime-info @@ -57,7 +65,7 @@ PyXDG is a python library to access freedesktop.org standards. Currently support %install %python_install -%if 0%{?sle_version} > 120100 || 0%{?suse_version} > 1320 +%if %{with tests} %check %python_expand nosetests-%{$python_bin_suffix} %endif @@ -66,6 +74,6 @@ PyXDG is a python library to access freedesktop.org standards. Currently support %defattr(-,root,root,-) %doc README AUTHORS COPYING ChangeLog %{python_sitelib}/xdg -%{python_sitelib}/pyxdg-%{version}-py%{python_version}.egg-info +%{python_sitelib}/pyxdg-%{version}-py*.egg-info %changelog From 984536dbfb99bdacbd0f398df0e701dfd6a5d08a46e404170c3bd09554cadc03 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 1 May 2017 19:10:46 +0000 Subject: [PATCH 3/4] Accepting request 492346 from home:TheBlackCat:branches:devel:languages:python Add literal python-xdg provides OBS-URL: https://build.opensuse.org/request/show/492346 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyxdg?expand=0&rev=6 --- python-pyxdg.changes | 5 +++++ python-pyxdg.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/python-pyxdg.changes b/python-pyxdg.changes index a8e5ae8..ee893fe 100644 --- a/python-pyxdg.changes +++ b/python-pyxdg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 1 18:49:28 UTC 2017 - toddrme2178@gmail.com + +- Add literal python-xdg provides. + ------------------------------------------------------------------- Mon Apr 24 17:35:04 UTC 2017 - toddrme2178@gmail.com diff --git a/python-pyxdg.spec b/python-pyxdg.spec index f0cd66c..8662261 100644 --- a/python-pyxdg.spec +++ b/python-pyxdg.spec @@ -23,6 +23,7 @@ %endif %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-pyxdg Version: 0.25 Release: 0 @@ -43,8 +44,13 @@ BuildRequires: shared-mime-info Requires: shared-mime-info BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +# Change <= to < after version 0.25 Provides: python-xdg = %{version} Obsoletes: python-xdg <= %{version} +%ifpython2 +Obsoletes: %{oldpython}-xdg < %{version} +Provides: %{oldpython}-xdg <= %{version} +%endif %python_subpackages %description From d7f50ce6f1e7d80a60a6909cf096f79557747a4a09bcdb543a68466dcd4b68d7 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 5 May 2017 21:49:29 +0000 Subject: [PATCH 4/4] Accepting request 493089 from home:TheBlackCat:branches:devel:languages:python - Don't provide python2-xdg. Singlespec packages should use the correct name. OBS-URL: https://build.opensuse.org/request/show/493089 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyxdg?expand=0&rev=7 --- python-pyxdg.changes | 6 ++++++ python-pyxdg.spec | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/python-pyxdg.changes b/python-pyxdg.changes index ee893fe..d15014d 100644 --- a/python-pyxdg.changes +++ b/python-pyxdg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 5 21:47:54 UTC 2017 - toddrme2178@gmail.com + +- Don't provide python2-xdg. Singlespec packages should use the + correct name. + ------------------------------------------------------------------- Mon May 1 18:49:28 UTC 2017 - toddrme2178@gmail.com diff --git a/python-pyxdg.spec b/python-pyxdg.spec index 8662261..fd9177b 100644 --- a/python-pyxdg.spec +++ b/python-pyxdg.spec @@ -45,12 +45,14 @@ Requires: shared-mime-info BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Change <= to < after version 0.25 -Provides: python-xdg = %{version} -Obsoletes: python-xdg <= %{version} %ifpython2 Obsoletes: %{oldpython}-xdg < %{version} Provides: %{oldpython}-xdg <= %{version} %endif +%ifpython3 +Provides: python3-xdg = %{version} +Obsoletes: python3-xdg <= %{version} +%endif %python_subpackages %description