rpms/avahi/devel avahi.spec,1.106,1.107
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Jun 4 14:10:52 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15413
Modified Files:
avahi.spec
Log Message:
* Wed Jun 04 2008 Rex Deiter <rdieter at fedoraproject.org> - 0.6.22-11
- qt4 bindings (#446904)
- devel: BR: pkgconfig
- nuke rpaths
Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- avahi.spec 27 Mar 2008 18:17:07 -0000 1.106
+++ avahi.spec 4 Jun 2008 14:10:03 -0000 1.107
@@ -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: 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 @@
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 @@
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 @@
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 @@
%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 @@
--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 @@
%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 @@
%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 @@
%endif
%changelog
+* Wed Jun 04 2008 Rex Deiter <rdieter at fedoraproject.org> - 0.6.22-11
+- qt4 bindings (#446904)
+- devel: BR: pkgconfig
+- nuke rpaths
+
* Thu Mar 27 2008 Lennart Poettering <lpoetter at redhat.com> - 0.6.22-10
- Add release part to package dependencies (Closed #311601)
More information about the scm-commits
mailing list