SPECS (AC-branch): dbus.spec - merged from HEAD

baggins baggins at pld-linux.org
Mon May 15 00:49:31 CEST 2006 

Author: baggins                      Date: Sun May 14 22:49:31 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   dbus.spec (1.111.2.7 -> 1.111.2.8) 

---- Diffs:

================================================================
Index: SPECS/dbus.spec
diff -u SPECS/dbus.spec:1.111.2.7 SPECS/dbus.spec:1.111.2.8
--- SPECS/dbus.spec:1.111.2.7	Fri Apr 14 16:35:41 2006
+++ SPECS/dbus.spec	Mon May 15 00:49:26 2006
@@ -1,12 +1,16 @@
 # $Revision$, $Date$
 #
+# TODO:
+# - qt4 bindings
+#
 # Conditional build:
+%bcond_without	dotnet	# without .NET support
+%bcond_without	gcj	# without Java support
 %bcond_without	glib	# without glib support
 %bcond_without	gtk	# without GTK+ programs
-%bcond_without	qt	# without Qt support
 %bcond_without	python	# without Python support
-%bcond_without	dotnet	# without .NET support
-%bcond_with	gcj	# with Java 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}
 
@@ -18,18 +22,20 @@
 %undefine with_dotnet
 %endif
 
-%define		expat_version	1.95.5
-%define		glib2_version	2.2.0
-%define		qt_version	3.1.0
+%define		expat_version	1:1.95.5
+%define		glib2_version	1:2.2.0
+%define		gtk2_version	2:2.4.0
+%define		qt_version	6:3.1.0
+
 Summary:	D-BUS message bus
 Summary(pl):	Magistrala przesyłania komunikatów D-BUS
 Name:		dbus
-Version:	0.50
-Release:	6
+Version:	0.61
+Release:	3
 License:	AFL v2.1 or GPL v2
 Group:		Libraries
 Source0:	http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	1addd5b600a8a4550766005d1f59401b
+# Source0-md5:	cfd4f26004e4304e0dace4d82894e50b
 Source1:	messagebus.init
 Source2:	%{name}-daemon-1-profile.d-sh
 Source3:	%{name}-sysconfig
@@ -39,6 +45,7 @@
 Patch2:		%{name}-mint.patch
 Patch3:		%{name}-python_fixes.patch
 Patch4:		%{name}-monodir.patch
+Patch5:		%{name}-gcj.patch
 URL:		http://www.freedesktop.org/Software/dbus
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf >= 2.52
@@ -47,11 +54,9 @@
 BuildRequires:	doxygen
 BuildRequires:	expat-devel >= 1:%{expat_version}
 %{?with_gcj:BuildRequires:	gcc-java >= 5:4.0}
-%{?with_glib:BuildRequires:	glib2-devel >= 1:%{glib2_version}}
-%{?with_gtk:BuildRequires:	gtk+2-devel >= 2:%{glib2_version}}
+%{?with_glib:BuildRequires:	glib2-devel >= %{glib2_version}}
+%{?with_gtk:BuildRequires:	gtk+2-devel >= %{gtk2_version}}
 %if %{with dotnet}
-# just gtk-sharp for examples
-BuildRequires:	dotnet-gtk-sharp-devel
 BuildRequires:	mono-csharp >= 1.1.7
 BuildRequires:	monodoc >= 1.0.7-2
 %endif
@@ -63,9 +68,16 @@
 BuildRequires:	python-devel >= 2.2
 %endif
 %{?with_qt:BuildRequires:	qt-devel >= 6:%{qt_version}}
+%{?with_python:BuildRequires:	rpm-pythonprov}
 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
@@ -184,6 +196,7 @@
 Summary(pl):	Oparte na GTK+ graficzne narzędzie do D-BUS
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-X11 = %{version}-%{release}
 Requires:	%{name}-glib = %{version}-%{release}
 
 %description gtk
@@ -209,7 +222,7 @@
 Summary:	.NET library for using D-BUS
 Summary(pl):	Biblioteka .NET do używania D-BUS
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	mono >= 1.1.7
 
 %description -n dotnet-%{name}-sharp
@@ -314,6 +327,7 @@
 Group:		Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 %pyrequires_eq	python
+Requires:	python-libxml2
 
 %description -n python-dbus
 D-BUS add-on library to integrate the standard D-BUS library with
