rpms/ctemplate/devel ctemplate.spec,1.8,1.9

Dennis Gilmore ausil at fedoraproject.org
Tue Sep 1 20:51:30 UTC 2009


Author: ausil

Update of /cvs/pkgs/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13741

Modified Files:
	ctemplate.spec 
Log Message:
make sure the namespace is ctemplate not google
clean up spec



Index: ctemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/ctemplate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ctemplate.spec	5 Aug 2009 18:53:50 -0000	1.8
+++ ctemplate.spec	1 Sep 2009 20:51:29 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           ctemplate
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple but powerful template language for C++
 
 Group:          Development/Tools
@@ -8,7 +8,6 @@ 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
-#Patch1:         ctemplate-0.93.bswap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  chrpath, python
 
@@ -31,7 +30,6 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1 -b .const
 chmod 644 src/template_string.cc
-#%patch1 -p1 -b .bswap
 
 %build
 %configure --disable-static
@@ -54,8 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
-#mv $RPM_BUILD_ROOT%{_includedir}/google/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/
-sed -i -e 's|^#include <google|#include <ctemplate|g' $RPM_BUILD_ROOT%{_includedir}/%{name}/*.h
+sed -i -e 's|google|ctemplate|g' $RPM_BUILD_ROOT%{_includedir}/%{name}/*.h
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
@@ -93,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/*.h
 
 %changelog
+* 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
 




More information about the fedora-extras-commits mailing list