Hello community,
here is the log from the commit of package apache2 for openSUSE:Factory checked
in at 2013-09-04 13:16:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2 (Old)
and /work/SRC/openSUSE:Factory/.apache2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2013-09-02
14:55:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2013-09-04
13:16:55.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Sep 3 15:37:37 UTC 2013 - crrodrig...@opensuse.org
+
+- Also fix subtle non-obvious systemd unit confusion
+ we really mean -DFOREGROUND not -DNO_DETACH the latter only
+ inhibits the parent from forking, not quite the same as
+ running in well.. the foreground as required.
+
+-------------------------------------------------------------------
+Tue Sep 3 03:58:27 UTC 2013 - crrodrig...@opensuse.org
+
+- Ensure we only use /run and not /var/run
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2.spec ++++++
--- /var/tmp/diff_new_pack.i4vZYe/_old 2013-09-04 13:16:56.000000000 +0200
+++ /var/tmp/diff_new_pack.i4vZYe/_new 2013-09-04 13:16:56.000000000 +0200
@@ -69,7 +69,11 @@
%define localstatedir /var/lib/%{pname}
%define proxycachedir /var/cache/%{pname}
%define logfiledir /var/log/%{pname}
+%if %suse_version > 1220
+%define runtimedir /run
+%else
%define runtimedir /var/run
+%endif
%define sysconfdir /etc/%{pname}
%define includedir %{_includedir}/%{pname}
%define libexecdir %_libdir/%{pname}
@@ -500,10 +504,10 @@
configure
sed "s/%{vers}-$mpm//" include/ap_config_auto.h >
include/ap_config_auto.h.new
mv include/ap_config_auto.h.new include/ap_config_auto.h
+ sed -i -e "s@/var/run@%{runtimedir}@g" include/ap_config_layout.h
make CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -fPIC \
-Wall \
- -DDEFAULT_PIDLOG='\"%{runtimedir}/%{httpd}.pid\"' \
-DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"' " \
%{?jobs:-j%jobs}
++++++ apache2.service ++++++
--- /var/tmp/diff_new_pack.i4vZYe/_old 2013-09-04 13:16:56.000000000 +0200
+++ /var/tmp/diff_new_pack.i4vZYe/_new 2013-09-04 13:16:56.000000000 +0200
@@ -8,9 +8,9 @@
Type=notify
PrivateTmp=true
EnvironmentFile=/etc/sysconfig/apache2
-ExecStart=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -k start
-ExecReload=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -t -k graceful
-ExecStop=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -k graceful-stop
+ExecStart=/usr/sbin/start_apache2 -D SYSTEMD -DFOREGROUND -k start
+ExecReload=/usr/sbin/start_apache2 -D SYSTEMD -DFOREGROUND -t -k graceful
+ExecStop=/usr/sbin/start_apache2 -D SYSTEMD -DFOREGROUND -k graceful-stop
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
