diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 40f1c3b..c649bf0 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jul 14 00:58:42 CEST 2010 - kay.sievers@novell.com + +- drop systemd-units + +------------------------------------------------------------------- +Sun Jul 11 00:39:51 CEST 2010 - kay.sievers@novell.com + +- update to 1.3.2 snapshot + - New standardized PropertiesChanged signal in the properties interface + - Support forking bus services, for compatibility +- install systemd service files + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + ------------------------------------------------------------------- Thu Mar 25 15:44:39 CET 2010 - vuntz@opensuse.org diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index e37e6b7..a5baf10 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -1,5 +1,5 @@ # -# spec file for package dbus-1-x11 (Version 1.2.24) +# spec file for package dbus-1-x11 (Version 1.3.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ Summary: D-Bus Message Bus System # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig BuildRequires: audit-devel -Version: 1.2.24 +Version: 1.3.2 Release: 1 AutoReqProv: on # bug437293 @@ -71,6 +71,7 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %if 0%{?suse_version} > 1000 export CFLAGS="$CFLAGS -fstack-protector" export CXXFLAGS="$CXXFLAGS -fstack-protector" +export V=1 %endif %configure \ --disable-static \ @@ -85,8 +86,9 @@ export CXXFLAGS="$CXXFLAGS -fstack-protector" --enable-selinux \ %endif --enable-libaudit \ - --with-console-auth-dir=/var/run/dbus/at_console/ -make %{?jobs:-j %jobs} + --with-console-auth-dir=/var/run/dbus/at_console/ \ + --with-systemdsystemunitdir=/lib/systemd/system +make %{?_smp_mflags} doxygen -u && doxygen ./cleanup-man-pages.sh diff --git a/dbus-1.2.24.tar.bz2 b/dbus-1.2.24.tar.bz2 deleted file mode 100644 index c4f2c04..0000000 --- a/dbus-1.2.24.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67bb24487fe8f6b0fcb2c4fd9a9edc0a64e5fca2b0967244ed1379da114b9481 -size 1337397 diff --git a/dbus-1.3.2.tar.bz2 b/dbus-1.3.2.tar.bz2 new file mode 100644 index 0000000..b2c9c04 --- /dev/null +++ b/dbus-1.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15db17f653067bc2944135cf93fa068959aa4144d812b7c9bca14073e136bad8 +size 1427480 diff --git a/dbus-1.changes b/dbus-1.changes index 40f1c3b..c649bf0 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jul 14 00:58:42 CEST 2010 - kay.sievers@novell.com + +- drop systemd-units + +------------------------------------------------------------------- +Sun Jul 11 00:39:51 CEST 2010 - kay.sievers@novell.com + +- update to 1.3.2 snapshot + - New standardized PropertiesChanged signal in the properties interface + - Support forking bus services, for compatibility +- install systemd service files + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + ------------------------------------------------------------------- Thu Mar 25 15:44:39 CET 2010 - vuntz@opensuse.org diff --git a/dbus-1.spec b/dbus-1.spec index cd19f88..7a0a089 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -1,5 +1,5 @@ # -# spec file for package dbus-1 (Version 1.2.24) +# spec file for package dbus-1 (Version 1.3.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,13 +20,13 @@ Name: dbus-1 Url: http://dbus.freedesktop.org/ -License: Dual GPLv2 or AFLv2.1 +License: Other uncritical OpenSource License Group: System/Daemons Summary: D-Bus Message Bus System # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig BuildRequires: audit-devel -Version: 1.2.24 +Version: 1.3.2 Release: 1 AutoReqProv: on # bug437293 @@ -105,6 +105,7 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %if 0%{?suse_version} > 1000 export CFLAGS="$CFLAGS -fstack-protector" export CXXFLAGS="$CXXFLAGS -fstack-protector" +export V=1 %endif %configure \ --disable-static \ @@ -119,8 +120,9 @@ export CXXFLAGS="$CXXFLAGS -fstack-protector" --enable-selinux \ %endif --enable-libaudit \ - --with-console-auth-dir=/var/run/dbus/at_console/ -make %{?jobs:-j %jobs} + --with-console-auth-dir=/var/run/dbus/at_console/ \ + --with-systemdsystemunitdir=/lib/systemd/system +make %{?_smp_mflags} doxygen -u && doxygen ./cleanup-man-pages.sh @@ -167,10 +169,12 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id %preun %{stop_on_removal dbus} +/usr/bin/systemd-install --realize=reload disable dbus.service >/dev/null 2>&1 || : %post /bin/dbus-uuidgen --ensure %{insserv_force_if_yast dbus} +/usr/bin/systemd-install --realize=reload enable dbus.service >/dev/null 2>&1 || : /sbin/ldconfig %{run_permissions} %verifyscript @@ -190,7 +194,11 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id %dir %{_localstatedir}/lib/dbus %dir /lib/dbus-1 %doc AUTHORS COPYING HACKING NEWS README -%{_sysconfdir}/dbus-1 +%dir %{_sysconfdir}/dbus-1 +%dir %{_sysconfdir}/dbus-1/session.d +%dir %{_sysconfdir}/dbus-1/system.d +%config(noreplace) %{_sysconfdir}/dbus-1/session.conf +%config(noreplace) %{_sysconfdir}/dbus-1/system.conf %{_sysconfdir}/init.d/dbus %{_sysconfdir}/ConsoleKit /bin/dbus-cleanup-sockets @@ -205,12 +213,15 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id %{_mandir}/man1/dbus-send.1.* %{_mandir}/man1/dbus-uuidgen.1.* %{_sbindir}/rcdbus -%attr(-,messagebus,messagebus) %{_localstatedir}/run/dbus # See doc/system-activation.txt in source tarball for the rationale # behind these permissions %attr(4750,root,messagebus) /lib/%{name}/dbus-daemon-launch-helper %verify(not mode) /lib/%{name}/dbus-daemon-launch-helper -%ghost /var/lib/dbus/machine-id +%ghost %{_localstatedir}/run/dbus +%ghost %{_localstatedir}/lib/dbus/machine-id +/lib/systemd/system/dbus.service +/lib/systemd/system/dbus.socket +/lib/systemd/system/dbus.target.wants/dbus.socket %files -n dbus-1-devel %defattr(-,root,root)