- qt4 bindings (#446904)

- devel: BR: pkgconfig
- nuke rpaths

avahi.spec

@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.22
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPLv2
@@ -16,12 +16,16 @@ Requires:       dbus, expat
 Requires:       libdaemon >= 0.11
 Requires(post): initscripts, chkconfig, ldconfig
 Requires(pre):  shadow-utils
+BuildRequires:  automake libtool
 BuildRequires:  dbus-devel >= 0.90
 BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  dbus-python
 BuildRequires:  libxml2-python
 BuildRequires:  gtk2-devel
+%if 0%{?fedora} > 8
 BuildRequires:  qt3-devel
+BuildRequires:  qt4-devel
+%endif
 BuildRequires:  libglade2-devel
 BuildRequires:  libdaemon-devel >= 0.11
 BuildRequires:  glib2-devel
@@ -132,7 +136,6 @@ necessary for developing programs using avahi-ui.
 Summary: Qt3 libraries for avahi
 Group: System Environment/Base
 Requires: %{name} = %{version}-%{release}
-Requires: qt3
 
 %description qt3
 Libraries for easy use of avahi from Qt3 applications.
@@ -148,6 +151,25 @@ Requires: qt3-devel
 The avahi-qt3-devel package contains the header files and libraries
 necessary for developing programs using avahi with Qt3.
 
+%package qt4
+Summary: Qt4 libraries for avahi
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+
+%description qt4
+Libraries for easy use of avahi from Qt4 applications.
+
+%package qt4-devel
+Summary: Libraries and header files for avahi Qt4 development
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-qt4 = %{version}-%{release}
+Requires: qt4-devel
+
+%description qt4-devel
+Th avahi-qt4-devel package contains the header files and libraries
+necessary for developing programs using avahi with Qt4.
+
 %if %{WITH_MONO}
 %package sharp
 Summary:   Mono language bindings for avahi mono development
@@ -174,6 +196,7 @@ mono programs that use avahi-ui.
 Summary:  Libraries and header files for avahi development
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 The avahi-devel package contains the header files and libraries
@@ -247,9 +270,12 @@ fashion with mDNS.
 %patch3 -p1 -b .vncviewer
 %patch4 -p1 -b .update-de
 
+# nuke rpath, TODO: double-check if still required on new releases
+autoreconf 
+
 %build
 
-%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --with-avahi-priv-access-group=avahi --with-autoipd-user=avahi-autoipd --with-autoipd-group=avahi-autoipd \
+%configure --with-distro=fedora --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --with-avahi-priv-access-group=avahi --with-autoipd-user=avahi-autoipd --with-autoipd-group=avahi-autoipd \
 %if %{WITH_COMPAT_DNSSD}
         --enable-compat-libdns_sd \
 %endif
@@ -257,6 +283,10 @@ fashion with mDNS.
         --disable-mono \
 %endif
 ;
+
+# less invasible anti-rpath hack if one wants to avoid auto*foo
+#sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' libtool
+
 make %{?_smp_mflags}
 #make %{?_smp_mflags} avahi.devhelp doxygen-run
 
@@ -369,6 +399,9 @@ fi
 %post qt3 -p /sbin/ldconfig
 %postun qt3 -p /sbin/ldconfig
 
+%post qt4 -p /sbin/ldconfig
+%postun qt4 -p /sbin/ldconfig
+
 %post ui -p /sbin/ldconfig
 %postun ui -p /sbin/ldconfig
 
@@ -477,9 +510,19 @@ fi
 %files qt3-devel
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libavahi-qt3.so
-%{_includedir}/avahi-qt3
+%{_includedir}/avahi-qt3/
 %{_libdir}/pkgconfig/avahi-qt3.pc
 
+%files qt4
+%defattr(0644, root, root, 0755)
+%attr(755,root,root) %{_libdir}/libavahi-qt4.so.*
+
+%files qt4-devel
+%defattr(0644, root, root, 0755)
+%attr(755,root,root) %{_libdir}/libavahi-qt4.so
+%{_includedir}/avahi-qt4/
+%{_libdir}/pkgconfig/avahi-qt4.pc
+
 %if %{WITH_MONO}
 %files sharp
 %defattr(0644, root, root, 0755)
@@ -522,6 +565,11 @@ fi
 %endif
 
 %changelog
+* Wed Jun 04 2008 Rex Deiter <rdieter@fedoraproject.org> - 0.6.22-11
+- qt4 bindings (#446904)
+- devel: BR: pkgconfig
+- nuke rpaths
+
 * Thu Mar 27 2008 Lennart Poettering <lpoetter@redhat.com> - 0.6.22-10
 - Add release part to package dependencies (Closed #311601)