[avahi] Add option to disable qt3 support (and disable on aarch64)
Peter Robinson
pbrobinson at fedoraproject.org
Wed Jan 8 08:05:40 UTC 2014
commit 2bfb049ad7d8b5aa14935e8a8cc50a5294e6754e
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Wed Jan 8 08:05:39 2014 +0000
Add option to disable qt3 support (and disable on aarch64)
avahi.spec | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/avahi.spec b/avahi.spec
index 987ad19..4d50897 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,12 +1,17 @@
%{?!WITH_MONO: %global WITH_MONO 1}
%{?!WITH_COMPAT_DNSSD: %global WITH_COMPAT_DNSSD 1}
%{?!WITH_COMPAT_HOWL: %global WITH_COMPAT_HOWL 1}
+%{?!WITH_QT3: %global WITH_QT3 1}
+
%ifarch sparc64 s390 aarch64
%define WITH_MONO 0
%endif
%if 0%{?rhel}
%define WITH_MONO 0
%endif
+%ifarch aarch64 %{ix86} x86_64
+%define WITH_QT3 0
+%endif
# http://bugzilla.redhat.com/1008395 - no hardened build
%global _hardened_build 1
@@ -16,7 +21,7 @@
Name: avahi
Version: 0.6.31
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: Local network service discovery
License: LGPLv2+
URL: http://avahi.org
@@ -39,7 +44,9 @@ BuildRequires: libxml2-python
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel >= 2.99.0
#BuildRequires: gobject-introspection-devel
+%if %{WITH_QT3}
BuildRequires: qt3-devel
+%endif
BuildRequires: qt4-devel
BuildRequires: libdaemon-devel >= 0.11
BuildRequires: glib2-devel
@@ -165,6 +172,7 @@ Requires: %{name}-ui-gtk3%{?_isa} = %{version}-%{release}
The avahi-ui-devel package contains the header files and libraries
necessary for developing programs using avahi-ui.
+%if %{WITH_QT3}
%package qt3
Summary: Qt3 libraries for avahi
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -180,6 +188,7 @@ Requires: %{name}-qt3%{?_isa} = %{version}-%{release}
%description qt3-devel
The avahi-qt3-devel package contains the header files and libraries
necessary for developing programs using avahi with Qt3.
+%endif
%package qt4
Summary: Qt4 libraries for avahi
@@ -335,6 +344,9 @@ NOCONFIGURE=1 ./autogen.sh
%if %{WITH_COMPAT_HOWL}
--enable-compat-howl \
%endif
+%if ! %{WITH_QT3}
+ --disable-qt3 \
+%endif
%if ! %{WITH_MONO}
--disable-mono \
%endif
@@ -442,8 +454,10 @@ exit 0
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+%if %{WITH_QT3}
%post qt3 -p /sbin/ldconfig
%postun qt3 -p /sbin/ldconfig
+%endif
%post qt4 -p /sbin/ldconfig
%postun qt4 -p /sbin/ldconfig
@@ -564,6 +578,7 @@ exit 0
%{_libdir}/pkgconfig/avahi-ui.pc
%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
+%if %{WITH_QT3}
%files qt3
%{_libdir}/libavahi-qt3.so.*
@@ -571,6 +586,7 @@ exit 0
%{_libdir}/libavahi-qt3.so
%{_includedir}/avahi-qt3/
%{_libdir}/pkgconfig/avahi-qt3.pc
+%endif
%files qt4
%{_libdir}/libavahi-qt4.so.*
@@ -618,6 +634,9 @@ exit 0
%endif
%changelog
+* Tue Jan 7 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.6.31-22
+- Add option to disable qt3 support (and disable on aarch64)
+
* Tue Oct 08 2013 Rex Dieter <rdieter at fedoraproject.org> 0.6.31-21
- avahi-libs should not require avahi, f20+ (#913168)
More information about the scm-commits
mailing list