packages: dbus/dbus.spec - dbus-x11 subpackage

[glen]

Author: glen                         Date: Fri Aug 12 22:31:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dbus-x11 subpackage

---- Files affected:
packages/dbus:
   dbus.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: packages/dbus/dbus.spec
diff -u packages/dbus/dbus.spec:1.217 packages/dbus/dbus.spec:1.218
--- packages/dbus/dbus.spec:1.217	Tue Aug  2 18:50:17 2011
+++ packages/dbus/dbus.spec	Sat Aug 13 00:31:27 2011
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Magistrala przesyłania komunikatów D-BUS
 Name:		dbus
 Version:	1.4.14
-Release:	1
+Release:	2
 License:	AFL v2.1 or GPL v2
 Group:		Libraries
 Source0:	http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -52,7 +52,6 @@
 Requires:	rc-scripts >= 0.4.1.26
 Provides:	group(messagebus)
 Provides:	user(messagebus)
-Obsoletes:	dbus-X11
 Obsoletes:	dbus-glib-tools
 Conflicts:	pam < 0.99.7.1
 # not available for dbus 0.9x yet(?)
@@ -128,6 +127,16 @@
 %description static -l pl.UTF-8
 Statyczna biblioteka D-BUS.
 
+%package x11
+Summary:	X11-requiring add-ons for D-BUS
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	dbus-X11
+
+%description x11
+D-BUS contains some tools that require Xlib to be installed, those are
+in this separate package so server systems need not install X.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -231,8 +240,6 @@
 %attr(755,root,root) %{_bindir}/dbus-cleanup-sockets
 %attr(755,root,root) %{_bindir}/dbus-daemon
 %attr(755,root,root) %{_bindir}/dbus-uuidgen
-# R: libX11
-%attr(755,root,root) %{_bindir}/dbus-launch
 %attr(755,root,root) %{_bindir}/dbus-monitor
 %attr(755,root,root) %{_bindir}/dbus-send
 %attr(4754,root,messagebus) %{_libdir}/dbus-daemon-launch-helper
@@ -240,17 +247,15 @@
 %dir %{_datadir}/dbus-1/interfaces
 %dir %{_datadir}/dbus-1/services
 %dir %{_datadir}/dbus-1/system-services
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/*.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/*.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/messagebus
 %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/*.sh
 %dir %{_localstatedir}/run/dbus
 %dir /var/lib/dbus
 %{_mandir}/man1/dbus-cleanup-sockets.1*
 %{_mandir}/man1/dbus-daemon.1*
 %{_mandir}/man1/dbus-uuidgen.1*
-%{_mandir}/man1/dbus-launch.1*
 %{_mandir}/man1/dbus-monitor.1*
 %{_mandir}/man1/dbus-send.1*
 
@@ -262,9 +267,9 @@
 
 %files dirs
 %defattr(644,root,root,755)
-%dir %{_sysconfdir}/dbus-1
-%dir %{_sysconfdir}/dbus-1/system.d
-%dir %{_sysconfdir}/dbus-1/session.d
+%dir /etc/dbus-1
+%dir /etc/dbus-1/system.d
+%dir /etc/dbus-1/session.d
 
 %files libs
 %defattr(644,root,root,755)
@@ -286,12 +291,21 @@
 %defattr(644,root,root,755)
 %{_libdir}/libdbus-1.a
 
+%files x11
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/dbus-launch
+%{_mandir}/man1/dbus-launch.1*
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2011/08/12 22:31:27  glen
+- dbus-x11 subpackage
+
 Revision 1.217  2011/08/02 16:50:17  qboosh
 - updated to 1.4.14 (fixes CVE-2011-2200)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dbus/dbus.spec?r1=1.217&r2=1.218&f=u