SPECS (DEVEL): openoffice.org.spec - updated to 2.3.0 (oog680-m5), ...

Sat Sep 29 20:41:46 CEST 2007

Author: adamg                        Date: Sat Sep 29 18:41:46 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated to 2.3.0 (oog680-m5), ooo-build-trunk r10353
- not even halfway done, broken, %build finishes after some hackery...

---- Files affected:
SPECS:
   openoffice.org.spec (1.775 -> 1.775.2.1) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.775 SPECS/openoffice.org.spec:1.775.2.1

--- SPECS/openoffice.org.spec:1.775	Sat Sep 29 00:09:05 2007
+++ SPECS/openoffice.org.spec	Sat Sep 29 20:41:41 2007
@@ -5,6 +5,16 @@
 #		BUILD	       16.2 GB
 #		SRPMS		0.3 GB
 #		RPMS		1.2 GB
+#
+# 2.3.0 NOTES/TODO:
+#  - needs some help to build: when the build fails complaining about --enable-gtk,
+#    go to rpm/BUILD/ooo-build-trunk dir, type make and go grab some coffee. 
+#    After some time it will eventually fail on sc/util (_sv_rules empty), workaround:
+#    comment out the `.IF "$(VBA_EXTENSION)"=="YES"' section (3 lines) in 
+#    build/current/sc/util/makefile.mk, and rerun the build. It will complete, yet it will
+#    fail on install...
+#    
+#
 # TODO:
 #   /usr/share/openoffice.org/share/registry/modules/org/openoffice/Office/Common/Common-ctl_dz.xcu
 #   /usr/share/openoffice.org/share/registry/modules/org/openoffice/Setup/Langpack-dz.xcu
@@ -40,16 +50,18 @@
 %bcond_with	mono		# enable compilation of mono bindings
 %bcond_without	mozilla		# without mozilla components
 %bcond_without	i18n		# do not create i18n packages
+%bcond_with	ccache		# use ccache to speed up builds
+%bcond_with	msaccess	# with ms access import pieces
 
 %bcond_without	system_beanshell
 %bcond_without	system_db		# without system (i.e. with internal) Berkeley DB
 %bcond_with	system_libhnj		# with system ALTLinuxhyph (NFY)
-%bcond_without	system_mdbtools
+%bcond_without	system_mdbtools		# with system mdbtools
 %bcond_without	system_xalan
 %bcond_without	system_xerces
 %bcond_without	system_xml_apis
 %bcond_without	system_hsqldb
-%bcond_without	system_agg
+%bcond_with	system_agg		# with system agg
 %bcond_without	system_hunspell
 %bcond_without	system_myspell
 %bcond_with	system_xt
@@ -69,31 +81,31 @@
 %endif
 
 %define		upd			680
-%define		mws			OOF%{upd}
+%define		mws			OOG%{upd}
 %define		tag			%(echo %{mws} | tr A-Z a-z)-%{milestone}
-%define		milestone	m14
+%define		milestone	m5
 %define		_tag		%(echo %{tag} | tr - _)
-%define		_rel		0.11
+%define		_rel		0.0.1
 
 Summary:	OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):	OpenOffice.org - potÄ™Ĺźny pakiet biurowy
 Name:		openoffice.org
-Version:	2.2.0
+Version:	2.3.0
 Release:	%{_tag}.%{_rel}
 Epoch:		1
 License:	GPL/LGPL
 Group:		X11/Applications
 # svn export http://svn.gnome.org/svn/ooo-build/trunk
-Source0:	ooo-build-r9097.tar.bz2
-# Source0-md5:	4aaaab97e83d87d2b71fcef8ea570a13
+Source0:	ooo-build-r10353.tar.bz2
+# Source0-md5:	c7fe3328c889c2332650f3de3ff3afa0
 Source1:	http://go-ooo.org/packages/%{mws}/%{tag}-core.tar.bz2
-# Source1-md5:	42ec421d4550572c4718b2f4d31a1aef
+# Source1-md5:	eb0bce2625e182db1470b7cebfbcdc17
 Source2:	http://go-ooo.org/packages/%{mws}/%{tag}-system.tar.bz2
-# Source2-md5:	a82acbe556fad97128cea8dc7017da5a
+# Source2-md5:	35cc875dd83712ee1eb43b0b974220ff
 Source3:	http://go-ooo.org/packages/%{mws}/%{tag}-binfilter.tar.bz2
-# Source3-md5:	b22033d24d92a9e65860d594da9e81a0
+# Source3-md5:	8ebfe5ead84524f38c23911805142c4d
 Source4:	http://go-ooo.org/packages/%{mws}/%{tag}-lang.tar.bz2
-# Source4-md5:	c98e40510a858cd6afdd25149f48300c
+# Source4-md5:	8adb383d272ffe100f38d6510e1fc7ea
 Source10:	http://go-ooo.org/packages/SRC680/ooo_custom_images-13.tar.bz2
 # Source10-md5:	2480af7f890c8175c7f9e183a1b39ed2
 Source11:	http://go-ooo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2