@@ -330,8 +344,12 @@
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
-sed -i 's:JAR.*=.*jar:JAR=fastjar:g' gcj/Makefile.{am,in}
-sed -i -e 's/DBUS_QT_LIBS=.*/DBUS_QT_LIBS="-lqt-mt"/' configure.in
+%patch5 -p1
+sed -i -e 's/DBUS_QT3_LIBS=.*/DBUS_QT3_LIBS="-lqt-mt"/' configure.in
+
+# don't build dotnet-gtk-sharp based examples
+# (depends on old gtk-sharp)
+sed -i -e 's/example//' mono/Makefile.am
 
 %build
 %{__libtoolize}
@@ -340,25 +358,28 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	GCJFLAGS="%{rpmcflags}" \
 	QTDIR=/usr \
 	%{?debug:--enable-verbose-mode} \
-	%{!?with_dotnet:--disable-mono} \
-	%{!?with_dotnet:--disable-mono-docs} \
+	%{?with_dotnet:--enable-mono} \
+	%{?with_dotnet:--enable-mono-docs} \
 	%{!?with_gcj:--disable-gcj} \
 	%{?with_gcj:--enable-gcj} \
 	%{!?with_glib:--disable-glib} \
 	%{!?with_gtk:--disable-gtk} \
 	%{!?with_python:--disable-python} \
-	%{!?with_qt:--disable-qt} \
+	%{?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 \
 	--enable-selinux \
-	--enable-verbose-mode \
+	--with-console-auth-dir=%{_localstatedir}/lock/console/ \
 	--with-session-socket-dir=/tmp \
 	--with-system-pid-file=%{_localstatedir}/run/dbus.pid \
 	--with-xml=expat
 %{__make} \
+	JAR=fastjar \
 	pythondir=%{py_sitedir}
 
 %install
@@ -372,6 +393,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	JAR=fastjar \
 	pythondir=%{py_sitedir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus
@@ -422,6 +444,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
@@ -435,6 +458,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
@@ -490,7 +514,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
@@ -539,7 +562,7 @@
 %if %{with python}
 %files -n python-dbus
 %defattr(644,root,root,755)
-%dir %{py_sitedir}/%{name}/
+%dir %{py_sitedir}/%{name}
 %attr(755,root,root) %{py_sitedir}/%{name}/*.so
 %{py_sitedir}/dbus.pth
 %{py_sitedir}/%{name}/*.py[co]
@@ -551,6 +574,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111.2.8  2006/05/14 22:49:26  baggins
+- merged from HEAD
+
 Revision 1.111.2.7  2006/04/14 14:35:41  glen
 - rel 6
 
@@ -572,6 +598,65 @@
 Revision 1.111.2.1  2006/01/31 14:04:01  baggins
 - release 5
 - fixed stop and status in initscript
+
+Revision 1.129  2006/04/02 09:57:00  qboosh
+- dotnet deps fixes (merged from for-AC branch)
+
+Revision 1.128  2006/03/20 20:44:32  freetz
+- rel.3 for rebuild with fixed rpm
+
+Revision 1.127  2006/03/19 22:48:46  freetz
+- R: python-libxml2 for python subpkg, rel.2
+
+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
+
+Revision 1.124  2006/02/24 15:24:30  glen
+- glib/gtk+/expat epoches
+
+Revision 1.123  2006/02/24 15:20:43  glen
+- qt epoch
+
+Revision 1.122  2006/02/24 15:20:04  glen
+- use %service
+
+Revision 1.121  2006/02/19 21:10:03  freetz
+- rel.4
+
+Revision 1.120  2006/02/19 18:18:14  freetz
+- make use of at_console security policy
+
+Revision 1.119  2006/02/12 15:01:10  pluto
+- xorg modular BRs, release 3.
+
+Revision 1.118  2006/01/28 09:02:52  freetz
+- drop dotnet-gtk-sharp based examples
+
+Revision 1.117  2006/01/26 15:50:27  freetz
+- rel.2
+
+Revision 1.116  2006/01/23 21:10:28  qboosh
+- added gcj patch (fixes java build), pass GCJFLAGS (=rpmcflags)
+- updated DBUS_QT_LIBS->DBUS_QT3_LIBS hack
+
+Revision 1.115  2006/01/20 11:59:33  freetz
+- fix dotnet build
+
+Revision 1.114  2006/01/18 18:38:57  freetz
+- 0.60, dotnet not tested (we got broken mono stuff), build gcj by default,
+  TODO added
+
+Revision 1.113  2005/12/11 22:14:17  adamg
+- BR: rpm-pythonprov if --with python
+
+Revision 1.112  2005/12/08 04:26:53  aredridel
+- dbus-gtk requires dbus-X11 -- perhaps dependent apps should require this?
 
 Revision 1.111  2005/12/03 16:19:35  qboosh
 - release 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.111.2.7&r2=1.111.2.8&f=u

More information about the pld-cvs-commit mailing list