diff --git a/folks-typelib.patch b/folks-typelib.patch index 4441f1c..76fe570 100644 --- a/folks-typelib.patch +++ b/folks-typelib.patch @@ -1,13 +1,12 @@ -diff -up folks-0.6.1/folks/Folks-0.6.typelib folks-0.6.1/folks/Folks-0.6 -diff -up folks-0.6.1/folks/Makefile.in.typelib folks-0.6.1/folks/Makefile.in ---- folks-0.6.1/folks/Makefile.in.typelib 2011-09-01 16:12:41.457577828 -0400 -+++ folks-0.6.1/folks/Makefile.in 2011-09-01 16:12:53.173578695 -0400 -@@ -460,7 +460,7 @@ GITIGNOREFILES = \ - - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = +diff -up folks-0.6.2.1/folks/Makefile.am.typelib folks-0.6.2.1/folks/Makefile.am +--- folks-0.6.2.1/folks/Makefile.am.typelib 2011-09-14 17:16:03.150226985 -0400 ++++ folks-0.6.2.1/folks/Makefile.am 2011-09-14 17:16:26.251435649 -0400 +@@ -118,7 +118,7 @@ GITIGNOREFILES = \ + -include $(INTROSPECTION_MAKEFILE) + INTROSPECTION_GIRS = + INTROSPECTION_SCANNER_ARGS = -INTROSPECTION_COMPILER_ARGS = -l libfolks.so +INTROSPECTION_COMPILER_ARGS = -l libfolks.so.25 - @HAVE_INTROSPECTION_TRUE@GIRS = Folks-$(API_VERSION).gir - @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 - @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(GIRS) + + if HAVE_INTROSPECTION + Folks-$(API_VERSION).gir: libfolks.la diff --git a/folks.spec b/folks.spec index f0444e5..c65b188 100644 --- a/folks.spec +++ b/folks.spec @@ -3,7 +3,7 @@ Name: folks Epoch: 1 Version: 0.6.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GObject contact aggregation library Group: System Environment/Libraries @@ -53,6 +53,9 @@ developing applications that use %{name}. %patch0 -p1 autoreconf -i -f +# Mistakenly distributed +# https://bugzilla.gnome.org/show_bug.cgi?id=659095 +rm folks/Folks-*.typelib %build %configure --disable-static --enable-eds-backend @@ -88,6 +91,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Sep 14 2011 Owen Taylor - 1:0.6.2.1-2 +- Really fix the typelib to embed the right .so file + * Thu Sep 8 2011 Matthias Clasen - 1:0.6.2.1-1 - Really fix the reentrancy problem, by using 0.6.2.1