@@ -102,8 +114,8 @@
 # Source12-md5:	733051ebeffae5232a2eb760162da020
 Source15:	http://go-ooo.org/packages/xt/xt-20051206-src-only.zip
 # Source15-md5:	0395e6e7da27c1cea7e1852286f6ccf9
-Source16:	http://go-ooo.org/packages/SRC680/lp_solve_5.5.tar.gz
-# Source16-md5:	2ff7b4c52f9c3937ebe3002798fbc479
+Source16:	http://go-ooo.org/packages/SRC680/lp_solve_5.5.0.10_source.tar.gz
+# Source16-md5:	26b3e95ddf3d9c077c480ea45874b3b8
 Source17:	http://go-ooo.org/packages/SRC680/biblio.tar.bz2
 # Source17-md5:	1948e39a68f12bfa0b7eb309c14d940c
 Source18:	http://go-ooo.org/packages/%{mws}/cli_types.dll
@@ -112,10 +124,13 @@
 # Source19-md5:	cadc605a6b0265b8167001b4788ff113
 Source20:	http://go-ooo.org/packages/SRC680/libwps-0.1.0~svn20070129.tar.gz
 # Source20-md5:	2e442485100f7e00685737513f853546
+Source21:	http://go-ooo.org/packages/SRC680/libwpg-0.1.0.tar.gz
+# Source21-md5:	1d9644fb4c90511255c1576b4b30b1d2
 Source50:	openabout_pld.png
-# Source50-md5: 64a945a07b64ebc0a12adfde4c99da8a
+# Source50-md5:	64a945a07b64ebc0a12adfde4c99da8a
 # patches applied in prep section
 Patch0:		%{name}-PLD.patch
+#Patch1:		%{name}-sc-dataform.patch
 Patch2:		%{name}-stl5_fix.patch
 Patch3:		%{name}-mdbtools_fix.diff
 Patch4:		%{name}-nolfs_hack.patch
@@ -134,8 +149,6 @@
 Patch110:	%{name}-nsplugin-path.diff
 Patch111:	%{name}-perl-nodiag.patch
 Patch112:	%{name}-gcc42-swregion.diff
-Patch113:	%{name}-neon.diff
-Patch114:	%{name}-curl.diff
 URL:		http://www.openoffice.org/
 BuildRequires:	/usr/bin/getopt
 BuildRequires:	STLport-devel >= 2:5.0.0
@@ -149,6 +162,7 @@
 BuildRequires:	boost-spirit-devel
 BuildRequires:	boost-uBLAS-devel
 BuildRequires:	cairo-devel >= 0.5.2
+%{?with_ccache:BuildRequires:	ccache}
 BuildRequires:	cups-devel
 BuildRequires:	curl-devel >= 7.9.8
 %{?with_system_db:BuildRequires:	db-cxx-devel}
@@ -160,7 +174,7 @@
 BuildRequires:	gstreamer-devel >= 0.10.0
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.0
 BuildRequires:	gtk+2-devel
-%{?with_system_hsqldb:BuildRequires:	hsqldb >= 1.8.0}
+%{?with_system_hsqldb:BuildRequires:	hsqldb >= 1.8.0.8}
 %{?with_system_hunspell:BuildRequires:	hunspell-devel}
 BuildRequires:	icu
 %{?with_kde:BuildRequires:	kdelibs-devel}
@@ -171,10 +185,11 @@
 BuildRequires:	libjpeg-devel
 BuildRequires:	libsndfile-devel
 BuildRequires:	libstdc++-devel >= 5:3.2.1
+BuildRequires:	libsvg-devel >= 0.1.4
 BuildRequires:	libwpd-devel >= 0.8.6
 BuildRequires:	libwps-devel
 BuildRequires:	libxml2-devel >= 2.0
-%{?with_system_mdbtools:BuildRequires:	mdbtools-devel >= 0.6}
+%{?with_access:%{?with_system_mdbtools:BuildRequires:	mdbtools-devel >= 0.6}}
 %{?with_mono:BuildRequires:	mono-csharp >= 1.2.3}
 %{?with_mono:BuildRequires:	mono-static >= 1.2.3}
 %{?with_system_myspell:BuildRequires:	myspell-devel}
@@ -236,7 +251,7 @@
 ExclusiveArch:	%{ix86} %{x8664} ppc sparc sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags	-fno-strict-aliasing
+%define		specflags	-fno-strict-aliasing -O2
 
 # No ELF objects there to strip/chrpath, skips processing:
 # - share/ - 17000 files of 415M
@@ -2054,7 +2069,7 @@
 bashowe uzupeĹ‚nianie nazw dla Openoffice.org.
 
 %prep
-%setup -q -n %(basename %{SOURCE0} .tar.bz2)
+%setup -q -n ooo-build-trunk
 install -d src
 
 # sources, icons, KDE_icons
@@ -2062,48 +2077,50 @@
 	%{SOURCE10} %{SOURCE11} %{SOURCE12} \
 	%{SOURCE15} %{SOURCE16} %{SOURCE17} \
 	%{SOURCE18} %{SOURCE19} \
