From 6c31f05f3bfc195f423cebe39540da7cca45b152804f1601dcb6f777188405a2 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 22 Jan 2010 13:17:09 +0000
Subject: [PATCH 1/2] Accepting request 30284 from
 home:vuntz:branches:GNOME:Apps

Copy from home:vuntz:branches:GNOME:Apps/gnumeric via accept of submit request 30284 revision 3.
Request was accepted with message:
Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/30284
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=7
---
 gnumeric-no-disable-deprecated.patch | 26 ++++++++++++++++++++++++++
 gnumeric.changes                     |  8 ++++++++
 gnumeric.spec                        | 21 ++++++++++++---------
 3 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 gnumeric-no-disable-deprecated.patch

diff --git a/gnumeric-no-disable-deprecated.patch b/gnumeric-no-disable-deprecated.patch
new file mode 100644
index 0000000..4b62bb4
--- /dev/null
+++ b/gnumeric-no-disable-deprecated.patch
@@ -0,0 +1,26 @@
+Index: gnumeric-1.9.17/configure
+===================================================================
+--- gnumeric-1.9.17.orig/configure
++++ gnumeric-1.9.17/configure
+@@ -14828,7 +14828,7 @@ else
+ fi
+ 
+ 
+-if test $gnumeric_devel = yes; then
++if test $gnumeric_devel = never; then
+     CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
+     CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
+     if test "x$gnumeric_with_gtk" = xtrue; then
+Index: gnumeric-1.9.17/configure.in
+===================================================================
+--- gnumeric-1.9.17.orig/configure.in
++++ gnumeric-1.9.17/configure.in
+@@ -272,7 +272,7 @@ fi
+ AC_SUBST(GNUMERIC_PLUGIN_LDFLAGS)
+ 
+ dnl disable for in stable release, enable for development series
+-if test $gnumeric_devel = yes; then
++if test $gnumeric_devel = never; then
+     CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
+     CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
+     if test "x$gnumeric_with_gtk" = xtrue; then
diff --git a/gnumeric.changes b/gnumeric.changes
index 4680ffe..f847eb5 100644
--- a/gnumeric.changes
+++ b/gnumeric.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan 22 13:24:02 CET 2010 - vuntz@opensuse.org
+
+- Add gnumeric-no-disable-deprecated.patch to fix build with new
+  GTK+: we don't need to ignore deprecated API.
+- Version the Provides/Obsoletes of gnumeric2 to avoid
+  self-obsoletion rpmlint warning.
+
 -------------------------------------------------------------------
 Wed Dec 16 11:28:49 CET 2009 - vuntz@opensuse.org
 
diff --git a/gnumeric.spec b/gnumeric.spec
index 0994327..45a36ef 100644
--- a/gnumeric.spec
+++ b/gnumeric.spec
@@ -19,6 +19,15 @@
 
 
 Name:           gnumeric
+Version:        1.9.17
+Release:        1
+Summary:        Spreadsheet Application
+License:        GPLv2+
+Url:            http://www.gnumeric.org/
+Group:          Productivity/Office/Spreadsheets
+Source:         ftp://ftp.gnome.org/pub/gnome/sources/gnumeric/1.8/gnumeric-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gnumeric-no-disable-deprecated.patch bgo607758 vuntz@opensuse.org -- Remove *_DISABLE_DEPRECATED defines to not uselessly break build
+Patch0:         gnumeric-no-disable-deprecated.patch
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
 BuildRequires:  goffice-devel
@@ -32,19 +41,12 @@ BuildRequires:  scrollkeeper
 BuildRequires:  shared-mime-info
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-License:        GPLv2+
-Group:          Productivity/Office/Spreadsheets
-Provides:       gnumeric2
-Obsoletes:      gnumeric2
-Summary:        Spreadsheet Application
-Version:        1.9.17
-Release:        1
-Source:         ftp://ftp.gnome.org/pub/gnome/sources/gnumeric/1.8/gnumeric-%{version}.tar.bz2
-Url:            http://www.gnumeric.org/
 Requires:       %{name}-lang = %{version}
 Recommends:     liberation-fonts ghostscript-fonts-std
 # For perl-func plugin
 Recommends:     perl
+Provides:       gnumeric2 = %{version}
+Obsoletes:      gnumeric2 < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
 
@@ -95,6 +97,7 @@ Gnumeric is part of the GNOME project.
 %setup -q
 translation-update-upstream
 translation-update-upstream po-functions gnumeric-functions
+%patch0 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"

From 6ef7df4fac9f0bbfd4260035b679c1b5e9c23927dfaa70e5892272175bfecbdc Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 25 Jan 2010 15:39:56 +0000
Subject: [PATCH 2/2] checked in (request 30285)

OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=8
---
 gnumeric.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnumeric.spec b/gnumeric.spec
index 45a36ef..4ff6d08 100644
--- a/gnumeric.spec
+++ b/gnumeric.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gnumeric (Version 1.9.17)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 
 Name:           gnumeric
 Version:        1.9.17
-Release:        1
+Release:        2
 Summary:        Spreadsheet Application
 License:        GPLv2+
 Url:            http://www.gnumeric.org/