Author: qboosh Date: Sun Mar 5 18:04:42 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- disable qt4 support (broken atm)
- updated nolibs patch to remove unnecessary linking with -lSM
- moved dbus-launch(1) manual to base package (which contains dbus-launch)
---- Files affected:
SPECS:
dbus.spec (1.125 -> 1.126)
---- Diffs:
================================================================
Index: SPECS/dbus.spec
diff -u SPECS/dbus.spec:1.125 SPECS/dbus.spec:1.126
--- SPECS/dbus.spec:1.125 Sat Feb 25 10:13:02 2006
+++ SPECS/dbus.spec Sun Mar 5 19:04:36 2006
@@ -9,7 +9,8 @@
%bcond_without glib # without glib support
%bcond_without gtk # without GTK+ programs
%bcond_without python # without Python support
-%bcond_without qt # without Qt support
+%bcond_without qt # without Qt 3.x support
+%bcond_with qt4 # with Qt 4.x support (broken)
#
%{?with_dotnet:%include /usr/lib/rpm/macros.mono}
@@ -54,7 +55,6 @@
%{?with_gcj:BuildRequires: gcc-java >= 5:4.0}
%{?with_glib:BuildRequires: glib2-devel >= %{glib2_version}}
%{?with_gtk:BuildRequires: gtk+2-devel >= %{gtk2_version}}
-BuildRequires: xorg-lib-libSM-devel
BuildRequires: xorg-lib-libX11-devel
%if %{with dotnet}
BuildRequires: mono-csharp >= 1.1.7
@@ -72,6 +72,12 @@
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
BuildRequires: xmlto
+%if %{with qt4}
+BuildRequires: QtCore-devel >= 4.1
+BuildRequires: QtTest-devel >= 4.1
+BuildRequires: QtXml-devel >= 4.1
+BuildRequires: qt4-build
+%endif
Requires(post,postun): /sbin/ldconfig
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
@@ -361,7 +367,8 @@
%{!?with_glib:--disable-glib} \
%{!?with_gtk:--disable-gtk} \
%{!?with_python:--disable-python} \
- %{?with_qt:--enable-qt3} \
+ %{?with_qt:--enable-qt3 --with-qt3-moc=/usr/bin/moc} \
+ %{?with_qt4:--enable-qt
--with-qt-moc=%{_libdir}/qt4/bin/moc}%{!?with_qt4:--with-qt-moc=/NOWHERE} \
--disable-asserts \
--disable-tests \
--enable-abstract-sockets \
@@ -436,6 +443,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/dbus-cleanup-sockets
%attr(755,root,root) %{_bindir}/dbus-daemon
+# R: libX11
%attr(755,root,root) %{_bindir}/dbus-launch
%attr(755,root,root) %{_bindir}/dbus-send
%dir %{_sysconfdir}/dbus-1
@@ -449,6 +457,7 @@
%dir %{_localstatedir}/run/dbus
%{_mandir}/man1/dbus-cleanup-sockets.1*
%{_mandir}/man1/dbus-daemon.1*
+%{_mandir}/man1/dbus-launch.1*
%{_mandir}/man1/dbus-send.1*
%files libs
@@ -504,7 +513,6 @@
%files X11
%defattr(644,root,root,755)
%attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/dbus.sh
-%{_mandir}/man1/dbus-launch.1*
%if %{with dotnet}
%files -n dotnet-%{name}-sharp
@@ -565,6 +573,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.126 2006/03/05 18:04:36 qboosh
+- disable qt4 support (broken atm)
+- updated nolibs patch to remove unnecessary linking with -lSM
+- moved dbus-launch(1) manual to base package (which contains dbus-launch)
+
Revision 1.125 2006/02/25 09:13:02 freetz
- 0.61, use epoches in version definitions, added separate define for gtk
requirement
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.125&r2=1.126&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
