From 0c56cfa1b85359abb49dc12e75da6ab91135b91d4977559968fb374f00e446c0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Sep 2011 15:30:27 +0000 Subject: [PATCH] Accepting request 82819 from home:jengelh:bl-a2 - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build - Add libavahi-devel to baselibs OBS-URL: https://build.opensuse.org/request/show/82819 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=66 --- avahi-glib2.changes | 7 +++++++ avahi-glib2.spec | 33 +++++++++++------------------- avahi-mono.changes | 7 +++++++ avahi-mono.spec | 49 ++++++++++++++++++++++++++------------------- avahi-qt4.changes | 7 +++++++ avahi-qt4.spec | 30 ++++++++------------------- avahi.changes | 7 +++++++ avahi.spec | 14 ++++--------- baselibs.conf | 6 +++++- 9 files changed, 85 insertions(+), 75 deletions(-) diff --git a/avahi-glib2.changes b/avahi-glib2.changes index 4eaaf70..c8525f9 100644 --- a/avahi-glib2.changes +++ b/avahi-glib2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 17 13:50:42 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build +- Add libavahi-devel to baselibs + ------------------------------------------------------------------- Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz diff --git a/avahi-glib2.spec b/avahi-glib2.spec index b81169c..2486c47 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: avahi-glib2 @@ -31,7 +30,7 @@ Name: avahi-glib2 %define build_qt3 0 %define build_qt4 0 Version: 0.6.30 -Release: 3 +Release: 5 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -135,7 +134,6 @@ across LAN segments. %if %build_core %package -n libavahi-client3 - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -154,7 +152,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -173,7 +170,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -192,7 +188,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd - License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries @@ -231,7 +226,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 - License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries @@ -255,7 +249,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi - License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils @@ -280,7 +273,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils - License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} @@ -300,7 +292,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel - License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # @@ -324,7 +315,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel - License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} @@ -348,7 +338,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel - License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} @@ -373,6 +362,7 @@ correct mDNS reflection across LAN segments. %if %build_glib2 %package -n libavahi-ui0 + License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -392,7 +382,6 @@ across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -411,6 +400,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-glib1 + License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME @@ -434,6 +424,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 + License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -452,6 +443,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n avahi-utils-gtk + License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} @@ -476,6 +468,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n python-avahi-gtk + License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils @@ -502,6 +495,7 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel + License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} @@ -528,6 +522,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel + License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel @@ -551,7 +546,6 @@ across LAN segments. %package -n libavahi-qt3-1 - Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -575,7 +569,6 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel - Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ @@ -752,7 +745,7 @@ intltoolize -f %if %build_glib2 && !%build_core for DIR in avahi-glib avahi-gobject avahi-ui avahi-discover-standalone avahi-python man ; do cd $DIR -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd .. done %endif @@ -764,10 +757,10 @@ cd avahi-qt %endif %if %build_mono && !%build_core cd avahi-sharp -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd ../avahi-ui-sharp %endif -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %if %build_glib2 && !%build_core @@ -792,7 +785,7 @@ cd ../avahi-ui-sharp %makeinstall %if !%build_core cd .. -%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT +make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT %endif %if %build_core # do not remove this unless you plan to fix _all_ the references to @@ -864,8 +857,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %endif %fdupes $RPM_BUILD_ROOT%{_libdir} -%clean -rm -rf $RPM_BUILD_ROOT %if %build_core %pre diff --git a/avahi-mono.changes b/avahi-mono.changes index e8832a0..cce2ad4 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 17 13:52:32 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build +- Add libavahi-devel to baselibs + ------------------------------------------------------------------- Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz diff --git a/avahi-mono.spec b/avahi-mono.spec index 4c87489..e725158 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: avahi-mono @@ -31,7 +30,7 @@ Name: avahi-mono %define build_qt3 0 %define build_qt4 0 Version: 0.6.30 -Release: 3 +Release: 5 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -131,10 +130,20 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + %if %build_core %package -n libavahi-client3 - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -153,7 +162,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -172,7 +180,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -191,7 +198,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd - License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries @@ -230,7 +236,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 - License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries @@ -254,7 +259,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi - License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils @@ -279,7 +283,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils - License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} @@ -299,7 +302,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel - License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # @@ -323,7 +325,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel - License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} @@ -347,7 +348,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel - License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} @@ -392,7 +392,6 @@ across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -557,7 +556,6 @@ across LAN segments. %package -n libavahi-qt3-1 - Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -581,7 +579,6 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel - Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ @@ -659,6 +656,7 @@ correct mDNS reflection across LAN segments. %if %build_mono %package -n avahi-mono + License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} @@ -676,6 +674,17 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + %endif %lang_package %endif @@ -757,7 +766,7 @@ intltoolize -f %if %build_glib2 && !%build_core for DIR in avahi-glib avahi-gobject avahi-ui avahi-discover-standalone avahi-python man ; do cd $DIR -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd .. done %endif @@ -769,10 +778,10 @@ cd avahi-qt %endif %if %build_mono && !%build_core cd avahi-sharp -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd ../avahi-ui-sharp %endif -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %if %build_glib2 && !%build_core @@ -797,7 +806,7 @@ cd ../avahi-ui-sharp %makeinstall %if !%build_core cd .. -%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT +make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT %endif %if %build_core # do not remove this unless you plan to fix _all_ the references to @@ -869,8 +878,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %endif %fdupes $RPM_BUILD_ROOT%{_libdir} -%clean -rm -rf $RPM_BUILD_ROOT %if %build_core %pre diff --git a/avahi-qt4.changes b/avahi-qt4.changes index 28561d2..a3da1f7 100644 --- a/avahi-qt4.changes +++ b/avahi-qt4.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 17 13:52:41 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build +- Add libavahi-devel to baselibs + ------------------------------------------------------------------- Fri Aug 12 18:57:25 UTC 2011 - andrea.turrini@gmail.com diff --git a/avahi-qt4.spec b/avahi-qt4.spec index e2c0371..1d793e4 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: avahi-qt4 @@ -31,7 +30,7 @@ Name: avahi-qt4 %define build_qt3 0 %define build_qt4 1 Version: 0.6.30 -Release: 3 +Release: 5 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -132,12 +131,11 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection across LAN segments. +correct mDNS reflection accross LAN segments. %if %build_core %package -n libavahi-client3 - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -156,7 +154,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -175,7 +172,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -194,7 +190,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd - License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries @@ -233,7 +228,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 - License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries @@ -257,7 +251,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi - License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils @@ -282,7 +275,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils - License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} @@ -302,7 +294,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel - License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # @@ -326,7 +317,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel - License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} @@ -350,7 +340,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel - License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} @@ -395,7 +384,6 @@ across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -560,7 +548,6 @@ across LAN segments. %package -n libavahi-qt3-1 - Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -584,7 +571,6 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel - Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ @@ -610,6 +596,7 @@ correct mDNS reflection across LAN segments. %if %build_qt4 %package -n libavahi-qt4-1 + License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE @@ -633,6 +620,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel + License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel @@ -759,7 +747,7 @@ intltoolize -f %if %build_glib2 && !%build_core for DIR in avahi-glib avahi-gobject avahi-ui avahi-discover-standalone avahi-python man ; do cd $DIR -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd .. done %endif @@ -771,10 +759,10 @@ cd avahi-qt %endif %if %build_mono && !%build_core cd avahi-sharp -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd ../avahi-ui-sharp %endif -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %if %build_glib2 && !%build_core @@ -799,7 +787,7 @@ cd ../avahi-ui-sharp %makeinstall %if !%build_core cd .. -%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT +make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT %endif %if %build_core # do not remove this unless you plan to fix _all_ the references to @@ -871,8 +859,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %endif %fdupes $RPM_BUILD_ROOT%{_libdir} -%clean -rm -rf $RPM_BUILD_ROOT %if %build_core %pre diff --git a/avahi.changes b/avahi.changes index 06350c0..05af814 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 17 13:52:05 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build +- Add libavahi-devel to baselibs + ------------------------------------------------------------------- Sat Jul 2 12:18:24 UTC 2011 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index 5521f8e..e1338f8 100644 --- a/avahi.spec +++ b/avahi.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: avahi @@ -385,7 +384,6 @@ across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -550,7 +548,6 @@ across LAN segments. %package -n libavahi-qt3-1 - Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -574,7 +571,6 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel - Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ @@ -751,7 +747,7 @@ intltoolize -f %if %build_glib2 && !%build_core for DIR in avahi-glib avahi-gobject avahi-ui avahi-discover-standalone avahi-python man ; do cd $DIR -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd .. done %endif @@ -763,10 +759,10 @@ cd avahi-qt %endif %if %build_mono && !%build_core cd avahi-sharp -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} cd ../avahi-ui-sharp %endif -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %if %build_glib2 && !%build_core @@ -791,7 +787,7 @@ cd ../avahi-ui-sharp %makeinstall %if !%build_core cd .. -%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT +make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT %endif %if %build_core # do not remove this unless you plan to fix _all_ the references to @@ -863,8 +859,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %endif %fdupes $RPM_BUILD_ROOT%{_libdir} -%clean -rm -rf $RPM_BUILD_ROOT %if %build_core %pre diff --git a/baselibs.conf b/baselibs.conf index 35ce2b3..bdc8052 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -11,4 +11,8 @@ libdns_sd provides "avahi-compat-mDNSResponder- = " obsoletes "mDNSResponder-lib- <= 107" obsoletes "mDNSResponder- <= 107" - +libavahi-devel + requires -libavahi- + requires "libavahi-common3- = " + requires "libavahi-core7- = " + requires "libavahi-client3- = "