|
|
@@ -1,6 +1,6 @@
|
|
|
%define name clearsilver
|
|
|
%define version 0.10.5
|
|
|
-%define release 6%{_dist_release}
|
|
|
+%define release 7%{_dist_release}
|
|
|
%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
|
|
|
|
|
|
Summary: A fast, powerful, and language-neutral HTML template system.
|
|
|
@@ -10,11 +10,17 @@ Version: %{version}
|
|
|
Release: %{release}
|
|
|
Source0: http://clearsilver.net/downloads/%{name}-%{version}.tar.gz
|
|
|
Patch0: clearsilver-0.10.5-conf.patch
|
|
|
+Patch1: clearsilver-0.10.5-regression.patch
|
|
|
+Patch2: clearsilver-0.10.5-CVE-2011-4357.patch
|
|
|
+Patch3: clearsilver-ruby-1.9.patch
|
|
|
License: Neotonic ClearSilver Software License
|
|
|
Group: Applications/Documentation
|
|
|
URL: http://clearsilver.net/
|
|
|
|
|
|
-BuildRequires: perl, ruby, ruby-devel, python-devel, zlib-devel
|
|
|
+BuildRequires: perl
|
|
|
+BuildRequires: ruby, ruby-devel >= 1.9.3
|
|
|
+BuildRequires: python-devel, zlib-devel
|
|
|
+Provides: ruby(clearsilver)
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
@@ -33,6 +39,9 @@ Clearsilver は高速、強力で言語中立なテンプレートシステム
|
|
|
%prep
|
|
|
%setup -q
|
|
|
%patch0 -p1 -b .conf
|
|
|
+%patch1 -p1
|
|
|
+%patch2 -p1
|
|
|
+%patch3 -p1
|
|
|
|
|
|
perl -pi -e 's/python_versions="2\.5/python_versions="2.7 2.6 2.5/' configure
|
|
|
|
|
|
@@ -48,7 +57,7 @@ perl -pi -e 's/^(TARGETS =.+) test/$1/' cs/Makefile
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
cd ruby
|
|
|
-%ruby install.rb config --rb-dir=${RPM_BUILD_ROOT}%{rlibdir} --so-dir=${RPM_BUILD_ROOT}%{rarchdir}
|
|
|
+%ruby install.rb config --rb-dir=${RPM_BUILD_ROOT}%{ruby_vendorlibdir} --so-dir=${RPM_BUILD_ROOT}%{ruby_vendorarchdir}
|
|
|
cd ..
|
|
|
make DESTDIR=${RPM_BUILD_ROOT} install
|
|
|
|
|
|
@@ -62,13 +71,18 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_includedir}/ClearSilver/
|
|
|
%{perl_sitearch}/*.pm
|
|
|
%{perl_sitearch}/auto/ClearSilver/
|
|
|
-%{rarchdir}/*.so
|
|
|
-%{rlibdir}/*.rb
|
|
|
+%{ruby_vendorarchdir}/*.so
|
|
|
+%{ruby_vendorlibdir}/*.rb
|
|
|
%{python_sitelib}/*.so
|
|
|
%{_libdir}/*.a
|
|
|
%{_mandir}/man*/*.gz
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Oct 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.10.5-7
|
|
|
+- rebuild with ruby-1.9.3
|
|
|
+- add patch3 to build with ruby-1.9
|
|
|
+- add patch2 for CVE-2011-4357
|
|
|
+
|
|
|
* Sat Feb 25 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.10.5-6
|
|
|
- rebuilt with python-2.7.
|
|
|
|
daisuke