pali pushed to cherokee (el5). "Resolves bz 786748 - systemd service script seems broken"

[notifications at fedoraproject.org]

>From d77f272b43692f960cbb737210c145c5b30ed415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Lis=C3=BD?= <pali at fedoraproject.org>
Date: Tue, 21 Feb 2012 12:52:58 +0100
Subject: Resolves bz 786748 - systemd service script seems broken


diff --git a/cherokee.service b/cherokee.service
index 727165c..328d5e2 100644
--- a/cherokee.service
+++ b/cherokee.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/cherokee
+PIDFile=/var/run/cherokee.pid
 ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
 
 [Install]
diff --git a/cherokee.spec b/cherokee.spec
index a728147..2ccd547 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -5,7 +5,7 @@
 
 Name:           cherokee
 Version:        1.2.101
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -16,7 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source1:        %{name}.init
 Source2:        %{name}.logrotate
 Source3:        %{name}.service
-%if "%{dist}" == ".el4" || "%{dist}" == ".el5"
+%if "%{rhel}" == "4" || "%{rhel}" == "5"
 Source100:      http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
 %endif
 
@@ -24,7 +24,7 @@ Source100:      http://www.openssl.org/source/openssl-%{opensslversion}.tar.gz
 Patch0: 01-drop-privileges.patch
 
 BuildRequires:  pam-devel mysql-devel pcre GeoIP-devel openldap-devel
-%if "%{dist}" == ".el4"
+%if "%{rhel}" == "4"
 BuildRequires:  php
 %else
 BuildRequires:  php-cli
@@ -34,7 +34,7 @@ BuildRequires:  gettext
 # For spawn-fcgi
 Requires:        spawn-fcgi
 
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -66,7 +66,7 @@ This package holds the development files for cherokee.
 
 
 %prep
-%if "%{dist}" == ".el4" || "%{dist}" == ".el5"
+%if "%{rhel}" == "4" || "%{rhel}" == "5"
 %setup -q -a 100
 %else
 %setup -q
@@ -74,7 +74,7 @@ This package holds the development files for cherokee.
 %patch0 -p1 -b .privs
 
 %build
-%if "%{dist}" == ".el4" || "%{dist}" == ".el5"
+%if "%{rhel}" == "4" || "%{rhel}" == "5"
 pushd openssl-%{opensslversion}
 ./config --prefix=/usr --openssldir=%{_sysconfdir}/pki/tls shared
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
@@ -88,7 +88,7 @@ popd
 %endif
 
 %configure --with-wwwroot=%{_var}/www/%{name} \
-%if "%{dist}" == ".el4" || "%{dist}" == ".el5"
+%if "%{rhel}" == "4" || "%{rhel}" == "5"
    --with-libssl=$(pwd)/openssl-%{opensslversion} --enable-static-module=libssl \
 %else
    --with-libssl \
@@ -109,7 +109,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 "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
 %{__install} -d %{buildroot}%{_unitdir}
 %{__install} -D -m 0644 %{SOURCE3}   %{buildroot}%{_unitdir}/%{name}.service
 %else
@@ -150,7 +150,7 @@ useradd -r -g %{name} -d %{home} -s /sbin/nologin \
 exit 0
 
 %post
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
 if [ $1 -eq 1 ] ; then 
     # Initial installation: enabled by default
     /bin/systemctl enable cherokee.service >/dev/null 2>&1 || :
@@ -161,7 +161,7 @@ fi
 %endif
 
 %preun
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /bin/systemctl --no-reload disable cherokee.service > /dev/null 2>&1 || :
@@ -175,7 +175,7 @@ fi
 %endif
 
 %postun
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
@@ -187,7 +187,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%if "%{dist}" == ".fc15" || "%{dist}" == ".fc16" || "%{dist}" == ".fc17"
+%if "%{fedora}" == "15" || "%{fedora}" == "16" || "%{fedora}" == "17"
 %{_unitdir}/%{name}.service
 %else
 %{_sysconfdir}/init.d/%{name}
@@ -247,6 +247,12 @@ fi
 %{_libdir}/lib%{name}-*.so
 
 %changelog
+* Tue Feb 21 2012 Pavel Lisý <pali at fedoraproject.org> - 1.2.101-3
+- Resolves bz 786748 - systemd service script seems broken
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.101-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 
+
 * Wed Oct 19 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.101-1
 - Latest 1.2.x upstream release
 
-- 
cgit v0.10.2


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