- perl req/prov fix

[packages/clearsilver.git] / clearsilver.spec

diff --git a/clearsilver.spec b/clearsilver.spec
index 3f36886b83744a0e93388a4642c99558d8f33a32..2488cf575628e96ceada47a7e0936f8f430730e8 100644 (file)
--- a/clearsilver.spec
+++ b/clearsilver.spec
@@ -1,19 +1,23 @@
 Summary:       ClearSilver HTML template system
 Summary(pl.UTF-8):     ClearSilver - system szablonów HTML
 Name:          clearsilver
-Version:       0.9.14
-Release:       1
+Version:       0.10.5
+Release:       17
 License:       Apache License style
 Group:         Development/Libraries
 Source0:       http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 2161936b7828e8cbdc4f45812d15e3f6
+# Source0-md5: b8c0c7fbe0ef5e06e0c935f134304d44
 Patch0:                %{name}-pic.patch
+Patch1:                format-security.patch
+Patch2:                variadic-macros.patch
 URL:           http://www.clearsilver.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: perl-ExtUtils-MakeMaker
 BuildRequires: perl-devel
 BuildRequires: python-devel
+BuildRequires: python-modules
+BuildRequires: rpm-pythonprov
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -26,8 +30,8 @@ which makes working with your project easier.
 %description -l pl.UTF-8
 ClearSilver to szybki, potężny i niezależny od języka system szablonów
 HTML. Zarówno w statycznych stronach HTML jak i dynamicznych
-aplikacjach pomaga oddzielić kod prezentacyjny od logiki aplikacji,
-co ułatwia pracę nad projektem.
+aplikacjach pomaga oddzielić kod prezentacyjny od logiki aplikacji, co
+ułatwia pracę nad projektem.
 
 %package devel
 Summary:       ClearSilver development package
@@ -86,6 +90,8 @@ ClearSilver.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 find . -type f -print0 | xargs -0 perl -pi -e "s!/usr/local/bin!/usr/bin!g" 
 
@@ -99,7 +105,7 @@ install /usr/share/automake/config.* .
        --disable-ruby \
        --enable-apache \
        --enable-perl \
-       --with-python=%{_bindir}/python
+       --with-python=%{__python}
 
 %{__make}
 
@@ -121,6 +127,11 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{perl_archlib} \
        $RPM_BUILD_ROOT%{perl_vendorarch}/auto/*{,/*{,/*}}/.packlist
 
+# what an ass putting it to lib32 dir
+%if "%{_lib}" != "lib"
+rm $RPM_BUILD_ROOT%{_prefix}/lib/python%{py_ver}/site-packages/neo_cgi.so
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -144,15 +155,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{perl_vendorarch}/ClearSilver.pm
 %dir %{perl_vendorarch}/auto/ClearSilver
-%{perl_vendorarch}/auto/ClearSilver/ClearSilver.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/ClearSilver/ClearSilver.so
 %{_mandir}/man3/ClearSilver.3pm*
 
-#%files -n ruby
-#%defattr(644,root,root,755)
-#{ruby_sitepath}/(ruby_version}/neo.rb
-#%attr(755,root,root) {ruby_sitepath}/(ruby_version}/$(ruby_arch}/hdf.so
+%if 0
+%files -n ruby-clearsilver
+%defattr(644,root,root,755)
+%{ruby_sitepath}/%{ruby_version}/neo.rb
+%attr(755,root,root) %{ruby_sitepath}/%{ruby_version}/%{ruby_arch}/hdf.so
 
-#%files -n mod_ecs
-#%defattr(644,root,root,755)
-#%attr(755,root,root) {apache_libexec}/mod_ecs.so
+%files -n apache-mod_ecs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{apache_libexec}/mod_ecs.so
+%endif