packages: openoffice.org/openoffice.org.spec, openoffice.org/openoffice.org...

[arekm]

Author: arekm                        Date: Tue Jul 28 16:13:41 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7; updated from git; builds

---- Files affected:
packages/openoffice.org:
   openoffice.org.spec (1.838 -> 1.839) , openoffice.org-hotfix-xulrunner.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/openoffice.org/openoffice.org.spec
diff -u packages/openoffice.org/openoffice.org.spec:1.838 packages/openoffice.org/openoffice.org.spec:1.839
--- packages/openoffice.org/openoffice.org.spec:1.838	Sun Jul 19 12:46:38 2009
+++ packages/openoffice.org/openoffice.org.spec	Tue Jul 28 18:13:35 2009
@@ -77,7 +77,7 @@
 %define		tag			%(echo %{mws} | tr A-Z a-z)-%{milestone}
 %define		milestone	m15
 %define		_tag		%(echo %{tag} | tr - _)
-%define		_rel		6
+%define		_rel		7
 
 Summary:	OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):	OpenOffice.org - potężny pakiet biurowy
@@ -91,8 +91,8 @@
 # git clone git://anongit.freedesktop.org/git/ooo-build/ooo-build
 # cd ooo-build
 # git checkout -b ooo-build-3-0-1 origin/ooo-build-3-0-1
-Source0:	ooo-build-15595.tar.bz2
-# Source0-md5:	f22014d2a404b6ba9fe43628a1dade1c
+Source0:	ooo-build-20090727.tar.bz2
+# Source0-md5:	3fd9197e22fa801e2c2df408df462a22
 Source1:	http://download.go-oo.org/DEV300/ooo-cli-prebuilt-3.0.tar.bz2
 # Source1-md5:	8b3979cd7fd99b7e9722fd8f690e69a9
 Source2:	http://download.go-oo.org/%{mws}/%{tag}-base.tar.bz2
@@ -159,10 +159,10 @@
 Patch1006:	%{name}-perl-nodiag.patch
 Patch1007:	%{name}-gcc42-swregion.diff
 
-Patch2000:	%{name}-build.patch
 Patch2001:	%{name}-kde3support.patch
 Patch2002:	%{name}-gcc44.patch
 Patch2003:	%{name}-hotfix-glibc210.patch
+Patch2004:	%{name}-hotfix-xulrunner.patch
 URL:		http://www.openoffice.org/
 BuildConflicts:	xmlsec1-devel
 # contains (dlopened) *.so libs
@@ -2139,13 +2139,13 @@
 	%{SOURCE51} %{SOURCE52} \
 	src
 
-%patch2000 -p1
 %patch2001 -p1
 
 # fixes
 ln -s %{PATCH104} patches/hotfixes/%{basename:%{PATCH104}}.diff
 ln -s %{PATCH2002} patches/hotfixes/%{basename:%{PATCH2002}}.diff
 ln -s %{PATCH2003} patches/hotfixes/%{basename:%{PATCH2003}}.diff
+ln -s %{PATCH2004} patches/hotfixes/%{basename:%{PATCH2004}}.diff
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -2653,7 +2653,6 @@
 ' *.lang
 
 %clean
-exit 1
 rm -rf $RPM_BUILD_ROOT
 
 %pretrans core
@@ -4239,6 +4238,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.839  2009/07/28 16:13:35  arekm
+- rel 7; updated from git; builds
+
 Revision 1.838  2009/07/19 10:46:38  arekm
 - rel 6
 

================================================================
Index: packages/openoffice.org/openoffice.org-hotfix-xulrunner.patch
diff -u /dev/null packages/openoffice.org/openoffice.org-hotfix-xulrunner.patch:1.1
--- /dev/null	Tue Jul 28 18:13:41 2009
+++ packages/openoffice.org/openoffice.org-hotfix-xulrunner.patch	Tue Jul 28 18:13:35 2009
@@ -0,0 +1,11 @@
+--- extensions/source/plugin/inc/plugin/unx/plugcon.hxx~	2008-12-15 11:29:47.000000000 +0100
++++ extensions/source/plugin/inc/plugin/unx/plugcon.hxx	2009-07-28 08:44:17.126367625 +0200
+@@ -102,7 +102,7 @@
+ extern "C" {
+ #include <npsdk/npupp.h>
+ }
+-#include <npapi.h>
++#include <npsdk/npapi.h>
+ 
+ #if NP_VERSION_MINOR < 17
+ // compatibility hack: compile with older NPN api header, but define
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.838&r2=1.839&f=u