From f4f1bc105b488a510d4d115c5a172d2f9139770c6517a5bf881eeaa90125da1f Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Thu, 16 Oct 2014 13:34:38 +0000 Subject: [PATCH] Accepting request 256649 from home:pgajdos - fixed loading for apache 2.4 [bnc#850825] OBS-URL: https://build.opensuse.org/request/show/256649 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_dnssd?expand=0&rev=9 --- apache2-mod_dnssd.changes | 5 +++++ apache2-mod_dnssd.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apache2-mod_dnssd.changes b/apache2-mod_dnssd.changes index 348c38e..ee106cf 100644 --- a/apache2-mod_dnssd.changes +++ b/apache2-mod_dnssd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 15 08:47:46 UTC 2014 - pgajdos@suse.com + +- fixed loading for apache 2.4 [bnc#850825] + ------------------------------------------------------------------- Tue Dec 20 11:25:36 UTC 2011 - coolo@suse.com diff --git a/apache2-mod_dnssd.spec b/apache2-mod_dnssd.spec index 8acd457..53de42b 100644 --- a/apache2-mod_dnssd.spec +++ b/apache2-mod_dnssd.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_dnssd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 Dominique Leuenberger, Almere, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: apache2-mod_dnssd %define _name mod_dnssd Summary: Apache2 module for Zeroconf support via DNS-SD @@ -41,6 +42,7 @@ Supplements: packageand(apache2-worker:gnome-user-share) BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apxs /usr/sbin/apxs2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) +%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+") %description mod_dnssd is an Apache HTTPD module which adds Zeroconf support via @@ -51,6 +53,9 @@ DNS-SD using Avahi. %patch0 -p1 %build +%if "%{apache_branch}" == "2.4" +sed -i 's/unixd_setup_child/ap_&/' src/mod_dnssd.c +%endif %configure \ --disable-lynx make %{?_smp_mflags}