diff --git a/.gitignore b/.gitignore index c1a9af6..1aae286 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /folks-0.1.17.tar.bz2 /folks-0.2.0.tar.bz2 /folks-0.3.1.tar.bz2 +/folks-0.2.1.tar.bz2 diff --git a/dso-linking.patch b/dso-linking.patch new file mode 100644 index 0000000..315f8ba --- /dev/null +++ b/dso-linking.patch @@ -0,0 +1,22 @@ +diff -urp folks-0.2.1.OLD/tests/telepathy/Makefile.am folks-0.2.1/tests/telepathy/Makefile.am +--- folks-0.2.1.OLD/tests/telepathy/Makefile.am 2010-10-25 17:58:04.000000000 -0400 ++++ folks-0.2.1/tests/telepathy/Makefile.am 2010-10-29 18:27:56.570518002 -0400 +@@ -46,6 +46,7 @@ contact_retrieval_SOURCES = \ + $(NULL) + + contact_retrieval_LDADD = \ ++ $(GEE_LIBS) \ + $(top_builddir)/tests/lib/telepathy/contactlist/libtp-test-contactlist.la \ + $(top_builddir)/folks/libfolks.la + +diff -urp folks-0.2.1.OLD/tests/telepathy/Makefile.in folks-0.2.1/tests/telepathy/Makefile.in +--- folks-0.2.1.OLD/tests/telepathy/Makefile.in 2010-10-25 17:58:26.000000000 -0400 ++++ folks-0.2.1/tests/telepathy/Makefile.in 2010-10-29 18:26:45.634518001 -0400 +@@ -282,6 +282,7 @@ contact_retrieval_SOURCES = \ + $(NULL) + + contact_retrieval_LDADD = \ ++ $(GEE_LIBS) \ + $(top_builddir)/tests/lib/telepathy/contactlist/libtp-test-contactlist.la \ + $(top_builddir)/folks/libfolks.la + diff --git a/folks.spec b/folks.spec index ef6bc47..f111d69 100644 --- a/folks.spec +++ b/folks.spec @@ -2,14 +2,15 @@ Name: folks Epoch: 1 -Version: 0.2.0 -Release: 4%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: GObject contact aggregation library Group: System Environment/Libraries License: LGPLv2+ URL: http://telepathy.freedesktop.org/wiki/Folks Source0: http://download.gnome.org/sources/folks/0.2/%{name}-%{version}.tar.bz2 +Patch0: dso-linking.patch BuildRequires: telepathy-glib-devel >= %{tp_glib_ver} @@ -42,7 +43,7 @@ developing applications that use %{name}. %prep %setup -q - +%patch0 -p1 -b .dso %build %configure --disable-static @@ -75,6 +76,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Fri Oct 29 2010 Brian Pepple - 1:0.2.1-1 +- Update to 0.2.1. +- Add patch to fix dso linking. (fdo #633511) + * Fri Oct 29 2010 Brian Pepple - 1:0.2.0-4 - Add epoch to devel subpackage requires. diff --git a/sources b/sources index d7a37cd..a4d3369 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c66c03d942313db735f6eb375c2f71a folks-0.2.0.tar.bz2 +afabe04bd84347e73e9c94eb1b8cf3c1 folks-0.2.1.tar.bz2