[folks/f16] make folks use the eds backend by default
Matthias Clasen
mclasen at fedoraproject.org
Mon Aug 22 20:58:38 UTC 2011
commit a2a0913636da22f974253b19881b2135de680ece
Author: Matthias Clasen <mclasen at redhat.com>
Date: Mon Aug 22 16:58:04 2011 -0400
make folks use the eds backend by default
...ake-sure-we-pass-ENABLE_EDS-to-vala-flags.patch | 35 ++++++++++++++++++++
folks.spec | 29 +++++++++-------
2 files changed, 52 insertions(+), 12 deletions(-)
---
diff --git a/0001-Make-sure-we-pass-ENABLE_EDS-to-vala-flags.patch b/0001-Make-sure-we-pass-ENABLE_EDS-to-vala-flags.patch
new file mode 100644
index 0000000..5ccc866
--- /dev/null
+++ b/0001-Make-sure-we-pass-ENABLE_EDS-to-vala-flags.patch
@@ -0,0 +1,35 @@
+From f7767014b984fae5df9b9c0d6b0df5fe10aba360 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl at redhat.com>
+Date: Tue, 16 Aug 2011 14:03:17 +0200
+Subject: [PATCH] Make sure we pass ENABLE_EDS to vala flags
+
+---
+ folks/Makefile.am | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/folks/Makefile.am b/folks/Makefile.am
+index 1fde141..a4d03ea 100644
+--- a/folks/Makefile.am
++++ b/folks/Makefile.am
+@@ -44,6 +44,10 @@ libfolks_la_SOURCES = \
+ object-cache.vala \
+ $(NULL)
+
++if ENABLE_EDS
++EDS_FLAGS = -D ENABLE_EDS
++endif
++
+ libfolks_la_VALAFLAGS = \
+ --gir=Folks-$(API_VERSION).gir \
+ --library=folks \
+@@ -57,6 +61,7 @@ libfolks_la_VALAFLAGS = \
+ --includedir folks \
+ --vapi folks.vapi \
+ -H folks.h \
++ $(EDS_FLAGS) \
+ $(NULL)
+
+ libfolks_la_CFLAGS = \
+--
+1.7.6
+
diff --git a/folks.spec b/folks.spec
index 757e99c..289de18 100644
--- a/folks.spec
+++ b/folks.spec
@@ -3,7 +3,7 @@
Name: folks
Epoch: 1
Version: 0.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: GObject contact aggregation library
Group: System Environment/Libraries
@@ -11,6 +11,8 @@ License: LGPLv2+
URL: http://telepathy.freedesktop.org/wiki/Folks
Source0: http://download.gnome.org/sources/folks/0.6/%{name}-%{version}.tar.xz
+# upstream fix
+Patch0: 0001-Make-sure-we-pass-ENABLE_EDS-to-vala-flags.patch
BuildRequires: telepathy-glib-devel >= %{tp_glib_ver}
BuildRequires: telepathy-glib-vala
@@ -20,26 +22,27 @@ BuildRequires: vala-tools
BuildRequires: libgee-devel
BuildRequires: libxml2-devel
BuildRequires: gobject-introspection >= 0.9.12
-BuildRequires: GConf2-devel
-BuildRequires: evolution-data-server-devel >= 3.0.1
-BuildRequires: libsocialweb-devel >= 0.25.15
-## BuildRequires: tracker-devel >= 0.10
+BuildRequires: GConf2-devel
+BuildRequires: evolution-data-server-devel >= 3.0.1
+BuildRequires: libsocialweb-devel >= 0.25.15
+## BuildRequires: tracker-devel >= 0.10
+BuildRequires: autoconf automake libtool
%description
-libfolks is a library that aggregates people from multiple sources (e.g.
-Telepathy connection managers and eventually evolution data server,
-Facebook, etc.) to create meta-contacts.
+libfolks is a library that aggregates people from multiple sources (e.g.
+Telepathy connection managers and eventually evolution data server,
+Facebook, etc.) to create meta-contacts.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: telepathy-glib-devel >= %{tp_glib_ver}
-Requires: libgee-devel
-Requires: glib2-devel
-Requires: pkgconfig
+Requires: telepathy-glib-devel >= %{tp_glib_ver}
+Requires: libgee-devel
+Requires: glib2-devel
+Requires: pkgconfig
%description devel
The %{name}-devel package contains libraries and header files for
@@ -48,7 +51,9 @@ developing applications that use %{name}.
%prep
%setup -q
+%patch0 -p1
+autoreconf -i -f
%build
%configure --disable-static --enable-eds-backend
More information about the scm-commits
mailing list