[python-couchdb] Update to 0.9, Remove couchdb requirement (RHBZ#622899), Remove -devel package
Jonathan Steffan
jsteffan at fedoraproject.org
Thu Oct 17 16:16:22 UTC 2013
commit 3740a8dbb3e58c654ef4eba933fa25c158eb9c1a
Author: Jonathan Steffan <jsteffan at fedoraproject.org>
Date: Thu Oct 17 10:16:21 2013 -0600
Update to 0.9, Remove couchdb requirement (RHBZ#622899), Remove -devel package
.gitignore | 1 +
python-couchdb-0.9-shebang.patch | 48 ++++++++++++++++++++++++++++++++++++++
python-couchdb-shebang.patch | 48 --------------------------------------
python-couchdb.spec | 37 +++++++++++------------------
sources | 2 +-
5 files changed, 64 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0daed62..d7bd5bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
CouchDB-0.6.1.tar.gz
+/CouchDB-0.9.tar.gz
diff --git a/python-couchdb-0.9-shebang.patch b/python-couchdb-0.9-shebang.patch
new file mode 100644
index 0000000..561b20b
--- /dev/null
+++ b/python-couchdb-0.9-shebang.patch
@@ -0,0 +1,48 @@
+diff -up CouchDB-0.9/couchdb/http.py.orig CouchDB-0.9/couchdb/http.py
+--- CouchDB-0.9/couchdb/http.py.orig 2013-10-17 10:04:23.274160914 -0600
++++ CouchDB-0.9/couchdb/http.py 2013-10-17 10:05:23.804924893 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2009 Christopher Lenz
+diff -up CouchDB-0.9/couchdb/tests/couch_tests.py.orig CouchDB-0.9/couchdb/tests/couch_tests.py
+--- CouchDB-0.9/couchdb/tests/couch_tests.py.orig 2013-10-17 10:04:37.991098676 -0600
++++ CouchDB-0.9/couchdb/tests/couch_tests.py 2013-10-17 10:05:28.801905924 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2007-2008 Christopher Lenz
+diff -up CouchDB-0.9/couchdb/tools/dump.py.orig CouchDB-0.9/couchdb/tools/dump.py
+--- CouchDB-0.9/couchdb/tools/dump.py.orig 2013-10-17 10:04:57.793023458 -0600
++++ CouchDB-0.9/couchdb/tools/dump.py 2013-10-17 10:05:36.876875250 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2007-2009 Christopher Lenz
+diff -up CouchDB-0.9/couchdb/tools/load.py.orig CouchDB-0.9/couchdb/tools/load.py
+--- CouchDB-0.9/couchdb/tools/load.py.orig 2013-10-17 10:04:52.095045009 -0600
++++ CouchDB-0.9/couchdb/tools/load.py 2013-10-17 10:05:33.634887568 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2007-2009 Christopher Lenz
+diff -up CouchDB-0.9/couchdb/tools/replicate.py.orig CouchDB-0.9/couchdb/tools/replicate.py
+--- CouchDB-0.9/couchdb/tools/replicate.py.orig 2013-10-17 10:04:44.194074870 -0600
++++ CouchDB-0.9/couchdb/tools/replicate.py 2013-10-17 10:05:30.734898584 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright 2009 Maximillian Dornseif <md at hudora.de>
+diff -up CouchDB-0.9/couchdb/view.py.orig CouchDB-0.9/couchdb/view.py
+--- CouchDB-0.9/couchdb/view.py.orig 2013-10-17 10:04:30.313131149 -0600
++++ CouchDB-0.9/couchdb/view.py 2013-10-17 10:05:26.752913707 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2007-2008 Christopher Lenz
diff --git a/python-couchdb.spec b/python-couchdb.spec
index 9f69e7b..620906e 100644
--- a/python-couchdb.spec
+++ b/python-couchdb.spec
@@ -1,37 +1,29 @@
-# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define python_version %(%{__python} -c "import sys ; print sys.version[:3] ")
Name: python-couchdb
-Version: 0.6.1
-Release: 8%{?dist}
+Version: 0.9
+Release: 1%{?dist}
Summary: A Python library for working with CouchDB
Group: Development/Languages
License: BSD
URL: http://code.google.com/p/couchdb-python/
Source0: http://pypi.python.org/packages/source/C/CouchDB/CouchDB-%{version}.tar.gz
+Patch0: python-couchdb-0.9-shebang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: python-couchdb-shebang.patch
BuildArch: noarch
-BuildRequires: python-setuptools python-devel
-Requires: couchdb
-Requires: python-httplib2
-Requires: python-simplejson
+BuildRequires: python-setuptools, python-devel
+Obsoletes: python-couchdb-devel <= 0.6.1
-%package devel
-Summary: The API reference files for CouchDB
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+%if 0%{?el5}
+Requires: python-simplejson
+%endif
%description
Providing a convenient high level interface for the CouchDB server.
-%description devel
-CouchDB python binding API reference documentation for use in development.
-
%prep
%setup -q -n CouchDB-%{version}
@@ -46,9 +38,6 @@ CouchDB python binding API reference documentation for use in development.
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-# calm rpmlint down
-find $RPM_BUILD_ROOT/%{python_sitelib}/couchdb -name \*.py -print0 | xargs --null chmod 0644
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -61,14 +50,16 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/couchdb-load
%{_bindir}/couchdb-replicate
%{_bindir}/couchpy
-%{python_sitelib}/CouchDB-%{version}-py%{python_version}.egg-info
%{python_sitelib}/couchdb
+%{python_sitelib}/CouchDB*
-%files devel
-%defattr(-,root,root,-)
-%doc doc/api doc/index.html
%changelog
+* Thu Oct 17 2013 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9-1
+- Update to 0.9
+- Remove couchdb requirement (RHBZ#622899)
+- Remove -devel package
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index bb5fb07..85305da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5f11977d8c7e26d8dbc9c5f56a9bf6b CouchDB-0.6.1.tar.gz
+67afd226fed4c641eeb13a9930d334f7 CouchDB-0.9.tar.gz
More information about the scm-commits
mailing list