From 40ba7df58328e3bedcf015afb2db25aa9a7dac70f33cf1d9bee3a8f012f52c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 11 Nov 2014 11:57:10 +0000 Subject: [PATCH] Accepting request 259097 from home:pgajdos:apache2 - call spec-cleaner - use apache rpm macros OBS-URL: https://build.opensuse.org/request/show/259097 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_dnssd?expand=0&rev=11 --- apache2-mod_dnssd.changes | 6 ++++++ apache2-mod_dnssd.spec | 20 +++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/apache2-mod_dnssd.changes b/apache2-mod_dnssd.changes index ee106cf..9427abe 100644 --- a/apache2-mod_dnssd.changes +++ b/apache2-mod_dnssd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 31 08:25:28 UTC 2014 - pgajdos@suse.com + +- call spec-cleaner +- use apache rpm macros + ------------------------------------------------------------------- Wed Oct 15 08:47:46 UTC 2014 - pgajdos@suse.com diff --git a/apache2-mod_dnssd.spec b/apache2-mod_dnssd.spec index 53de42b..158a369 100644 --- a/apache2-mod_dnssd.spec +++ b/apache2-mod_dnssd.spec @@ -17,32 +17,30 @@ # -Name: apache2-mod_dnssd %define _name mod_dnssd +Name: apache2-mod_dnssd +Version: 0.6 +Release: 0 Summary: Apache2 module for Zeroconf support via DNS-SD License: Apache-2.0 Group: Productivity/Networking/Web/Servers -Version: 0.6 -Release: 0 +Url: http://0pointer.de/lennart/projects/mod_dnssd/ Source: %{_name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE apache2-mod_dnssd-apxs2-prefork.patch Patch0: apache2-mod_dnssd-apxs2-prefork.patch -Url: http://0pointer.de/lennart/projects/mod_dnssd/ +BuildRequires: apache-rpm-macros BuildRequires: apache2-devel BuildRequires: autoconf BuildRequires: libapr1-devel BuildRequires: pkg-config +Supplements: packageand(apache2-prefork:gnome-user-share) +Supplements: packageand(apache2-worker:gnome-user-share) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1020 BuildRequires: libavahi-devel %else BuildRequires: avahi-devel %endif -Supplements: packageand(apache2-prefork:gnome-user-share) -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 @@ -57,7 +55,7 @@ DNS-SD using Avahi. sed -i 's/unixd_setup_child/ap_&/' src/mod_dnssd.c %endif %configure \ - --disable-lynx + --disable-lynx make %{?_smp_mflags} %install