Attachment 669795 Details for Bug 722354 – suggested patch

[patch] suggested patch

0001-Add-service-managing-scriptlets-fix-722354.patch (text/plain), 2.57 KB, created by Matěj Cepl on 2012-12-28 09:56:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2012-12-28 09:56:38 UTC

Size: 2.57 KB

patch

obsolete

>From d7f82749e1eb0da09610158b97dfe49a70eebc8a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>Date: Fri, 28 Dec 2012 10:39:53 +0100
>Subject: [PATCH] Add service managing scriptlets (fix #722354)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>
>Signed-off-by: MatÄj Cepl <mcepl@redhat.com>
>---
> wordpress.spec | 42 +++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 41 insertions(+), 1 deletion(-)
>
>diff --git a/wordpress.spec b/wordpress.spec
>index c14d5f6..182b05a 100644
>--- a/wordpress.spec
>+++ b/wordpress.spec
>@@ -7,7 +7,7 @@ Name: wordpress
> Version: 3.5
> Group: Applications/Publishing
> #Release: 0.5.%{betatag}%{?dist}
>-Release: 2%{?dist}
>+Release: 3%{?dist}
> License: GPLv2
> #Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz
> Source0: http://wordpress.org/%{name}-%{version}.tar.gz
>@@ -60,6 +60,9 @@ Requires: webserver
> Provides: wordpress-mu = %{version}-%{release}
> Obsoletes: wordpress-mu < 2.9.3
> BuildArch: noarch
>+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
>+Requires(postun): initscripts
>+%endif
> 
> %description
> Wordpress is an online publishing / weblog package that makes it very easy,
>@@ -116,6 +119,40 @@ ln -sf /usr/share/php/PHPMailer/*php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-i
> find ${RPM_BUILD_ROOT} $ -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr $ \
>     -print -delete
> 
>+
>+# %%else clause works only on F18+ ... I would just ignore F17.
>+%post
>+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
>+# This adds the proper /etc/rc*.d links for the script
>+/sbin/chkconfig --add wordpress
>+%else
>+%systemd_post apache-httpd.service
>+%endif
>+
>+
>+%preun
>+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
>+# Just for actual deinstallation
>+if [ $1 -eq 0 ] ; then
>+    /sbin/service wordpress stop >/dev/null 2>&1
>+    /sbin/chkconfig --del wordpress
>+fi
>+%else
>+%systemd_preun apache-httpd.service
>+%endif
>+
>+
>+%postun
>+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
>+# Just for upgrades
>+if [ "$1" -ge "1" ] ; then
>+    /sbin/service wordpress condrestart >/dev/null 2>&1 || :
>+fi
>+%else
>+%systemd_postun apache-httpd.service
>+%endif
>+
>+
> ## Move wp-content directory to /var/www location
> #mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress
> #mv -v ${RPM_BUILD_ROOT}%{wp_content}/ \
>@@ -157,6 +194,9 @@ rm -rf ${RPM_BUILD_ROOT}
> %dir %{_sysconfdir}/wordpress
> 
> %changelog
>+* Fri Dec 28 2012 MatÄj Cepl <mcepl@redhat.com> - 3.5-3
>+- Add service managing scriptlets (fix #722354)
>+
> * Sun Dec 16 2012 Remi Collet <rcollet@redhat.com> - 3.5-2
> - fix use of system Simplepie
> - give access from local (httpd 2.4)
>-- 
>1.8.0.2
>

Actions: View | Diff

Attachments on bug 722354: 669795 | 669817