OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnumeric?expand=0&rev=14

gnumeric-pro-fonts.patch

@@ -1,36 +0,0 @@
---- gnumeric-1.6.0/schemas/gnumeric-general.schemas.in
-+++ gnumeric-1.6.0/schemas/gnumeric-general.schemas.in
-@@ -74,7 +74,7 @@
-         <owner>Gnumeric</owner>
-         <type>string</type>
-         <locale name="C">
--	<default>Sans</default>
-+	<default>Albany</default>
-         <short>Default font name</short>
-         <long>The default font name for new workbooks.</long>
-         </locale>
---- gnumeric-1.6.0/src/style.c
-+++ gnumeric-1.6.0/src/style.c
-@@ -54,9 +54,9 @@
- 	static char const *map[][2] = {
- 		{ "Times New Roman", "Times"},
- 		{ "Tms Rmn",	     "Times"},
--		{ "Arial",           "Sans"},
-+		{ "Arial",           "Albany"},
- 		{ "Albany",          "Sans"},
--		{ "Helvetica",       "Sans"},
-+		{ "Helvetica",       "Albany"},
- 		{ "Courier New",     "Courier"},
- 		{ "<22>ͣ<EFBFBD> <20>Х<EFBFBD><D0A5><EFBFBD><EFBFBD>å<EFBFBD>", "Kochi Gothic"},
- 		{ "<22>ͣ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD>",   "Kochi Gothic"},
---- gnumeric-1.6.0/src/style.h
-+++ gnumeric-1.6.0/src/style.h
-@@ -4,7 +4,7 @@
- #include "gnumeric.h"
- #include <pango/pango-context.h>
- 
--#define DEFAULT_FONT "Sans"
-+#define DEFAULT_FONT "Albany"
- #define DEFAULT_SIZE 10.0
- 
- /* Alignment definitions */

gnumeric.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 29 17:22:21 CEST 2008 - vuntz@suse.de
+
+- Drop gnumeric-pro-fonts.patch. We don't depend on agfa-fonts
+  anymore, so we can't use them as a default. 
+
 -------------------------------------------------------------------
 Thu Apr 24 21:20:05 CEST 2008 - maw@suse.de
 

gnumeric.spec

@@ -19,10 +19,9 @@ Provides:       gnumeric2
 Obsoletes:      gnumeric2
 Summary:        Spreadsheet Application
 Version:        1.8.2
-Release:        10
+Release:        13
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/gnumeric/1.8/gnumeric-%{version}.tar.bz2
 Url:            http://www.gnumeric.org/
-Patch:          gnumeric-pro-fonts.patch
 Patch4:         gnumeric-doc.patch
 Patch5:         gnumeric-autobuild-error.patch
 Requires:       %{name}-lang = %{version}
@@ -160,7 +159,6 @@ Authors:
 %lang_package
 %prep
 %setup -q
-%patch -p1
 %patch4 -p1
 %patch5
 # FIXME: Following files are apparently compiled without RPM_OPT_FLAGS:
@@ -249,6 +247,9 @@ fi
 %{_libdir}/gnumeric/*/include
 
 %changelog
+* Tue Apr 29 2008 vuntz@suse.de
+- Drop gnumeric-pro-fonts.patch. We don't depend on agfa-fonts
+  anymore, so we can't use them as a default.
 * Thu Apr 24 2008 maw@suse.de
 - Only recommend agfa-fonts; additionally Recommend
   liberation-fonts and ghostscript-fonts-std