-	%{SOURCE20} \
+	%{SOURCE20} %{SOURCE21} \
 	src
 
 cp %{SOURCE50} src
 
 # fixes for the patch subsystem
 %patch0 -p1
+#%patch1 -p0
 
 #%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch3 -p1
+#%patch4 -p1
 %patch6 -p1
-%if %{with system_myspell}
-%patch7 -p1
-%endif
+#%if %{with system_myspell}
+#%patch7 -p1
+#%endif
 #%patch8 -p1
-%patch9 -p1
+#%patch9 -p1
 
 # 64 bit related patches (not applied now)
-install %{PATCH100} patches/64bit
-install %{PATCH101} patches/64bit/64bit-inline.diff
+#install %{PATCH100} patches/64bit
+#install %{PATCH101} patches/64bit/64bit-inline.diff
 
-%ifarch %{x8664}
-echo "[ PLD64bitfixes ]" >> patches/src680/apply
-# patches applied by ooo (extension .diff is required)
-for P in %{PATCH107}; do
-	PATCHNAME=PLD-${P##*/%{name}-}
-	PATCHNAME=${PATCHNAME%.patch}.diff
-	install $P patches/src680/$PATCHNAME
-	echo $PATCHNAME >> patches/src680/apply
-done
-%endif
+#%ifarch %{x8664}
+#echo "[ PLD64bitfixes ]" >> patches/src680/apply
+## patches applied by ooo (extension .diff is required)
+#for P in %{PATCH107}; do
+#	PATCHNAME=PLD-${P##*/%{name}-}
+#	PATCHNAME=${PATCHNAME%.patch}.diff
+#	install $P patches/src680/$PATCHNAME
+#	echo $PATCHNAME >> patches/src680/apply
+#done
+#%endif
 
 echo "[ PLDOnly ]" >> patches/src680/apply
 # patches applied by ooo (extension .diff is required)
-for P in %{PATCH102} %{PATCH104} %{PATCH108} %{PATCH109} %{PATCH111} %{PATCH112} %{PATCH113} %{PATCH114}; do
+#for P in %{PATCH102} %{PATCH104} %{PATCH108} %{PATCH109} %{PATCH111} %{PATCH112}; do
+for P in %{PATCH108}; do
 	PATCHNAME=PLD-${P##*/%{name}-}
 	PATCHNAME=${PATCHNAME%.patch}.diff
 	install $P patches/src680/$PATCHNAME
 	echo $PATCHNAME >> patches/src680/apply
 done
-cp %{PATCH110} patches/src680/nsplugin-path.diff
+#cp %{PATCH110} patches/src680/nsplugin-path.diff
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -2165,14 +2182,14 @@
 	--with-arch=x86_64 \
 %endif
 	--disable-odk \
-	--with-ccache-allowed \
+	%{?with_ccache:--with-gcc-speedup=ccache} \
 	%{?with_system_agg:--with-system-agg} \
 	%{?with_system_beanshell:--with-system-beanshell} \
 	%{?with_system_db:--with-system-db} \
 	%{?with_system_hsqldb:--with-system-hsqldb} \
 	%{?with_system_hunspell:--with-system-hunspell --without-myspell-dicts} \
 	%{?with_system_libhnj:--with-system-altlinuxhyphen} \
-	%{?with_system_mdbtools:--with-system-mdbtools} \
+	%{?with_msaccess:%{?with_system_mdbtools:--with-system-mdbtools}} \
 	%{?with_system_myspell:--with-system-myspell} \
 	%{?with_system_xalan:--with-system-xalan --with-xalan-jar=%{_javadir}/xalan.jar --with-serializer-jar=$serializer_jar} \
 	%{?with_system_xerces:--with-system-xerces} \
@@ -2184,8 +2201,9 @@
 	--with-system-expat \
 	--with-system-freetype \
 	--with-system-gcc \
-	--with-system-icu \
+	--without-system-icu \
 	--with-system-jpeg \
+	--with-system-libsvg \
 	--with-system-libwpd \
 	--with-system-libwps \
 	--with-system-libxml \
@@ -2240,7 +2258,7 @@
 	--disable-epm \
 	--disable-fontooo \
 	--disable-strip \
-	--enable-access \
+	--%{?with_msaccess:en}%{!?with_msaccess:dis}able-access \
 	--enable-cairo \
 	--enable-crypt-link \
 	--%{?with_mono:en}%{!?with_mono:dis}able-mono \
@@ -2261,7 +2279,8 @@
 %endif
 	--with-num-cpus=$RPM_BUILD_NR_THREADS \
 	--with-build-version=%{version}-%{release} \
-	--with-tag=%{tag}
+	--with-tag=%{tag} \
+	--with-drink=coffee
 "
 
 # build-ooo script will pickup these
@@ -3982,6 +4001,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.775.2.1  2007/09/29 18:41:41  adamg
+- updated to 2.3.0 (oog680-m5), ooo-build-trunk r10353
+- not even halfway done, broken, %build finishes after some hackery...
+
 Revision 1.775  2007/09/28 22:09:05  lisu
 - rename .desktop files by adding oo at begining of each one
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.775&r2=1.775.2.1&f=u

