From 13ac94f9d9a9fe445eb1c95dd282591f097dbda1b50b0e46b35297ee56df9ed9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 7 Feb 2012 13:46:41 +0000 Subject: [PATCH] Accepting request 102803 from devel:languages:python Merge changes in devel prj. The decline reason from SR 101366 has been addressed. OBS-URL: https://build.opensuse.org/request/show/102803 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-configobj?expand=0&rev=7 --- configobj-4.7.2.tar.gz | 3 ++ configobj-4.7.2.zip | 3 -- python-configobj.changes | 30 ++++++++++++++ python-configobj.spec | 88 ++++++++++++++++------------------------ 4 files changed, 68 insertions(+), 56 deletions(-) create mode 100644 configobj-4.7.2.tar.gz delete mode 100644 configobj-4.7.2.zip diff --git a/configobj-4.7.2.tar.gz b/configobj-4.7.2.tar.gz new file mode 100644 index 0000000..e4a4936 --- /dev/null +++ b/configobj-4.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:515ff923462592e8321df8b48c47e3428f8d406ee22b8de77bef969d1af11171 +size 32318 diff --git a/configobj-4.7.2.zip b/configobj-4.7.2.zip deleted file mode 100644 index 4248b3c..0000000 --- a/configobj-4.7.2.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:332a0d20d4d736d521d95cb2cf069b1ac7c858985207db4296f4050396558c49 -size 143618 diff --git a/python-configobj.changes b/python-configobj.changes index 11fe60e..695c198 100644 --- a/python-configobj.changes +++ b/python-configobj.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Sun Feb 5 19:40:33 UTC 2012 - dimstar@opensuse.org + +- Really make the obsoletes sane: The package was called + python-configobj-docs before, so that's what we need to obsolete + (not -doc). +- The Obsoletes tag is for <= %{version}, as the package existed in + version 4.7.2, which is also when it was merged back. Obsoleting + only < 4.7.2 would cause conflicts when installing the newly + merged package. + +------------------------------------------------------------------- +Tue Jan 24 13:50:32 UTC 2012 - bwiedemann@suse.com + +- fix Obsoletes + +------------------------------------------------------------------- +Fri Dec 9 12:39:05 UTC 2011 - saschpe@suse.de + +- Spec file cleanup: + * Use upstream tarball + * Obsoleted empty doc package + * Fix SLE-11 build + * Use upstream description + +------------------------------------------------------------------- +Thu Dec 8 13:54:30 UTC 2011 - coolo@suse.com + +- fix license to be in spdx.org format + ------------------------------------------------------------------- Mon Sep 13 22:07:25 CEST 2010 - dimstar@opensuse.org diff --git a/python-configobj.spec b/python-configobj.spec index f1bf7cd..8504f3b 100644 --- a/python-configobj.spec +++ b/python-configobj.spec @@ -1,7 +1,7 @@ # -# spec file for package python-configobj (Version 4.7.2) +# spec file for package python-configobj # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,74 +15,56 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: python-configobj -BuildRequires: python-devel unzip -Summary: ConfigObj is a simple but powerful config file reader and writer Version: 4.7.2 -Release: 1 -License: BSD -Group: Development/Libraries/Python -Source: http://configobj.googlecode.com/files/configobj-%{version}.zip +Release: 0 +# FIXME: Change python-cofigobj-docs Obsoletes to < with next version update. Obsoletes introduced with version 4.7.2. Url: http://www.voidspace.org.uk/python/configobj.html +Summary: Config file reading, writing and validation +License: BSD-2-Clause +Group: Development/Languages/Python +Source: http://pypi.python.org/packages/source/c/configobj/configobj-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1120 +BuildRequires: python-devel +# There are no real docs! +Provides: python-configobj-docs = %{version} +Obsoletes: python-configobj-docs <= %{version} +%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 -%{py_requires} %description -ConfigObj is a simple but powerful config file reader and writer: an ini file -round tripper. Its main feature is that it is very easy to use, with a +ConfigObj is a simple but powerful config file reader and writer: an ini +file round tripper. Its main feature is that it is very easy to use, with a straightforward programmer's interface and a simple syntax for config files. +It has lots of other features though: -It has lots of other features though : -* Nested sections (subsections), to any level -* List values -* Multiple line values -* String interpolation (substitution) -* Integrated with a powerful validation system - including automatic type checking/conversion, repeated sections, - and allowing default values -* All comments in the file are preserved -* The order of keys/sections is preserved -* No external dependencies -* Full Unicode support -* A powerful unrepr mode for storing basic datatypes - -%package docs -License: BSD -Summary: ConfigObj Documentation -Group: Development/Libraries/Python -Requires: %{name} = %{version} - -%description docs -Documentation for the ConfigObj Python library, see - %{_docdir}/%{name}/ + * Nested sections (subsections), to any level + * List values + * Multiple line values + * Full Unicode support + * String interpolation (substitution) + * Integrated with a powerful validation system + - including automatic type checking/conversion + - and allowing default values + - repeated sections + * All comments in the file are preserved + * The order of keys/sections is preserved + * Powerful ``unrepr`` mode for storing/retrieving Python data-types %prep %setup -q -n configobj-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS" -%__python setup.py build +python setup.py build %install -%__python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%__install -d "%{buildroot}%{_docdir}/%{name}" -%__cp -r docs/* "%{buildroot}%{_docdir}/%{name}/" - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - -%files -f INSTALLED_FILES -%defattr(-,root,root) - -%files docs -%defattr(-,root,root) -%doc %{_docdir}/%{name} +%files +%defattr(-,root,root,-) +%{python_sitelib}/* %changelog