From 1b392ac14cd17bce51dff9bc30f3b78bcbbc1feaf1f2ed320cb8c68caa0ac16c Mon Sep 17 00:00:00 2001 From: Roman Drahtmueller Date: Thu, 15 Sep 2011 11:34:45 +0000 Subject: [PATCH 1/2] - don't create $RPM_BUILD_ROOT/etc/init.d twice in %install. OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=340 --- apache2.changes | 5 +++++ apache2.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apache2.changes b/apache2.changes index 7e75b3a..4740ab0 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 15 13:33:30 CEST 2011 - draht@suse.de + +- don't create $RPM_BUILD_ROOT/etc/init.d twice in %install. + ------------------------------------------------------------------- Wed Sep 14 01:11:55 CEST 2011 - draht@suse.de diff --git a/apache2.spec b/apache2.spec index 739a110..499922e 100644 --- a/apache2.spec +++ b/apache2.spec @@ -599,7 +599,6 @@ install -m 755 %{S:25} $RPM_BUILD_ROOT/%{_bindir}/ tar xjf %{SOURCE29} -C $RPM_BUILD_ROOT/%{sysconfdir} # # init script and friends -mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/lib/systemd/system/ install -m 744 $RPM_SOURCE_DIR/rc.%{pname} $RPM_BUILD_ROOT/etc/init.d/%{pname} install -m 744 $RPM_SOURCE_DIR/start_apache2 $RPM_BUILD_ROOT/usr/sbin/start_apache2 From 7027e60c26095f90e1c7ca76731d04f9bc80660cf167e93d73104683dbfb6af5 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 29 Sep 2011 09:39:43 +0000 Subject: [PATCH 2/2] Accepting request 85398 from home:fcrozat:branches:Apache - Fix systemd files packaging, %ghost is not a good idea. - Use systemd rpm macros for openSUSE 12.1 and later. OBS-URL: https://build.opensuse.org/request/show/85398 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=341 --- apache2.changes | 6 ++++++ apache2.spec | 30 ++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/apache2.changes b/apache2.changes index 4740ab0..1e7e24d 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 27 08:19:35 UTC 2011 - fcrozat@suse.com + +- Fix systemd files packaging, %ghost is not a good idea. +- Use systemd rpm macros for openSUSE 12.1 and later. + ------------------------------------------------------------------- Thu Sep 15 13:33:30 CEST 2011 - draht@suse.de diff --git a/apache2.spec b/apache2.spec index 499922e..1f05d90 100644 --- a/apache2.spec +++ b/apache2.spec @@ -26,6 +26,10 @@ BuildRequires: libcap %else BuildRequires: libcap-devel %endif +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif + %if %{?suse_version:1}0 %define httpduser wwwrun %define httpdgroup www @@ -145,6 +149,7 @@ Requires: logrotate # see https://bugzilla.redhat.com/show_bug.cgi?id=516331 Requires: libapr1 >= 1.4.2 Requires: libapr1 < 2.0 +%{?systemd_requires} PreReq: fileutils textutils grep sed %if %{?suse_version:1}0 PreReq: %insserv_prereq %fillup_prereq permissions pwdutils @@ -599,11 +604,14 @@ install -m 755 %{S:25} $RPM_BUILD_ROOT/%{_bindir}/ tar xjf %{SOURCE29} -C $RPM_BUILD_ROOT/%{sysconfdir} # # init script and friends -mkdir -p $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/lib/systemd/system/ +mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 744 $RPM_SOURCE_DIR/rc.%{pname} $RPM_BUILD_ROOT/etc/init.d/%{pname} install -m 744 $RPM_SOURCE_DIR/start_apache2 $RPM_BUILD_ROOT/usr/sbin/start_apache2 +%if 0%{?suse_version} >= 1210 +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/ install -m 744 $RPM_SOURCE_DIR/apache2-systemd-ask-pass $RPM_BUILD_ROOT/usr/sbin/apache2-systemd-ask-pass -install -m 744 $RPM_SOURCE_DIR/apache2.service $RPM_BUILD_ROOT/lib/systemd/system/apache2.service +install -m 644 $RPM_SOURCE_DIR/apache2.service $RPM_BUILD_ROOT/lib/systemd/system/apache2.service +%endif ln -sf ../../etc/init.d/%{pname} $RPM_BUILD_ROOT/%{_sbindir}/rc%{pname} install -m 755 $RPM_SOURCE_DIR/load_configuration $RPM_BUILD_ROOT/%{_prefix}/share/%{pname}/ install -m 755 $RPM_SOURCE_DIR/find_mpm $RPM_BUILD_ROOT/%{_prefix}/share/%{pname}/ @@ -861,7 +869,9 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original . %config(noreplace) /etc/permissions.d/%{pname} %endif %config /etc/init.d/%{pname} +%if 0%{?suse_version} >= 1210 /lib/systemd/system/%{pname}.service +%endif # %{_sbindir}/rc%{pname} %{_sbindir}/apache%{vers}ctl @@ -873,7 +883,9 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original . %{_sbindir}/a2disflag %{_sbindir}/a2dismod %{_sbindir}/start_apache2 +%if 0%{?suse_version} >= 1210 %{_sbindir}/apache2-systemd-ask-pass +%endif %{_bindir}/log_server_status%{vers} %{iconsdir} %{errordir} @@ -892,8 +904,6 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original . %{_prefix}/share/%{pname}/sysconf_addword %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl -%ghost /lib/systemd -%ghost /lib/systemd/system %if %prefork @@ -1011,9 +1021,15 @@ if ! /usr/bin/getent passwd %httpduser &>/dev/null; then /usr/sbin/useradd -c "Apache" -u 48 \ -s /sbin/nologin -r -d %{localstatedir} %httpduser 2> /dev/null || : fi +%if 0%{?suse_version} >= 1210 +%service_add_pre apache2.service +%endif %endif %preun +%if 0%{?suse_version} >= 1210 +%service_del_preun apache2.service +%endif for i in %{_sbindir}/%{httpd} \ %{installbuilddir}/config_vars.mk do @@ -1022,6 +1038,9 @@ done exit 0 %postun +%if 0%{?suse_version} >= 1210 +%service_del_postun apache2.service +%endif #if %suse_version > 810 #restart_on_update %{pname} #endif @@ -1074,6 +1093,9 @@ fi rm -rf $tmpdir /usr/share/%{pname}/apache-20-22-upgrade /usr/share/%{pname}/get_module_list &>/dev/null +%if 0%{?suse_version} >= 1210 +%service_add_post apache2.service +%endif exit 0 %verifyscript