[python-httplib2: 7/7] Update to 0.7.4 for fedora

[Ding-Yi Chen]

commit 1f71ea273a4a390df718e6756e74d6518aee18f1
Merge: e44d0fe 5c28c21
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Jun 1 11:02:06 2012 +1000

    Update to 0.7.4 for fedora
    
    Merge branch 'el6'
    
    Conflicts:
    	.gitignore
    	python-httplib2.spec
    	sources

 .gitignore                        |    5 ++++-
 python-httplib2.certfile.patch    |   16 ++++++++++++++++
 python-httplib2.getCertHost.patch |   21 +++++++++++++++++++++
 python-httplib2.spec              |   35 ++++++++++++++++++++++++++++-------
 sources                           |    2 +-
 5 files changed, 70 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index e35bc63,a3de500..b8d3816
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,4 @@@
- httplib2-0.6.0.tar.gz
+ httplib2-0.4.0.tar.gz
+ /httplib2-0.7.2.tar.gz
+ /httplib2-0.7.4.tar.gz
++
diff --cc python-httplib2.spec
index 0dfaac9,20b0cd5..d60b918
--- a/python-httplib2.spec
+++ b/python-httplib2.spec
@@@ -1,55 -1,35 +1,61 @@@
 +%global with_python3 1
 +
  %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 +
  Name:           python-httplib2
- Version:        0.6.0
- Release:        6%{?dist}
+ Version:        0.7.4
 -Release:        1%{?dist}
++Release:        2%{?dist}
  Summary:        A comprehensive HTTP client library
 -
  Group:          System Environment/Libraries
  License:        MIT
  URL:            http://code.google.com/p/httplib2/
  Source0:        http://httplib2.googlecode.com/files/httplib2-%{version}.tar.gz
+ #Patch0:         httplib_py26.diff
+ Patch1:         %{name}.certfile.patch
+ Patch2:         %{name}.getCertHost.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 +BuildRequires:  python-setuptools-devel
 +BuildRequires:  python-devel
 +BuildArch:      noarch
  
 -BuildRequires: python-setuptools-devel
 -BuildRequires: python-devel
 -BuildArch: noarch
 +%if 0%{?with_python3}
 +BuildRequires:  python3-devel
 +%endif # if with_python3
  
  %description
  A comprehensive HTTP client library that supports many features left out of
  other HTTP libraries.
  
 +%if 0%{?with_python3}
 +%package -n python3-httplib2
 +Summary:        A comprehensive HTTP client library
 +Group:          System Environment/Libraries
 +
 +%description -n python3-httplib2
 +A comprehensive HTTP client library that supports many features left out of
 +other HTTP libraries.
 +%endif # with_python3
 +
  %prep
  %setup -q -n httplib2-%{version}
+ #%patch0 -p0 -b .issue39
+ %patch1 -p0 -b .certfile
+ %patch2 -p0 -b .getCertHost
  
 +%if 0%{?with_python3}
 +rm -rf %{py3dir}
 +cp -a . %{py3dir}
 +find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!/usr/bin/python|#!%{__python3}|'
 +%endif # with_python3
 +
  %build
- %{__python} setup.py build
 -CFLAGS="$RPM_OPT_FLAGS" python setup.py build
++CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
  
 +%if 0%{?with_python3}
 +pushd %{py3dir}
 +%{__python3} setup.py build
 +popd
 +%endif # with_python3
  
  %install
  rm -rf $RPM_BUILD_ROOT
@@@ -69,17 -43,21 +75,34 @@@ rm -rf $RPM_BUILD_ROO
  %doc README
  %{python_sitelib}/*
  
 +%if 0%{?with_python3}
 +%files -n python3-httplib2
 +%defattr(-,root,root,-)
 +%doc README
 +%{python3_sitelib}/*
 +%endif # with_python3
 +
  %changelog
++* Fri Jun 01 2012 Ding-Yi Chen <dchen at redhat.com> - 0.7.4-2
++- Upstream update for Fedora
++
+ * Thu May 03 2012 Ding-Yi Chen <dchen at redhat.com> - 0.7.4-1
+ - Upstream update to 0.7.4
+ - Applied patch suggested in issue 208
+ 
+ * Fri Feb 24 2012 Ding-Yi Chen <dchen at redhat.com> - 0.7.2-1
+ - Upstream update to 0.7.2
+   Which may fixed http://code.google.com/p/httplib2/issues/detail?id=62
+   Note this version uses fedora's cert file bundle instead of httplib2
+   default.
+ 
 +* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
+ * Fri Jul 29 2011 Ding-Yi Chen <dchen at redhat.com>  - 0.4.0-5.el6
+ - Apply that address python-httplib2 (GoogleCode Hosted) issue 39
+   http://code.google.com/p/httplib2/issues/detail?id=39
+ 
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild