From d79432f41d360f9ed4049da841da32d82fba83d1141ab900a29c15fc3aa762f7 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 28 Mar 2012 06:21:45 +0000 Subject: [PATCH] Accepting request 111171 from home:vuntz:branches:GNOME:Factory Update to 3.4.0.1 OBS-URL: https://build.opensuse.org/request/show/111171 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gucharmap?expand=0&rev=76 --- gucharmap-3.3.1.tar.xz | 3 --- gucharmap-3.4.0.1.tar.xz | 3 +++ gucharmap-fix-pkg-config.patch | 20 -------------------- gucharmap.changes | 11 +++++++++++ gucharmap.spec | 8 +++----- 5 files changed, 17 insertions(+), 28 deletions(-) delete mode 100644 gucharmap-3.3.1.tar.xz create mode 100644 gucharmap-3.4.0.1.tar.xz delete mode 100644 gucharmap-fix-pkg-config.patch diff --git a/gucharmap-3.3.1.tar.xz b/gucharmap-3.3.1.tar.xz deleted file mode 100644 index 5f6e9d5..0000000 --- a/gucharmap-3.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed70de66eb733349807c319240c78397c5f001f5419833208b8b0fbcf3b2d179 -size 2023700 diff --git a/gucharmap-3.4.0.1.tar.xz b/gucharmap-3.4.0.1.tar.xz new file mode 100644 index 0000000..eaf017a --- /dev/null +++ b/gucharmap-3.4.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eac2f2281cde5118544bc930b9ce90e68302a8c4ea09755f0db3e2e5e022b23c +size 2760560 diff --git a/gucharmap-fix-pkg-config.patch b/gucharmap-fix-pkg-config.patch deleted file mode 100644 index e17521a..0000000 --- a/gucharmap-fix-pkg-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 15ad66f28147ee0228185fe7171b736f041374e4 -Author: Vincent Untz -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@ diff --git a/gucharmap.changes b/gucharmap.changes index bb97b94..5e91c8a 100644 --- a/gucharmap.changes +++ b/gucharmap.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 26 14:42:26 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.4.0.1: + + No changes. +- Changes from version 3.4.0: + + Revert unintentional API/ABI break. + + Build fixes. + + Updated translations. +- Drop gucharmap-fix-pkg-config.patch: fixed upstream. + ------------------------------------------------------------------- Thu Feb 9 09:59:47 UTC 2012 - vuntz@opensuse.org diff --git a/gucharmap.spec b/gucharmap.spec index cfdee67..bfffc0a 100644 --- a/gucharmap.spec +++ b/gucharmap.spec @@ -15,21 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define api_version 2.90 %define so_api _2_90 %define so_gucharmap 7 %define pc_api 2.90 Name: gucharmap -Version: 3.3.1 +Version: 3.4.0.1 Release: 0 Summary: A Featureful Unicode Character Map License: GPL-3.0+ ; LGPL-2.1+ Group: System/GUI/GNOME 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 +Source: http://download.gnome.org/sources/gucharmap/3.4/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel @@ -80,7 +79,6 @@ to develop applications that require these. %prep %setup -q translation-update-upstream -%patch0 -p1 %build %configure --disable-static --with-pic \