[ctemplate/epel7: 2/2] Merge remote-tracking branch 'origin/f21' into epel7

[Christopher Meng]

commit 76bed00488b94542166a1824c1b9c158c7d8e69c
Merge: 31a9383 f42e947
Author: Christopher Meng <i at cicku.me>
Date:   Tue Jul 29 13:51:45 2014 +0800

    Merge remote-tracking branch 'origin/f21' into epel7
    
    Conflicts:
    	ctemplate.spec

 ctemplate.spec |  113 +++++++++++++++++++------------------------------------
 1 files changed, 39 insertions(+), 74 deletions(-)
---
diff --cc ctemplate.spec
index 68c1326,ebbae1d..43127ff
--- a/ctemplate.spec
+++ b/ctemplate.spec
@@@ -1,13 -1,22 +1,22 @@@
  Name:           ctemplate
- Version:        2.2
- Release:        3%{?dist}
+ Version:        2.3
 -Release:        2%{?dist}
++Release:        1%{?dist}
  Summary:        A simple but powerful template language for C++
- 
- Group:          Development/Tools
  License:        BSD
- URL:            http://code.google.com/p/google-ctemplate/
- Source0:        http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz
- BuildRequires:  chrpath, python
+ URL:            http://code.google.com/p/ctemplate
+ # Google Code no longer provides downloads for projects, upstream 
+ # refuses to use Google Drive, they ask users to fetch from svn repository
+ # by themselves.
+ # 
+ # Following tarball generated by:
+ # svn checkout http://ctemplate.googlecode.com/svn/tags/ctemplate-%{version}/ ctemplate-%{version}
+ # tar zcf ctemplate-%{version}.tar.gz ctemplate-%{version}/ --exclude=.*
+ # 
+ # Original tarball link:
+ # Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
+ Source0:        %{name}-%{version}.tar.gz
+ BuildRequires:  chrpath
+ BuildRequires:  python
  
  %description
  CTemplate is a simple but powerful template language for C++. It
@@@ -78,8 -79,19 +79,16 @@@ make chec
  %{_libdir}/pkgconfig/libctemplate.pc
  %{_libdir}/pkgconfig/libctemplate_nothreads.pc
  
- 
  %changelog
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
+ * Tue Apr 08 2014 Christopher Meng <rpm at cicku.me> - 2.3-1
+ - Update to 2.3
+ 
+ * Thu Aug 08 2013 Christopher Meng <rpm at cicku.me> - 2.2-5
+ - SPEC cleanup.
+ 
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
  
@@@ -95,47 -107,47 +104,3 @@@
  * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
  
--* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97-2
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
--
--* Wed May 05 2010 Rakesh Pandit <rakesh at fedoraproject.org> - 0.97-1
--- Updated to 0.97
--
--* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.96-1
--- Updated to 0.96
--
--* Tue Sep 01 2009 Dennis Gilmore <dennis at ausil.us> - 0.95-2
--- make sure that the namespace is ctemplate not google
--
--* Wed Aug 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.95-1
--- Updated to ctemplate
--
--* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.93-3
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--
--* Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.93-2
--- Added python as BuildRequires, and bswap patch for ppc
--
--* Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.93-1
--- Updated to 0.93, removed patch for consts - fixed upstream
--
--* Tue Mar 03 2009 Caolán McNamara <caolanm at redhat.com> - 0.91-5
--- fix up consts to build
--
--* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-4
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
--
--* Tue Sep 23 2008 Dennis Gilmore <dennis at ausil.us> - 0.91-3
--- clean up headers so that they include each other as intended
--
--* Wed Sep 03 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-2
--- Added %%check section to run tests
--
--* Sun Aug 24 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.91-1
--- Update to 0.91 & removed missing header files patch
--
--* Fri Aug 22 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.90-2
--- fix undefined-non-weak-symbol & rpath issue
--
--* Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.90-1
---Initial build