From 9bf64fe7b62a702c1ab458725038e41da06c53b2 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Sep 26 2011 00:42:30 +0000 Subject: Update to 0.6.3.1. Drop typelib patch. Fixed upstream. --- diff --git a/.gitignore b/.gitignore index 31d3899..fda15c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /folks-0.6.3.tar.xz +/folks-0.6.3.1.tar.xz diff --git a/folks-typelib.patch b/folks-typelib.patch deleted file mode 100644 index 9dbce31..0000000 --- a/folks-typelib.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 873e85b..eb0ca55 100644 --- a/folks.spec +++ b/folks.spec @@ -2,8 +2,8 @@ Name: folks Epoch: 1 -Version: 0.6.3 -Release: 2%{?dist} +Version: 0.6.3.1 +Release: 1%{?dist} Summary: GObject contact aggregation library Group: System Environment/Libraries @@ -11,9 +11,6 @@ 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 @@ -50,7 +47,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 %build @@ -87,6 +83,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Sun Sep 25 2011 Brian Pepple - 1:0.6.3.1-1 +- Update to 0.6.3.1. +- Drop typelib patch. Fixed upstream. + * Wed Sep 21 2011 Matthias Clasen - 1:0.6.3-2 - Fix another typelib problem diff --git a/sources b/sources index bc46491..aa9aba4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aac3977c970d6b38548620bcdbc79ae5 folks-0.6.3.tar.xz +f75e79822c95af01fee64cae3802188b folks-0.6.3.1.tar.xz