pool/dbus-1
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=148

Browse Source
This commit is contained in:
Fridrich Strba 2014-01-09 16:06:33 +00:00 committed by Git OBS Bridge
parent 7af14ef638
commit d0018d6c30
5 changed files with 66 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbus-1-x11.changes
View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Thu Jan 9 09:38:34 UTC 2014 - fridrich.strba@suse.com
- Add 0001-Consider-the-system-machine-ID-first-if-it-exists.patch
+ Consider /etc/machine-id first and only fallback to
/var/lib/dbus/machine-id (Trying to fix bnc#857377).
-------------------------------------------------------------------
Tue Jan 7 08:17:17 UTC 2014 - fridrich.strba@suse.com

3
dbus-1-x11.spec
View File

@ -60,8 +60,6 @@ Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
# PATCH-FIX-OPENSUSE fstrba@suse.com -- consider first /etc/machine-id and fallback to /var/lib/dbus/machine-id
Patch2: 0001-Consider-the-system-machine-ID-first-if-it-exists.patch
%bcond_without selinux
%if %{with selinux}
BuildRequires: libselinux-devel
@ -117,7 +115,6 @@ bus daemon).
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
autoreconf -fi

7
dbus-1.changes
View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Thu Jan 9 09:38:34 UTC 2014 - fridrich.strba@suse.com
- Add 0001-Consider-the-system-machine-ID-first-if-it-exists.patch
+ Consider /etc/machine-id first and only fallback to
/var/lib/dbus/machine-id (Trying to fix bnc#857377).
-------------------------------------------------------------------
Tue Jan 7 08:17:17 UTC 2014 - fridrich.strba@suse.com

3
dbus-1.spec
View File

@ -55,8 +55,6 @@ Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
# PATCH-FIX-OPENSUSE fstrba@suse.com -- consider first /etc/machine-id and fallback to /var/lib/dbus/machine-id
Patch2: 0001-Consider-the-system-machine-ID-first-if-it-exists.patch
%bcond_without selinux
%if %{with selinux}
BuildRequires: libselinux-devel
@ -105,7 +103,6 @@ bus daemon).
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
autoreconf -fi

66
project.diff Normal file
View File

@ -0,0 +1,66 @@
--- dbus-1-x11.changes.orig
+++ dbus-1-x11.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jan 9 09:38:34 UTC 2014 - fridrich.strba@suse.com
+
+- Add 0001-Consider-the-system-machine-ID-first-if-it-exists.patch
+ + Consider /etc/machine-id first and only fallback to
+ /var/lib/dbus/machine-id (Trying to fix bnc#857377).
+
+-------------------------------------------------------------------
Tue Jan 7 08:17:17 UTC 2014 - fridrich.strba@suse.com
- Update to 1.7.10 (1.8.0 rc1)
--- dbus-1-x11.spec.orig
+++ dbus-1-x11.spec
@@ -60,6 +60,8 @@ Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
+# PATCH-FIX-OPENSUSE fstrba@suse.com -- consider first /etc/machine-id and fallback to /var/lib/dbus/machine-id
+Patch2: 0001-Consider-the-system-machine-ID-first-if-it-exists.patch
%bcond_without selinux
%if %{with selinux}
BuildRequires: libselinux-devel
@@ -115,6 +117,7 @@ bus daemon).
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
autoreconf -fi
--- dbus-1.changes.orig
+++ dbus-1.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jan 9 09:38:34 UTC 2014 - fridrich.strba@suse.com
+
+- Add 0001-Consider-the-system-machine-ID-first-if-it-exists.patch
+ + Consider /etc/machine-id first and only fallback to
+ /var/lib/dbus/machine-id (Trying to fix bnc#857377).
+
+-------------------------------------------------------------------
Tue Jan 7 08:17:17 UTC 2014 - fridrich.strba@suse.com
- Update to 1.7.10 (1.8.0 rc1)
--- dbus-1.spec.orig
+++ dbus-1.spec
@@ -55,6 +55,8 @@ Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
+# PATCH-FIX-OPENSUSE fstrba@suse.com -- consider first /etc/machine-id and fallback to /var/lib/dbus/machine-id
+Patch2: 0001-Consider-the-system-machine-ID-first-if-it-exists.patch
%bcond_without selinux
%if %{with selinux}
BuildRequires: libselinux-devel
@@ -103,6 +105,7 @@ bus daemon).
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
autoreconf -fi