[ctemplate] Update to 2.2. Fix FTBFS since F-14

[Peter Robinson]

commit beaa28cc021ffb9d3b0d99d16cd0a0f4501f9c69
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Apr 29 18:17:32 2012 +0100

    Update to 2.2. Fix FTBFS since F-14

 .gitignore                  |    3 ++-
 ctemplate-0.93.consts.patch |   12 ------------
 ctemplate.spec              |   27 ++++++++++-----------------
 sources                     |    2 +-
 4 files changed, 13 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5634f8..5ec2766 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-ctemplate-0.97.tar.gz
+ctemplate-0.*.tar.gz
+/ctemplate-2.2.tar.gz
diff --git a/ctemplate.spec b/ctemplate.spec
index ae1a4a1..f4210a6 100644
--- a/ctemplate.spec
+++ b/ctemplate.spec
@@ -1,14 +1,12 @@
 Name:           ctemplate
-Version:        0.97
-Release:        4%{?dist}
+Version:        2.2
+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
-Patch0:         ctemplate-0.93.consts.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  chrpath, python
 
 %description
@@ -28,15 +26,10 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .const
-chmod 644 src/template_string.cc
 
 %build
 %configure --disable-static
 
-#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 sed -i 's|^PTHREAD_LIBS = |PTHREAD_LIBS = -lpthread|g' Makefile
 
 # Omit unused direct shared library dependencies.
@@ -44,11 +37,7 @@ sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 make %{?_smp_mflags}
 
-%check
-make check
-
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -58,13 +47,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
 # Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libctemplate_nothreads.so.0.0.0
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libctemplate.so.0.0.0
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/make_tpl_varnames_h
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/diff_tpl_auto_escape
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+make check
 
 %post -p /sbin/ldconfig
 
@@ -88,8 +75,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libctemplate.so
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
+%{_libdir}/pkgconfig/libctemplate.pc
+%{_libdir}/pkgconfig/libctemplate_nothreads.pc
+
 
 %changelog
+* Sun Apr 29 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 2.2-1
+- Update to 2.2. Fix FTBFS since F-14
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97-4
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index 91db233..6e8bb02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7de5ce359a2f613f5c3fd309b36331f0  ctemplate-0.97.tar.gz
+1de89d9073f473c1e31862c4581636f3  ctemplate-2.2.tar.gz