X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=clearsilver.spec;h=2ecedfd87f555f1ef62d058d4e82f6a2a9002885;hb=343ff5e1d374ca9c60f37db2cc9a51e53fbade59;hp=eb66f731be2570f1349aec55f626196c74dc316e;hpb=036a5772282f7a63fb175435556c776f97db1d93;p=packages%2Fclearsilver.git

diff --git a/clearsilver.spec b/clearsilver.spec
index eb66f73..2ecedfd 100644
--- a/clearsilver.spec
+++ b/clearsilver.spec
@@ -1,19 +1,22 @@
 Summary:	ClearSilver HTML template system
-Summary(pl):	ClearSilver - system szablonów HTML
+Summary(pl.UTF-8):	ClearSilver - system szablonów HTML
 Name:		clearsilver
-Version:	0.9.14
-Release:	1
+Version:	0.10.5
+Release:	8
 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
 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)
 
@@ -23,28 +26,28 @@ system. In both static content sites and dynamic HTML applications, it
 provides a separation between presentation code and application logic
 which makes working with your project easier.
 
-%description -l pl
-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.
+%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.
 
 %package devel
 Summary:	ClearSilver development package
-Summary(pl):	Pakiet programistyczny ClearSilver
+Summary(pl.UTF-8):	Pakiet programistyczny ClearSilver
 Group:		Development/Libraries
 
 %description devel
 This package provides needed files to develop extension to
 ClearSilver.
 
-%description devel -l pl
-Ten pakiet dostarcza pliki potrzebne do tworzenia rozszerzeñ dla
+%description devel -l pl.UTF-8
+Ten pakiet dostarcza pliki potrzebne do tworzenia rozszerzeń dla
 ClearSilver.
 
 %package -n python-clearsilver
 Summary:	Neotonic ClearSilver Python Module
-Summary(pl):	Modu³ Pythona Neotonic ClearSilver
+Summary(pl.UTF-8):	Moduł Pythona Neotonic ClearSilver
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -52,13 +55,13 @@ Requires:	%{name} = %{version}-%{release}
 This package provides a Python interface to the ClearSilver CGI kit
 and templating system.
 
-%description -n python-clearsilver -l pl
+%description -n python-clearsilver -l pl.UTF-8
 Ten pakiet dostarcza interfejs Pythona do zestawu CGI i systemu
-szablonów ClearSilver.
+szablonów ClearSilver.
 
 %package -n perl-ClearSilver
 Summary:	Neotonic ClearSilver Perl Module
-Summary(pl):	Modu³ Perla Neotonic ClearSilver
+Summary(pl.UTF-8):	Moduł Perla Neotonic ClearSilver
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -66,12 +69,12 @@ Requires:	%{name} = %{version}-%{release}
 This package provides a Perl interface to the ClearSilver templating
 system.
 
-%description -n perl-ClearSilver -l pl
-Ten pakiet dostarcza interfejs Perla do systemu szablonów ClearSilver.
+%description -n perl-ClearSilver -l pl.UTF-8
+Ten pakiet dostarcza interfejs Perla do systemu szablonów ClearSilver.
 
 %package -n ruby-clearsilver
 Summary:	Neotonic ClearSilver Ruby Module
-Summary(pl):	Modu³ Ruby'ego Neotonic ClearSilver
+Summary(pl.UTF-8):	Moduł Ruby'ego Neotonic ClearSilver
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -79,13 +82,14 @@ Requires:	%{name} = %{version}-%{release}
 This package provides a ruby interface to the ClearSilver templating
 system.
 
-%description -n ruby-clearsilver -l pl
-Ten pakiet dostarcza interfejs jêzyka Ruby do systemu szablonów
+%description -n ruby-clearsilver -l pl.UTF-8
+Ten pakiet dostarcza interfejs języka Ruby do systemu szablonów
 ClearSilver.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 find . -type f -print0 | xargs -0 perl -pi -e "s!/usr/local/bin!/usr/bin!g" 
 
@@ -99,7 +103,7 @@ install /usr/share/automake/config.* .
 	--disable-ruby \
 	--enable-apache \
 	--enable-perl \
-	--with-python=%{_bindir}/python
+	--with-python=%{__python}
 
 %{__make}
 
@@ -121,6 +125,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 +153,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