SPECS (AC-branch): abiword.spec - remove goffice patch that breaks...

[glen]

Author: glen                         Date: Tue Mar 25 16:26:18 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- remove goffice patch that breaks build; rel 2

---- Files affected:
SPECS:
   abiword.spec (1.120.2.1.2.1.2.6 -> 1.120.2.1.2.1.2.7) 

---- Diffs:

================================================================
Index: SPECS/abiword.spec
diff -u SPECS/abiword.spec:1.120.2.1.2.1.2.6 SPECS/abiword.spec:1.120.2.1.2.1.2.7
--- SPECS/abiword.spec:1.120.2.1.2.1.2.6	Fri Mar 21 14:55:16 2008
+++ SPECS/abiword.spec	Tue Mar 25 17:26:12 2008
@@ -14,7 +14,7 @@
 Summary(pl.UTF-8):	Wieloplatformowy procesor tekstu
 Name:		abiword
 Version:	2.4.6
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL
 Group:		X11/Applications
@@ -24,7 +24,7 @@
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-mailmerge.patch
 Patch3:		%{name}-poppler05x.patch
-Patch4:		%{name}-goffice05.patch
+
 Patch5:		%{name}-eps15.patch
 Patch6:		%{name}-poppler-0.6-api.patch
 URL:		http://www.abisource.com/
@@ -47,7 +47,7 @@
 BuildRequires:	libgnomedb-devel >= 1:1.2.2
 BuildRequires:	libgnomeprintui-devel >= 2.2.1.3-2
 BuildRequires:	libgnomeui-devel >= 2.2.0
-%{?with_goffice:BuildRequires:	libgoffice-devel >= 0.1.0}
+%{?with_goffice:BuildRequires:	libgoffice-devel >= 0.2.1}
 BuildRequires:	libgsf-devel >= 1.12.1
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
@@ -726,7 +726,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
+
 %patch5 -p1
 %patch6 -p0
 
@@ -996,6 +996,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.1.2.1.2.7  2008-03-25 16:26:12  glen
+- remove goffice patch that breaks build; rel 2
+
 Revision 1.120.2.1.2.1.2.6  2008-03-21 13:55:16  glen
 - update from HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/abiword.spec?r1=1.120.2.1.2.1.2.6&r2=1.120.2.1.2.1.2.7&f=u