SPECS: dbus.spec - up to 0.36.2; enabled selinux; introduced X11 s...

Tue Aug 30 21:30:51 CEST 2005

Author: arekm                        Date: Tue Aug 30 19:30:51 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.36.2; enabled selinux; introduced X11 subpackage

---- Files affected:
SPECS:
   dbus.spec (1.94 -> 1.95) 

---- Diffs:

================================================================
Index: SPECS/dbus.spec
diff -u SPECS/dbus.spec:1.94 SPECS/dbus.spec:1.95

--- SPECS/dbus.spec:1.94	Sat Aug 27 23:02:32 2005
+++ SPECS/dbus.spec	Tue Aug 30 21:30:44 2005
@@ -1,16 +1,12 @@
 # $Revision$, $Date$
 #
-# TODO:
-# - separte X11 depended utilieties (like dbus-launch)
-# - SELinux support
-#
 # Conditional build:
 %bcond_without	glib	# without glib support
 %bcond_without	gtk	# without GTK+ programs
 %bcond_without	qt	# without Qt support
-%bcond_without	gcj	# without Java support
 %bcond_without	python	# without Python support
 %bcond_without	dotnet	# without .NET support
+%bcond_with	gcj	# with Java support
 #
 %if %{without glib}
 %undefine	with_gtk
@@ -22,12 +18,12 @@
 Summary:	D-BUS message bus
 Summary(pl):	Magistrala przesyłania komunikatów D-BUS
 Name:		dbus
-Version:	0.36.1
-Release:	0.1
+Version:	0.36.2
+Release:	1
 License:	AFL v2.1 or GPL v2
 Group:		Libraries
 Source0:	http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	48bcfc0806bb7bc914cc5cd2f7d40d69
+# Source0-md5:	45468e46967d3e70f082d0d0e6049225
 Source1:	messagebus.init
 Source2:	%{name}-daemon-1-profile.d-sh
 Source3:	%{name}-sysconfig
@@ -51,6 +47,7 @@
 %{?with_dotnet:BuildRequires:	dotnet-gtk-sharp-devel}
 %{?with_dotnet:BuildRequires:	mono-csharp >= 0.95}
 %{?with_dotnet:BuildRequires:	monodoc >= 0.16}
+BuildRequires:	libselinux-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 %if %{with python}
@@ -62,7 +59,7 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	libselinux-devel >= 1.17.13
 BuildRequires:	xmlto
-PreReq:	rc-scripts
+Requires:	rc-scripts
 Requires:	%{name}-libs = %{version}-%{release}
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
@@ -72,7 +69,6 @@
 Requires(post,postun):	/sbin/ldconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
-Requires:	xinitrc
 Provides:	group(messagebus)
 Provides:	user(messagebus)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -189,6 +185,19 @@
 %description gtk -l pl
 Oparte na GTK+ graficzne narzędzie do D-BUS.
 
+%package X11
+Summary:	X11 D-BUS utilities
+Summary(pl):	Narzędzia X11 D-BUSa
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	xinitrc
+
+%description X11
+X11 D-BUS utilities.
+
+%description X11 -l pl
+Narzędzia X11 D-BUSa.
+
 %package -n dotnet-%{name}-sharp
 Summary:	.NET library for using D-BUS
 Summary(pl):	Biblioteka .NET do używania D-BUS
@@ -324,7 +333,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	QTDIR=/usr \
+QTDIR=%{_prefix} \
 	%{!?with_glib:--disable-glib} \
 	%{!?with_gtk:--disable-gtk} \
 	%{!?with_qt:--disable-qt} \
@@ -336,6 +345,7 @@
 	%{?debug:--enable-verbose-mode} \
 	--disable-tests \
 	--enable-verbose-mode \
+	--enable-selinux \
 	--disable-asserts \
 	--with-xml=expat \
 	--enable-abstract-sockets \
@@ -351,7 +361,7 @@
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT/etc/profile.d
 install -d $RPM_BUILD_ROOT/etc/sysconfig
-install -d $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
 install -d $RPM_BUILD_ROOT%{_datadir}/dbus-1/services
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/dbus-1
 %if %{with dotnet}
@@ -365,7 +375,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/dbus
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/dbus.sh
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/dbus.sh
 
 %if %{with python}
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/%{name}/*.{py,la,a}
@@ -402,7 +412,7 @@
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
-		
+
 %post	glib -p /sbin/ldconfig
 %postun	glib -p /sbin/ldconfig
 
@@ -416,22 +426,18 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/dbus-cleanup-sockets
 %attr(755,root,root) %{_bindir}/dbus-daemon
-# dbus-launch R: XFree86-libs
-%attr(755,root,root) %{_bindir}/dbus-launch
 %attr(755,root,root) %{_bindir}/dbus-send
 %dir %{_sysconfdir}/dbus-1
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/dbus-1/*.conf
-%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/dbus
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/*.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dbus
 %attr(754,root,root) /etc/rc.d/init.d/*
 %attr(755,root,root) /etc/profile.d/dbus-daemon-1.sh
-%attr(755,root,root) /etc/X11/xinit/xinitrc.d/dbus.sh
 %dir %{_sysconfdir}/dbus-1/system.d
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/services
 %dir %{_localstatedir}/lib/dbus-1
 %{_mandir}/man1/dbus-cleanup-sockets.1*
 %{_mandir}/man1/dbus-daemon.1*
-%{_mandir}/man1/dbus-launch.1*
 %{_mandir}/man1/dbus-send.1*
 
 %files libs
@@ -484,6 +490,12 @@
 %attr(755,root,root) %{_bindir}/dbus-viewer
 %endif
 
+%files X11
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/dbus-launch
+%attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/dbus.sh
+%{_mandir}/man1/dbus-launch.1*
+
 %if %{with dotnet}
 %files -n dotnet-%{name}-sharp
 %defattr(644,root,root,755)
@@ -545,6 +557,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2005/08/30 19:30:44  arekm
+- up to 0.36.2; enabled selinux; introduced X11 subpackage
+
 Revision 1.94  2005/08/27 21:02:32  paladine
 - updated to 0.36.1
 
================================================================

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


