From b07424b61d6cf05a6c1b7fbf51c23682686d14907e13455f1202153e48cf3f23 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 28 Jun 2010 21:27:45 +0000 Subject: [PATCH 1/5] Accepting request 42119 from home:jengelh:smp Copy from home:jengelh:smp/dbus-1 via accept of submit request 42119 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/42119 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=18 --- dbus-1-x11.changes | 5 +++++ dbus-1-x11.spec | 2 +- dbus-1.changes | 5 +++++ dbus-1.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 40f1c3b..3553776 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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..09a76f5 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -86,7 +86,7 @@ export CXXFLAGS="$CXXFLAGS -fstack-protector" %endif --enable-libaudit \ --with-console-auth-dir=/var/run/dbus/at_console/ -make %{?jobs:-j %jobs} +make %{?_smp_mflags} doxygen -u && doxygen ./cleanup-man-pages.sh diff --git a/dbus-1.changes b/dbus-1.changes index 40f1c3b..3553776 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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..9481cf8 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -120,7 +120,7 @@ export CXXFLAGS="$CXXFLAGS -fstack-protector" %endif --enable-libaudit \ --with-console-auth-dir=/var/run/dbus/at_console/ -make %{?jobs:-j %jobs} +make %{?_smp_mflags} doxygen -u && doxygen ./cleanup-man-pages.sh From edc8e00ed7b079ea502c4783ad298ad19498965c0dfd21a0f4a4c294c40f04b4 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sat, 10 Jul 2010 22:49:59 +0000 Subject: [PATCH 2/5] version 1.3.2 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=19 --- dbus-1-x11.changes | 8 ++++++++ dbus-1-x11.spec | 9 +++++---- dbus-1.2.24.tar.bz2 | 3 --- dbus-1.3.2.tar.bz2 | 3 +++ dbus-1.changes | 8 ++++++++ dbus-1.spec | 19 +++++++++++++++---- 6 files changed, 39 insertions(+), 11 deletions(-) delete mode 100644 dbus-1.2.24.tar.bz2 create mode 100644 dbus-1.3.2.tar.bz2 diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 3553776..2a6fd02 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index 09a76f5..7d3b343 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -1,7 +1,7 @@ # -# spec file for package dbus-1-x11 (Version 1.2.24) +# spec file for package dbus-1-x11 (Version 1.2.16) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ # norootforbuild - Name: dbus-1-x11 BuildRequires: xorg-x11-devel Url: http://dbus.freedesktop.org/ @@ -28,9 +27,10 @@ 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 +BuildRequires: systemd-units # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit @@ -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 \ 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 3553776..2a6fd02 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/dbus-1.spec b/dbus-1.spec index 9481cf8..8d90d94 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -26,9 +26,10 @@ 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 +BuildRequires: systemd-units # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit @@ -105,6 +106,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 \ @@ -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) From 46b551502713bca36d7ed407ca38c6388ca7c1fa2c70e0a4342e9ba861232850 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 13 Jul 2010 22:59:19 +0000 Subject: [PATCH 3/5] update OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=20 --- dbus-1.changes | 5 +++++ dbus-1.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dbus-1.changes b/dbus-1.changes index 2a6fd02..c649bf0 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/dbus-1.spec b/dbus-1.spec index 8d90d94..0556576 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -29,7 +29,6 @@ BuildRequires: audit-devel Version: 1.3.2 Release: 1 AutoReqProv: on -BuildRequires: systemd-units # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit @@ -121,7 +120,8 @@ export V=1 --enable-selinux \ %endif --enable-libaudit \ - --with-console-auth-dir=/var/run/dbus/at_console/ + --with-console-auth-dir=/var/run/dbus/at_console/ \ + --with-systemdsystemunitdir=/lib/systemd/system make %{?_smp_mflags} doxygen -u && doxygen ./cleanup-man-pages.sh From 57232b8a5b915e9cbb8d614cd010998213d52d84b8c87cd99951065ebef12bca Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Jul 2010 18:18:19 +0000 Subject: [PATCH 4/5] Accepting request 43466 from Base:System checked in (request 43466) OBS-URL: https://build.opensuse.org/request/show/43466 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=21 --- dbus-1-x11.changes | 13 ------------- dbus-1-x11.spec | 11 +++++------ dbus-1.2.24.tar.bz2 | 3 +++ dbus-1.3.2.tar.bz2 | 3 --- dbus-1.changes | 18 ------------------ dbus-1.spec | 23 ++++++----------------- 6 files changed, 14 insertions(+), 57 deletions(-) create mode 100644 dbus-1.2.24.tar.bz2 delete mode 100644 dbus-1.3.2.tar.bz2 diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 2a6fd02..40f1c3b 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -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 7d3b343..e37e6b7 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -1,7 +1,7 @@ # -# spec file for package dbus-1-x11 (Version 1.2.16) +# spec file for package dbus-1-x11 (Version 1.2.24) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,7 @@ # norootforbuild + Name: dbus-1-x11 BuildRequires: xorg-x11-devel Url: http://dbus.freedesktop.org/ @@ -27,10 +28,9 @@ Summary: D-Bus Message Bus System # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig BuildRequires: audit-devel -Version: 1.3.2 +Version: 1.2.24 Release: 1 AutoReqProv: on -BuildRequires: systemd-units # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit @@ -71,7 +71,6 @@ 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 \ @@ -87,7 +86,7 @@ export V=1 %endif --enable-libaudit \ --with-console-auth-dir=/var/run/dbus/at_console/ -make %{?_smp_mflags} +make %{?jobs:-j %jobs} doxygen -u && doxygen ./cleanup-man-pages.sh diff --git a/dbus-1.2.24.tar.bz2 b/dbus-1.2.24.tar.bz2 new file mode 100644 index 0000000..c4f2c04 --- /dev/null +++ b/dbus-1.2.24.tar.bz2 @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index b2c9c04..0000000 --- a/dbus-1.3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15db17f653067bc2944135cf93fa068959aa4144d812b7c9bca14073e136bad8 -size 1427480 diff --git a/dbus-1.changes b/dbus-1.changes index c649bf0..40f1c3b 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,21 +1,3 @@ -------------------------------------------------------------------- -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 0556576..cd19f88 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -26,7 +26,7 @@ Summary: D-Bus Message Bus System # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig BuildRequires: audit-devel -Version: 1.3.2 +Version: 1.2.24 Release: 1 AutoReqProv: on # bug437293 @@ -105,7 +105,6 @@ 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 \ @@ -120,9 +119,8 @@ export V=1 --enable-selinux \ %endif --enable-libaudit \ - --with-console-auth-dir=/var/run/dbus/at_console/ \ - --with-systemdsystemunitdir=/lib/systemd/system -make %{?_smp_mflags} + --with-console-auth-dir=/var/run/dbus/at_console/ +make %{?jobs:-j %jobs} doxygen -u && doxygen ./cleanup-man-pages.sh @@ -169,12 +167,10 @@ 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 @@ -194,11 +190,7 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id %dir %{_localstatedir}/lib/dbus %dir /lib/dbus-1 %doc AUTHORS COPYING HACKING NEWS README -%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}/dbus-1 %{_sysconfdir}/init.d/dbus %{_sysconfdir}/ConsoleKit /bin/dbus-cleanup-sockets @@ -213,15 +205,12 @@ 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 %{_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 +%ghost /var/lib/dbus/machine-id %files -n dbus-1-devel %defattr(-,root,root) From e4a20fdc21153639b091e4bfdf52c3d82ab8f1a83ec824a471b95c06a04dc587 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 20 Jul 2010 18:18:20 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/dbus-1 revision 51.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=8add25ab073937d810f67bf4f859312d --- dbus-1-x11.changes | 18 ++++++++++++++++++ dbus-1-x11.spec | 10 ++++++---- dbus-1.2.24.tar.bz2 | 3 --- dbus-1.3.2.tar.bz2 | 3 +++ dbus-1.changes | 18 ++++++++++++++++++ dbus-1.spec | 27 +++++++++++++++++++-------- 6 files changed, 64 insertions(+), 15 deletions(-) delete mode 100644 dbus-1.2.24.tar.bz2 create mode 100644 dbus-1.3.2.tar.bz2 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)