rel 4

[packages/cherokee.git] / cherokee.spec

diff --git a/cherokee.spec b/cherokee.spec
index 9c6f1051da57b9b1863f3b92f2f2158cbf042bfd..3504e2493757ebc40f326099a9e74b0955f0581b 100644 (file)
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -13,12 +13,12 @@
 Summary:       Fast, Flexible and Lightweight Web server
 Summary(pl.UTF-8):     Cherokee - serwer WWW
 Name:          cherokee
-Version:       1.2.103
-Release:       5
+Version:       1.2.104
+Release:       4
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       https://github.com/cherokee/webserver/archive/v%{version}.zip
-# Source0-md5: 9e6d8e0dd95808d365d32ecb0a9b80fe
+# Source0-md5: 1f4fe0f0317c07b93c9cbbf4f843e724
 # the last snapshot from https://github.com/cherokee/CTK
 Source1:       CTK-20120806.tar.xz
 # Source1-md5: 567f087cd6cdf10b89047535cbe94f8e
@@ -29,6 +29,8 @@ Patch0:               %{name}-config.patch
 Patch1:                %{name}-panic_path.patch
 Patch2:                ffmpeg0.11.patch
 Patch3:                time_t_x32.patch
+Patch4:                openssl.patch
+Patch5:         build.patch
 URL:           http://www.cherokee-project.com/
 %{?with_geoip:BuildRequires:   GeoIP-devel}
 BuildRequires: autoconf
@@ -130,6 +132,15 @@ Biblioteki serwera WWW Cherokee.
 %patch1 -p1
 #%patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' \
+      admin/CTK/CTK-run.pre \
+      admin/server.py \
+      admin/upgrade_config.py \
+      cherokee/cherokee-admin-launcher \
+      cherokee/cherokee-tweak
 
 %build
 %{__libtoolize}
@@ -191,7 +202,6 @@ rm $RPM_BUILD_ROOT/etc/cherokee/cherokee.conf.perf_sample
 rm $RPM_BUILD_ROOT%{_bindir}/cherokee-macos-askpass
 
 mv $RPM_BUILD_ROOT%{_localedir}/{sv_SE,sv}
-mv $RPM_BUILD_ROOT%{_localedir}/{jp,ja}
 %find_lang %{name}