Accepting request 103519 from home:vuntz:branches:GNOME:Factory

Fix broken pkg-config file (=> fix gnome-applets build)

OBS-URL: https://build.opensuse.org/request/show/103519
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gucharmap?expand=0&rev=74

gucharmap-fix-pkg-config.patch

@@ -0,0 +1,20 @@
+commit 15ad66f28147ee0228185fe7171b736f041374e4
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Thu Feb 9 10:56:03 2012 +0100
+
+    Fix pkg-config file to not reference old gconf-related variable
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=669734
+
+diff --git a/gucharmap.pc.in b/gucharmap.pc.in
+index 664f90a..4d776dd 100644
+--- a/gucharmap.pc.in
++++ b/gucharmap.pc.in
+@@ -7,6 +7,6 @@ Name: gucharmap
+ Description: GTK+ Unicode Character Map
+ Version: @VERSION@
+ Requires: gtk+-@GTK_API_VERSION@ glib-2.0
+-Requires.private: @GCONFPKGS@
++Requires.private: gio-2.0
+ Libs: -L${libdir} -lgucharmap@GUCHARMAP_LIBRARY_SUFFIX_U@
+ Cflags: -I${includedir}/gucharmap-@GUCHARMAP_API_VERSION@

gucharmap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  9 09:59:47 UTC 2012 - vuntz@opensuse.org
+
+- Add gucharmap-fix-pkg-config.patch: fix broken pkg-config file
+  after move to GSettings.
+
 -------------------------------------------------------------------
 Tue Feb  7 10:46:01 UTC 2012 - vuntz@opensuse.org
 

gucharmap.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %define api_version 2.90
 %define so_api _2_90
 %define so_gucharmap 7
@@ -27,8 +26,10 @@ Release:        0
 Summary:        A Featureful Unicode Character Map
 License:        GPL-3.0+ ; LGPL-2.1+
 Group:          System/GUI/GNOME
-Source:         http://download.gnome.org/sources/gucharmap/3.3/%{name}-%{version}.tar.xz
 Url:            http://gucharmap.sourceforge.net/
+Source:         http://download.gnome.org/sources/gucharmap/3.3/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gucharmap-fix-pkg-config.patch bgo#669734 vuntz@opensuse.org -- Fix broken pkg-config file
+Patch0:         gucharmap-fix-pkg-config.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
@@ -79,6 +80,7 @@ to develop applications that require these.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 
 %build
 %configure --disable-static --with-pic \