- updated to 1.0.0

[packages/dbus.git] / dbus.spec

diff --git a/dbus.spec b/dbus.spec
index d25276b140d205aa7cdc35aacf7e7d56e1790663..2efb3ec51e83cf02826763f6a10dbc9b574fa246 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -4,12 +4,12 @@
 Summary:       D-BUS message bus
 Summary(pl):   Magistrala przesy³ania komunikatów D-BUS
 Name:          dbus
-Version:       0.91
+Version:       1.0.0
 Release:       1
 License:       AFL v2.1 or GPL v2
 Group:         Libraries
-Source0:       http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 3f641bf73bcc538d3871622799ce2cd0
+Source0:       http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
+# Source0-md5: 8261b2abac8281007fd3176930017302
 Source1:       messagebus.init
 Source2:       %{name}-daemon-1-profile.d-sh
 Source3:       %{name}-sysconfig
@@ -42,6 +42,8 @@ Provides:     group(messagebus)
 Provides:      user(messagebus)
 Obsoletes:     dbus-X11
 Obsoletes:     dbus-glib-tools
+# not available for dbus 0.9x yet(?)
+#Obsoletes:    dbus-gtk dbus-gcj dbus-gcj-devel dbus-gcj-static
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -126,7 +128,7 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/run/dbus
 
 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 %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
 
 %clean
@@ -155,17 +157,27 @@ fi
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
+%triggerpostun -- %{name} < 0.92
+%banner %{name} << EOF
+WARNING!!!
+configuration file /etc/sysconfig/dbus has been moved to /etc/sysconfig/messagebus!
+EOF
+
+mv -f /etc/sysconfig/messagebus{,.rpmnew}
+mv -f /etc/sysconfig/{dbus,messagebus}
+
 %files
 %defattr(644,root,root,755)
 %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
 %dir %{_sysconfdir}/dbus-1
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/*.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dbus
+%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
@@ -174,8 +186,10 @@ fi
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/services
 %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*