[python-rest-client/f17] fix for Conflicting file/module name with python-twitter (785023)

[Matthias Runge]

commit cd93294f330506aff985ba115b2959c6f71ff9cf
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Fri Mar 9 23:56:53 2012 +0100

    fix for Conflicting file/module name with python-twitter (785023)

 .gitignore              |    1 +
 python-rest-client.spec |   22 ++++++++++++++--------
 sources                 |    2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2dd18cb..cfb32fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /python-rest-client-0.3.tar.gz
+/python-rest-client-f8985f0edc.tar.gz
diff --git a/python-rest-client.spec b/python-rest-client.spec
index 34bd921..f4e4006 100644
--- a/python-rest-client.spec
+++ b/python-rest-client.spec
@@ -1,12 +1,14 @@
 Name:           python-rest-client
 Version:        0.3
-Release:        1%{?dist}
+Release:        2gitf898f0%{?dist}
 Summary:        A REST Client for use in python, using httplib2 and urllib2
 
 License:        GPLv3
 URL:            http://code.google.com/p/python-rest-client/
-Source0:        http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-#md5=ef58ada2245fc30086bd8b389232f8ce
+# rebase to reworked version on github
+# wget -O python-rest-client-f8985f0edc.tar.gz  \
+#      https://github.com/WiserTogether/python-rest-client/tarball/f8985f0edc
+Source0:        python-rest-client-f8985f0edc.tar.gz 
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools
@@ -20,13 +22,12 @@ environment.
 
 
 %prep
-%setup -q
+# checkout from github under username-{project-name}-hash
+%setup -q -n WiserTogether-python-rest-client-f8985f0
 
-# remove bundled httplib2 
-rm -rf src/httplib2
 
 # strip bang-path from microblog_exceptions.py
-sed -i '/^#!\/usr\/bin\/env python$/d' src/microblog_exceptions.py
+sed -i '/^#!\/usr\/bin\/env python$/d' python_rest_client/microblog_exceptions.py
 
 
 %build
@@ -35,13 +36,18 @@ sed -i '/^#!\/usr\/bin\/env python$/d' src/microblog_exceptions.py
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
  
 %files
-%doc PKG-INFO
+%doc README.rst
 %{python_sitelib}/*
 
 %changelog
+* Wed Feb 29 2012 Matthias Runge <mrunge at matthias-runge.de> - 0.3-2gitf898f0
+- fix Conflicting file/module name with python-twitter 
+- rebase to upstream on gihub
+
 * Wed Jan 04 2012 Matthias Runge <mrunge at matthias-runge.de> - 0.3-1
 - initial fedora packaging
diff --git a/sources b/sources
index c0e193a..0cce68a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef58ada2245fc30086bd8b389232f8ce  python-rest-client-0.3.tar.gz
+8bab1b8cc25309416cebf176b1862a23  python-rest-client-f8985f0edc.tar.gz