commit 6791f27b32f4c85407d15559ecb72d7190ee1198
Author: Brian Pepple <bpepple at fedoraproject.org>
Date: Sun Sep 12 15:46:21 2010 -0400
- Update to 0.1.17.
- Add patch to fix DSO linking for import tool.
- Add BR on libxml2-devel so import tool is built.
.gitignore | 1 +
folks-0.1.17-DSO_linking.patch | 23 +++++++++++++++++++++++
folks.spec | 21 +++++++++++++++++----
sources | 2 +-
4 files changed, 42 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ed0872f..54ad832 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/folks-0.1.14.1.tar.bz2
/folks-0.1.15.tar.bz2
/folks-0.1.16.tar.bz2
+/folks-0.1.17.tar.bz2
diff --git a/folks-0.1.17-DSO_linking.patch b/folks-0.1.17-DSO_linking.patch
new file mode 100644
index 0000000..0db011d
--- /dev/null
+++ b/folks-0.1.17-DSO_linking.patch
@@ -0,0 +1,23 @@
+diff -urp folks-0.1.17.OLD/tools/Makefile.am folks-0.1.17/tools/Makefile.am
+--- folks-0.1.17.OLD/tools/Makefile.am 2010-09-10 14:19:41.000000000 -0400
++++ folks-0.1.17/tools/Makefile.am 2010-09-12 15:10:15.984009000 -0400
+@@ -13,6 +13,7 @@ folks_import_SOURCES = \
+ import.vala \
+ import-pidgin.vala \
+ $(NULL)
++AM_LDFLAGS = -lgio-2.0
+ folks_import_CFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GEE_CFLAGS) \
+diff -urp folks-0.1.17.OLD/tools/Makefile.in folks-0.1.17/tools/Makefile.in
+--- folks-0.1.17.OLD/tools/Makefile.in 2010-09-10 18:23:12.000000000 -0400
++++ folks-0.1.17/tools/Makefile.in 2010-09-12 15:10:58.515009001 -0400
+@@ -153,7 +153,7 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_
+ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lgio-2.0
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/folks.spec b/folks.spec
index 4ce90ce..535443d 100644
--- a/folks.spec
+++ b/folks.spec
@@ -1,5 +1,5 @@
Name: folks
-Version: 0.1.16
+Version: 0.1.17
Release: 1%{?dist}
Summary: GObject contact aggregation library
@@ -7,10 +7,16 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://telepathy.freedesktop.org/wiki/Folks
Source0: http://download.gnome.org/sources/folks/0.1/%{name}-%{version}.tar.bz2
+# https://bugzilla.gnome.org/show_bug.cgi?id=629452
+Patch0: %{name}-%{version}-DSO_linking.patch
-BuildRequires: telepathy-glib-devel telepathy-glib-vala
-BuildRequires: vala-devel vala-tools
+
+BuildRequires: telepathy-glib-devel >= 0.11.11
+BuildRequires: telepathy-glib-vala
+BuildRequires: vala-devel
+BuildRequires: vala-tools
BuildRequires: libgee-devel
+BuildRequires: libxml2-devel
%description
libfolks is a library that aggregates people from multiple sources (e.g.
@@ -30,6 +36,7 @@ developing applications that use %{name}.
%prep
%setup -q
+%patch0 -p1 -b .dso
%build
@@ -50,18 +57,24 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/%{name}-import
%{_libdir}/*.so.*
%{_libdir}/folks
+%{_datadir}/vala/vapi/%{name}*
%files devel
%defattr(-,root,root,-)
-%doc
%{_includedir}/folks
%{_libdir}/*.so
%{_libdir}/pkgconfig/folks*.pc
%changelog
+* Sun Sep 12 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.1.17-1
+- Update to 0.1.17.
+- Add patch to fix DSO linking for import tool.
+- Add BR on libxml2-devel so import tool is built.
+
* Wed Sep 1 2010 Yanko Kaneti <yaneti at declera.com> 0.1.16-1
- New upstream release.
diff --git a/sources b/sources
index 77fe1a9..9e07301 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-acbb465660e3820137ba61adb825f37c folks-0.1.16.tar.bz2
+d7adb0ee8d958a6a5977aff0c60b1bd3 folks-0.1.17.tar.bz2