From a9746a7e93561339c18d54e4b8aee4a46275db48 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Nov 15 2010 02:22:16 +0000 Subject: - Update to 0.3.2. - Update min version of tp-glib. - Update source url. - Drop dso linking patch. Fixed upstream. --- diff --git a/.gitignore b/.gitignore index 1aae286..83ee199 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /folks-0.2.0.tar.bz2 /folks-0.3.1.tar.bz2 /folks-0.2.1.tar.bz2 +/folks-0.3.2.tar.bz2 diff --git a/dso-linking.patch b/dso-linking.patch deleted file mode 100644 index 315f8ba..0000000 --- a/dso-linking.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 f111d69..8fc6ae0 100644 --- a/folks.spec +++ b/folks.spec @@ -1,16 +1,15 @@ -%define tp_glib_ver 0.11.16 +%define tp_glib_ver 0.13.1 Name: folks Epoch: 1 -Version: 0.2.1 +Version: 0.3.2 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 +Source0: http://download.gnome.org/sources/folks/0.3/%{name}-%{version}.tar.bz2 BuildRequires: telepathy-glib-devel >= %{tp_glib_ver} @@ -20,6 +19,7 @@ BuildRequires: vala-devel >= 0.10.0 BuildRequires: vala-tools BuildRequires: libgee-devel BuildRequires: libxml2-devel +BuildRequires: gobject-introspection >= 0.9.12 %description libfolks is a library that aggregates people from multiple sources (e.g. @@ -43,7 +43,7 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .dso + %build %configure --disable-static @@ -53,6 +53,7 @@ make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%find_lang %{name} %post -p /sbin/ldconfig @@ -60,7 +61,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_bindir}/%{name}-import @@ -76,6 +77,12 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Sun Nov 14 2010 Brian Pepple - 1:0.3.2-1 +- Update to 0.3.2. +- Update min version of tp-glib. +- Update source url. +- Drop dso linking patch. Fixed upstream. + * Fri Oct 29 2010 Brian Pepple - 1:0.2.1-1 - Update to 0.2.1. - Add patch to fix dso linking. (fdo #633511) diff --git a/sources b/sources index a4d3369..28632e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afabe04bd84347e73e9c94eb1b8cf3c1 folks-0.2.1.tar.bz2 +2f30a2f6b058d3e96bfd5ab205c89bff folks-0.3.2.tar.bz2