[ctemplate/epel7] Revert epel7 branch to last F19 commit, we don't EPEL7 package to break ABI with F19/F20

Michel Alexandre Salim salimma at fedoraproject.org
Tue May 20 04:04:28 UTC 2014


commit 31a9383487326a7027b2a953087b754ec4783de3
Author: Michel Alexandre Salim <michel at cergis.net.id>
Date:   Tue May 20 11:03:32 2014 +0700

    Revert epel7 branch to last F19 commit, we don't EPEL7 package to break ABI with F19/F20

 .gitignore     |    1 -
 ctemplate.spec |   69 ++++++++++++++++++++++++-------------------------------
 sources        |    2 +-
 3 files changed, 31 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 818b922..5ec2766 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 ctemplate-0.*.tar.gz
 /ctemplate-2.2.tar.gz
-/ctemplate-2.3.tar.gz
diff --git a/ctemplate.spec b/ctemplate.spec
index 47b3e62..68c1326 100644
--- a/ctemplate.spec
+++ b/ctemplate.spec
@@ -1,22 +1,13 @@
 Name:           ctemplate
-Version:        2.3
-Release:        1%{?dist}
+Version:        2.2
+Release:        3%{?dist}
 Summary:        A simple but powerful template language for C++
+
+Group:          Development/Tools
 License:        BSD
-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
+URL:            http://code.google.com/p/google-ctemplate/
+Source0:        http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz
+BuildRequires:  chrpath, python
 
 %description
 CTemplate is a simple but powerful template language for C++. It
@@ -25,36 +16,39 @@ embed application logic in this template language.
 
 %package        devel
 Summary:        Development files for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-This package contains libraries and header files for
+The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %prep
 %setup -q
 
 %build
-%configure --disable-static --disable-silent-rules
+%configure --disable-static
 
 sed -i 's|^PTHREAD_LIBS = |PTHREAD_LIBS = -lpthread|g' Makefile
+
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 make %{?_smp_mflags}
 
 %install
-%make_install
+make install DESTDIR=$RPM_BUILD_ROOT
 
-# Remove static libraries and libtool archives.
-find %{buildroot} -name '*.*a' -delete -print
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
+sed -i -e 's|google|ctemplate|g' $RPM_BUILD_ROOT%{_includedir}/%{name}/*.h
 
-# Remove rpaths.
-chrpath --delete %{buildroot}%{_bindir}/make_tpl_varnames_h
-chrpath --delete %{buildroot}%{_bindir}/diff_tpl_auto_escape
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
-# We ship docs in another way.
-rm -rf %{buildroot}%{_datadir}/doc
+# Remove rpaths.
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/make_tpl_varnames_h
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/diff_tpl_auto_escape
 
 %check
 make check
@@ -63,8 +57,11 @@ make check
 
 %postun -p /sbin/ldconfig
 
+
 %files
-%doc AUTHORS ChangeLog COPYING README NEWS
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING INSTALL README
+%doc doc/designstyle.css
 %{_bindir}/diff_tpl_auto_escape
 %{_bindir}/make_tpl_varnames_h
 %{_bindir}/template-converter
@@ -72,23 +69,17 @@ make check
 %{_libdir}/libctemplate.so.*
 
 %files devel
-%doc doc/
+%defattr(-,root,root,-)
+%doc doc/*.html
 %{_libdir}/libctemplate_nothreads.so
 %{_libdir}/libctemplate.so
-%{_includedir}/%{name}
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*.h
 %{_libdir}/pkgconfig/libctemplate.pc
 %{_libdir}/pkgconfig/libctemplate_nothreads.pc
 
-%changelog
-* 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
 
+%changelog
 * 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
 
diff --git a/sources b/sources
index c071ee1..6e8bb02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b337f1be9532c9765862e4804785274  ctemplate-2.3.tar.gz
+1de89d9073f473c1e31862c4581636f3  ctemplate-2.2.tar.gz


More information about the scm-commits mailing list