From 0b19a21e1ffa9bfd286733935ea8e933061027b848df6728e20f8c9cf7d6e070 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Apr 2012 14:32:33 +0000 Subject: [PATCH] Accepting request 112833 from home:vuntz:branches:GNOME:Factory Fix build without systemd; sorry, forgot to take yours before mine OBS-URL: https://build.opensuse.org/request/show/112833 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=26 --- ...-systemd-test-always-evaluating-true.patch | 25 +++++++++++++++++++ accountsservice.changes | 7 ++++++ accountsservice.spec | 9 ++++--- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 accountsservice-fix-systemd-test-always-evaluating-true.patch diff --git a/accountsservice-fix-systemd-test-always-evaluating-true.patch b/accountsservice-fix-systemd-test-always-evaluating-true.patch new file mode 100644 index 0000000..6ae2fbe --- /dev/null +++ b/accountsservice-fix-systemd-test-always-evaluating-true.patch @@ -0,0 +1,25 @@ +From c229be0e0eed580d35860d60bf816830805c4132 Mon Sep 17 00:00:00 2001 +From: David King +Date: Mon, 2 Apr 2012 12:55:37 +0100 +Subject: [PATCH] configure: Fix systemd test always evaluating true + +https://bugs.freedesktop.org/show_bug.cgi?id=48190 +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dc75961..8f2bcc8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,7 +169,7 @@ AC_SUBST(SYSTEMD_LIBS) + LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $SYSTEMD_LIBS" + LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $SYSTEMD_CFLAGS" + +-if test "x$have_systemd" != "no" ; then ++if test "x$have_systemd" != "xno" ; then + AC_DEFINE(WITH_SYSTEMD, 1, [Define to enable systemd support]) + fi + +-- +1.7.3.4 diff --git a/accountsservice.changes b/accountsservice.changes index e8da442..4bb2445 100644 --- a/accountsservice.changes +++ b/accountsservice.changes @@ -6,6 +6,13 @@ Tue Apr 3 11:45:58 UTC 2012 - vuntz@opensuse.org - Add accountsservice-filter-suse-accounts.patch: filter out some openSUSE-specific accounts (beagleindex, suse-ncc). +------------------------------------------------------------------- +Mon Apr 2 19:07:08 UTC 2012 - zaitor@opensuse.org + +- Add accountsservice-fix-systemd-test-always-evaluating-true.patch + Make it possible to build accountsservice without systemd + (fdo#48190). + ------------------------------------------------------------------- Wed Mar 28 06:36:18 UTC 2012 - vuntz@opensuse.org diff --git a/accountsservice.spec b/accountsservice.spec index 8a629de..1758e39 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -31,11 +31,13 @@ Patch0: accountsservice-sysconfig.patch Patch1: accountsservice-filter-more-accounts.patch # PATCH-FIX-OPENSUSE accountsservice-filter-suse-accounts.patch vuntz@opensuse.org -- Filter out some system users that are specific to openSUSE Patch2: accountsservice-filter-suse-accounts.patch -# needed for patch0 +# PATCH-FIX-UPSTREAM accountsservice-fix-systemd-test-always-evaluating-true.patch fdo#48190 zaitor@opensuse.org -- configure: Fix systemd test always evaluating true +Patch3: accountsservice-fix-systemd-test-always-evaluating-true.patch +# needed for patch0 and patch3 BuildRequires: gnome-common BuildRequires: gobject-introspection-devel BuildRequires: intltool -# needed for patch0 +# needed for patch0 and patch3 BuildRequires: vala BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libsystemd-daemon) @@ -92,9 +94,10 @@ querying and manipulating user account information. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build -# needed for patch0 +# needed for patch0 and patch3 NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static