SPECS: openoffice.org.spec - updated to ooo-build 2.0.2.7 - droppe...

[adamg]

Author: adamg                        Date: Sat Apr 22 14:18:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to ooo-build 2.0.2.7
- dropped outdated/unused patches (including -gcc4.patch)
- introduced -PLD.patch (updates patches/src680/apply)
- release 0.0.4

---- Files affected:
SPECS:
   openoffice.org.spec (1.596 -> 1.597) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.596 SPECS/openoffice.org.spec:1.597
--- SPECS/openoffice.org.spec:1.596	Sat Apr 15 13:36:48 2006
+++ SPECS/openoffice.org.spec	Sat Apr 22 16:18:29 2006
@@ -25,7 +25,7 @@
 
 %define		ver		2.0
 %define		rel		2
-%define		ooobver		2.0.2.6
+%define		ooobver		2.0.2.7
 %define		snap		OOB680
 %define		snap2		SRC680
 %define		bver		%{nil}
@@ -40,12 +40,12 @@
 Summary(pl):	OpenOffice.org - potężny pakiet biurowy
 Name:		openoffice.org
 Version:	%{fullver}
-Release:	0.0.3%{?with_vfs:vfs}
+Release:	0.0.4%{?with_vfs:vfs}
 Epoch:		1
 License:	GPL/LGPL
 Group:		X11/Applications
 Source0:	http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz
-# Source0-md5:	bbc067eec12fe99da4a23decf4b82cbb
+# Source0-md5:	67b73c718a6712289aa30a4d56f006da
 Source1:	http://go-ooo.org/packages/%{snap}/%{ssnap}-core.tar.bz2
 # Source1-md5:	99d5e8c21c50af94bc5eee8d5e7e6df1
 Source2:	http://go-ooo.org/packages/%{snap}/%{ssnap}-system.tar.bz2
@@ -80,15 +80,12 @@
 Source30:	database.desktop
 Source50:	openabout_pld.png
 Source51:	openintro_pld.bmp
-
-Patch0:		%{name}-STL-lib64.diff
-Patch1:		%{name}-64bit-inline.diff
-Patch2:		%{name}-gcc4.diff
-Patch3:		%{name}-bashizm.patch
-#Patch4:		%{name}-ooo62030.solenv._version.diff
-Patch5:		%{name}-build-pld-splash.diff
-Patch6:		%{name}-build-no-java.diff
-Patch7:		%{name}-sfx2.badscript.diff
+Patch0:		%{name}-bashizm.patch
+Patch1:		%{name}-PLD.patch
+Patch2:		%{name}-STL-lib64.diff
+Patch3:		%{name}-64bit-inline.diff
+Patch4:		%{name}-build-pld-splash.diff
+Patch5:		%{name}-sfx2.badscript.diff
 URL:		http://www.openoffice.org/
 BuildRequires:	ImageMagick
 BuildRequires:	STLport-devel >= 4.5.3-6
@@ -1738,7 +1735,6 @@
 
 %prep
 %setup -q -n ooo-build-%{ooobver}
-%patch3 -p1
 
 install -d src
 cp %{SOURCE50} %{SOURCE51} src
@@ -1747,40 +1743,21 @@
 	%{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
 	%{SOURCE14} %{SOURCE15} src
 
-# add to ooo-build patch-system
-%ifarch %{x8664} sparc64
-install %{PATCH0} patches/64bit
-install %{PATCH1} patches/64bit
-echo "[ 64bitPLDFixes ]" >>patches/src680/apply
-echo `basename %{PATCH0}` >>patches/src680/apply
-echo `basename %{PATCH1}` >>patches/src680/apply
-sed -i -e 's/PLD64: PLDBase, 64bit/PLD64: PLDBase, 64bit, 64bitPLDFixes/' patches/src680/apply
-%endif
-
-# various fixes
-echo "[ Fixes ]" >> patches/src680/apply
-
-# macro browser can crash if there's an invalid script container
-install %{PATCH7} patches/src680
-echo `basename %{PATCH7}` >>patches/src680/apply
+# bashizm
+%patch0 -p1
 
-# gcc4 fixes
-%if %{with gcc4}
-install %{PATCH2} patches/src680
-echo `basename %{PATCH2}` >>patches/src680/apply
-%endif
+# fixes for the patch subsystem
+%patch1 -p1
 
-# fix build when not using java
-%if %{without java}
-install %{PATCH6} patches/src680
-echo -e `basename %{PATCH6}` >> patches/src680/apply
-%endif
+# 64 bit related patches
+install %{PATCH2} patches/64bit
+install %{PATCH3} patches/64bit
 
 # fix patches/src680/pld-splash.diff
-install %{PATCH5} patches/src680/pld-splash.diff
+install %{PATCH4} patches/src680/pld-splash.diff
 
-# fake patch to make buildsystem happy (patch is included)
-touch patches/64bit/cws-ooo64bit02.2005-04-19-math-h.diff
+# macro browser can crash if there's an invalid script container
+install %{PATCH5} patches/src680
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -2328,6 +2305,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.597  2006/04/22 14:18:29  adamg
+- updated to ooo-build 2.0.2.7
+- dropped outdated/unused patches (including -gcc4.patch)
+- introduced -PLD.patch (updates patches/src680/apply)
+- release 0.0.4
+
 Revision 1.596  2006/04/15 11:36:48  adamg
 - updated ooo-build to 2.0.2.6
 - -libs no longer depends on kdelibs/qt (noticed by aflinta)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.596&r2=1.597&f=u