pool/gnumeric
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 30284 from home:vuntz:branches:GNOME:Apps

Browse Source 
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
This commit is contained in:
Vincent Untz 2010-01-22 13:17:09 +00:00 committed by Git OBS Bridge
parent 0b7b9a3070
commit 6c31f05f3b
3 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnumeric-no-disable-deprecated.patch Normal file
View File

@ -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

8
gnumeric.changes
View File

@ -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

21
gnumeric.spec
View File

@ -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"