[folks/f16] fix another typelib problem

[Matthias Clasen]

commit df4bf4b1e99139e0d01a2cb70103af3034e78fcb
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 21 20:58:18 2011 -0400

    fix another typelib problem

 folks-typelib.patch |   24 ++++++++++++++++++++++++
 folks.spec          |    9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/folks-typelib.patch b/folks-typelib.patch
new file mode 100644
index 0000000..9dbce31
--- /dev/null
+++ b/folks-typelib.patch
@@ -0,0 +1,24 @@
+diff -up folks-0.6.3/folks/Makefile.am.typelib folks-0.6.3/folks/Makefile.am
+--- folks-0.6.3/folks/Makefile.am.typelib	2011-09-21 20:51:43.708606471 -0400
++++ folks-0.6.3/folks/Makefile.am	2011-09-21 20:52:08.668607902 -0400
+@@ -121,7 +121,7 @@ MAINTAINERCLEANFILES =
+ # We have to extract our own dlname from libfolks.la; see bgo#658002.
+ # This is what g-ir-scanner does.
+ libfolks_dlname = \
+-	`$(SED) -n "s/^dlname='\([A-Za-z0-9.-+]\+\)'/\1/p" libfolks.la`
++	`$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libfolks.la`
+ 
+ -include $(INTROSPECTION_MAKEFILE)
+ INTROSPECTION_GIRS =
+diff -up folks-0.6.3/folks/Makefile.in.typelib folks-0.6.3/folks/Makefile.in
+--- folks-0.6.3/folks/Makefile.in.typelib	2011-09-21 20:52:32.831609310 -0400
++++ folks-0.6.3/folks/Makefile.in	2011-09-21 20:52:42.554609839 -0400
+@@ -465,7 +465,7 @@ MAINTAINERCLEANFILES = $(am__append_1) $
+ # We have to extract our own dlname from libfolks.la; see bgo#658002.
+ # This is what g-ir-scanner does.
+ libfolks_dlname = \
+-	`$(SED) -n "s/^dlname='\([A-Za-z0-9.-+]\+\)'/\1/p" libfolks.la`
++	`$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libfolks.la`
+ 
+ INTROSPECTION_GIRS = 
+ INTROSPECTION_SCANNER_ARGS = 
diff --git a/folks.spec b/folks.spec
index a9e3c63..873e85b 100644
--- a/folks.spec
+++ b/folks.spec
@@ -3,7 +3,7 @@
 Name:           folks
 Epoch:          1
 Version:        0.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GObject contact aggregation library
 
 Group:          System Environment/Libraries
@@ -11,6 +11,9 @@ 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: folks-typelib.patch
+
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
 BuildRequires:  telepathy-glib-vala
 BuildRequires:  glib2-devel
@@ -47,6 +50,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 
 
 
 %build
@@ -83,6 +87,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Wed Sep 21 2011 Matthias Clasen <mclasen at redhat.com> - 1:0.6.3-2
+- Fix another typelib problem
+
 * Mon Sep 19 2011 Brian Pepple <bpepple at fedoraproject.org> - 1:0.6.3-1
 - Update to 0.6.3.
 - Drop typelib patch. Fixed upstream.