pali pushed to cherokee (el5). "latest 1.2.x upstream release (..more)"

Wed Apr 15 21:00:54 UTC 2015

>From ebe1532472137af0bfdea1fd0e88d53c2b4f176c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Thu, 16 May 2013 19:18:59 +0200
Subject: latest 1.2.x upstream release

- Resolves bz 961057 - RFE: Cherokee 1.2.103 is available
- Resolves bz 961056 - RFE: Cherokee 1.2.103 is available
- Resolves bz 954199 - cherokee 1.2.103 is available
- Resolves bz 958337 - Update request for Cherokee
- Resolves bz 858542 - Cherokee should not be built with trace/backtrace support for performance
#- Resolves bz 925220 - cherokee: Does not support aarch64 in f19 and rawhide

diff --git a/cherokee.spec b/cherokee.spec
index f1f0b3c..65bc207 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -1,29 +1,34 @@
 %define         home %{_var}/lib/%{name}
 %define         shortversion   %(echo %{version} | sed -e 's/^\([0-9]+\.[0-9]+\)\.[0-9]+/\1/g')
 %define         opensslversion 1.0.0d
+#%define         pkgname webserver
+%define         pkgname cherokee
 %{!?_unitdir:%define _unitdir /lib/systemd/system}
 
 Name:           cherokee
-Version:        1.2.101
-Release:        5%{?dist}
+Version:        1.2.103
+Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://www.cherokee-project.com/
 Source0:        http://www.cherokee-project.com/download/%{shortversion}/%{version}/%{name}-%{version}.tar.gz
+# Source0:        http://github.com/%{name}/%{pkgname}/archive/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source1:        %{name}.init
 Source2:        %{name}.logrotate
 Source3:        %{name}.service
+
 %if "%{rhel}" == "4" || "%{rhel}" == "5"
 Source100:      http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
 %endif
 
 # Drop privileges to cherokee:cherokee after startup
 Patch0: 01-drop-privileges.patch
+#Patch1: http://ausil.fedorapeople.org/aarch64/cherokee/cherokee-aarch64.patch
 
-BuildRequires:  pam-devel mysql-devel pcre GeoIP-devel openldap-devel
+BuildRequires:  pam-devel mysql-devel pcre-devel GeoIP-devel openldap-devel
 %if "%{rhel}" == "4"
 BuildRequires:  php
 %else
@@ -34,7 +39,7 @@ BuildRequires:  gettext
 # For spawn-fcgi
 Requires:        spawn-fcgi
 
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -67,11 +72,12 @@ This package holds the development files for cherokee.
 
 %prep
 %if "%{rhel}" == "4" || "%{rhel}" == "5"
-%setup -q -a 100
+%setup -n %{pkgname}-%{version} -q -a 100
 %else
-%setup -q
+%setup -n %{pkgname}-%{version} -q
 %endif
 %patch0 -p1 -b .privs
+#%patch1 -p1 -b .aarch64
 
 %build
 %if "%{rhel}" == "4" || "%{rhel}" == "5"
@@ -93,7 +99,7 @@ popd
 %else
    --with-libssl \
 %endif
-   --enable-trace --enable-backtraces --disable-static
+   --disable-static
 # Get rid of rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -109,7 +115,7 @@ make install DESTDIR=%{buildroot}
 %{__install} -D -m 0644 %{SOURCE2}   %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d %{buildroot}%{_var}/{log,lib}/%{name}/
 %{__install} -d %{buildroot}%{_sysconfdir}/pki/%{name}
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
 %{__install} -d %{buildroot}%{_unitdir}
 %{__install} -D -m 0644 %{SOURCE3}   %{buildroot}%{_unitdir}/%{name}.service
 %else
@@ -128,9 +134,7 @@ touch %{buildroot}%{_var}/log/%{name}/access_log \
 
 find  %{buildroot}%{_libdir} -name *.la -exec rm -rf {} \;
 
-mv ChangeLog ChangeLog.iso8859-1
 chmod -x COPYING
-iconv -f ISO8859-1 -t UTF8 ChangeLog.iso8859-1 > ChangeLog
 
 # Get rid of spawn-fcgi bits, they conflict with the lighttpd-fastcgi package
 # but are otherwise identical.
@@ -150,7 +154,7 @@ useradd -r -g %{name} -d %{home} -s /sbin/nologin \
 exit 0
 
 %post
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
 if [ $1 -eq 1 ] ; then 
     # Initial installation: enabled by default
     /bin/systemctl enable cherokee.service >/dev/null 2>&1 || :
@@ -161,7 +165,7 @@ fi
 %endif
 
 %preun
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /bin/systemctl --no-reload disable cherokee.service > /dev/null 2>&1 || :
@@ -175,7 +179,7 @@ fi
 %endif
 
 %postun
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
@@ -187,7 +191,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
+%if ( 0%{?fedora} )
 %{_unitdir}/%{name}.service
 %else
 %{_sysconfdir}/init.d/%{name}
@@ -218,7 +222,7 @@ fi
 %attr(-,%{name},%{name}) %{_var}/log/%{name}/error_log
 %attr(-,%{name},%{name}) %{_var}/log/%{name}/access_log
 %attr(-,%{name},%{name}) %dir %{_var}/lib/%{name}/
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS COPYING NEWS
 %doc %{_datadir}/doc/%{name}
 %doc %{_mandir}/man1/cget.1*
 %doc %{_mandir}/man1/cherokee.1*
@@ -247,6 +251,15 @@ fi
 %{_libdir}/lib%{name}-*.so
 
 %changelog
+* Thu May 16 2013 Pavel Lisý <pali at fedoraproject.org> - 1.2.103-1
+- latest 1.2.x upstream release
+- Resolves bz 961057 - RFE: Cherokee 1.2.103 is available
+- Resolves bz 961056 - RFE: Cherokee 1.2.103 is available
+- Resolves bz 954199 - cherokee 1.2.103 is available
+- Resolves bz 958337 - Update request for Cherokee
+- Resolves bz 858542 - Cherokee should not be built with trace/backtrace support for performance 
+#- Resolves bz 925220 - cherokee: Does not support aarch64 in f19 and rawhide
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.101-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -290,13 +303,13 @@ fi
 * Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 1.2.1-2
 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
 
-* Fri Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.1-1
+* Fri Feb 25 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.1-1
 - Resolves bz 678243
 - Resolves bz 680051
 - Resolves bz 678838 (EPEL)
 - Resolves bz 622514 (EPEL)
 
-* Fri Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.0.20-4
+* Fri Feb 25 2011 Pavel Lisý <pali at fedoraproject.org> - 1.0.20-4
 - Resolves bz 570317
 
 * Tue Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.0.20-3
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cherokee.git/commit/?h=el5&id=ebe1532472137af0bfdea1fd0e88d53c2b4f176c
