SPECS: openoffice.org.spec - updated to beta version 2.0.4, build ...
sls
sls at pld-linux.org
Tue Oct 24 23:46:44 CEST 2006
Author: sls Date: Tue Oct 24 21:46:44 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated to beta version 2.0.4, build m4
- removed bcond th
- BuildRequires adapted to th enviroment
- added bconds to build with system db, mdbtools, xt, beanshell, libhnj
- bcond with java enabled to build with help files
- removed outdated bashizm patch
- added patches: i66982, stl5_fix, portaudio_v19,
mdbtools_fix, nolfs_hack, firefox, regcomp_ugly_hack
- fixed java_home dir
- fixed typo in sane-headers
- using system libraries/packages: neon, icu, libwpd, mdbtools, portaudio,
sndfile, beanshell, xmlsec1
- added missing dir: _libdir/name/help
- added source17 (biblio)
- updated TODO
- updated info about required disk space
---- Files affected:
SPECS:
openoffice.org.spec (1.605 -> 1.606)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.605 SPECS/openoffice.org.spec:1.606
--- SPECS/openoffice.org.spec:1.605 Tue Jul 11 14:17:39 2006
+++ SPECS/openoffice.org.spec Tue Oct 24 23:46:39 2006
@@ -1,17 +1,24 @@
# $Revision$, $Date$
# NOTE:
-# - normal build requires little less than 4GB of disk space
-# - full debug build requires about 9GB of disk space
+# - normal build with java requires little less than 17GB of disk space
+# $BUILD_ROOT 4.8 GB
+# BUILD 11.7 GB
+# SRPMS 0.3 GB
+# RPMS 0.8 GB
# TODO:
-# - fix build with freetype 2.2.x:
-# http://www.openoffice.org/nonav/issues/showattachment.cgi/36573/vcl-freetype-2.2.x.diff
+# - fix regcomp.bin crash (workarounded by strace hack)
+# - fix xml2cmp crash (workarounded by no_lfs_hack)
+# - fix help files (xslt hacker needed)
+# - add i18n-ku subpackaged
+# - bcond with_xt is broken (xt in PLD is too old or broken)
+# - check bconds with_mono and with_vfs
+# - build on 64-bit archsitectures
+# MAYBE TODO:
# - drop requirement on nas-devel
# - fix locale names and other locale related things
# - --with-system-myspell + myspell package as in Debian
-# - --with-system-neon - check compilation (works with 0.24 but not 0.25)
# - in gtk version menu highlight has almost the same colour as menu text
# - 6 user/config/*.so? files shared between -i18n-en and -i18n-sl
-# - remove oohtml symlink (there is ooweb),
# - add ooglobal symlink and it's ooo-wrapper entry (among calc|draw|impress|math|web|writer)
# - add %{_libdir}/%{name}/share/autocorr/acor_(ll)-(LL).dat files to package (marked with %lang)
# - can't be just i18n-{be,gu,hi,kn,pa,ta} instead of *-{be_BY,*_IN}?
@@ -20,55 +27,56 @@
# - ooqstart (disappeared from 2.0.3?)
# - check:
# Installed (but unpackaged) file(s) found:
-# /usr/lib/openoffice.org/program/.testtoolrc
+# /usr/lib/openoffice.org/program/testtoolrc
# /usr/lib/openoffice.org/program/cde-open-url
+# %if %{without java}
# /usr/lib/openoffice.org/program/hid.lst
# /usr/lib/openoffice.org/program/java-set-classpath
# /usr/lib/openoffice.org/program/jvmfwk3rc
+# %endif
#
# Conditional build:
-%bcond_with java # Java support (enables help support and improves functionality)
+%bcond_without java # without Java support (disables help support)
%bcond_with vfs # Enable GNOME VFS and Evolution 2 support
-%bcond_with mono
-%bcond_with gcc4 # use gcc4 patch (breaks build with gcc 3.3.x)
+%bcond_with mono # enable compilation of mono bindings
%bcond_without mozilla # without mozilla
-## build for TH
-%bcond_with th
+%bcond_without system_db # with internal berkeley db
+%bcond_without system_mdbtools
+%bcond_with system_xt
+%bcond_without system_beanshell
+%bcond_without system_libhnj # with internal ALTLinuxhyph
-%define ver 2.0
-%define rel 3
-%define ooobver ooc680-m7
-%define snap OOC680
-%define snap2 SRC680
-%define bver %{nil}
+%define ver 2.0.4
+%define _rel 3
%define subver 680
+%define snap OOD680
+%define snap2 SRC680
+%define bver m4
+%define ooobver ood680-%{bver}
+%define ssnap ood680-%{bver}
-%define fullver %{ver}.%{rel}
-%define dfullver %(echo %{fullver} | tr . _)
-#%define ssnap OOO_%{dfullver}
-%define ssnap ooc680-m7
%define specflags -fno-strict-aliasing
Summary: OpenOffice.org - powerful office suite
Summary(pl): OpenOffice.org - potężny pakiet biurowy
Name: openoffice.org
-Version: %{fullver}
-Release: 0.0.3.1%{?with_vfs:vfs}
+Version: %{ver}
+Release: 0.%{bver}%{?with_vfs:vfs}.%{_rel}
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
Source0: http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz
-# Source0-md5: 97045632ac7291ef80681351634626f5
+# Source0-md5: 400590f308afd5189bfceaca9eb75878
Source1: http://go-ooo.org/packages/%{snap}/%{ssnap}-core.tar.bz2
-# Source1-md5: fbc38a693821f7abdaf6e2cbfc802b7b
+# Source1-md5: 78af5bdc68cb594d77365cf405a79864
Source2: http://go-ooo.org/packages/%{snap}/%{ssnap}-system.tar.bz2
-# Source2-md5: 46bf9184fe04c7aca1a4cbdd65881164
+# Source2-md5: ba224f69a027211742517f784bcb7ad4
Source3: http://go-ooo.org/packages/%{snap}/%{ssnap}-binfilter.tar.bz2
-# Source3-md5: 810ec48412698e7a89a3164cc756cd81
+# Source3-md5: d737f3b71caf365c75eeae5b31d99bdb
Source4: http://go-ooo.org/packages/%{snap}/%{ssnap}-lang.tar.bz2
-# Source4-md5: 85ebe692d05cca9949d68c32696a87e4
+# Source4-md5: 3db28ac4efab118c57d3015361de62d0
Source10: http://go-ooo.org/packages/%{snap2}/ooo_custom_images-13.tar.bz2
# Source10-md5: 2480af7f890c8175c7f9e183a1b39ed2
Source11: http://go-ooo.org/packages/%{snap2}/ooo_crystal_images-1.tar.gz
@@ -83,30 +91,32 @@
# Source15-md5: 0395e6e7da27c1cea7e1852286f6ccf9
Source16: http://go-ooo.org/packages/%{snap2}/lp_solve_5.5.tar.gz
# Source16-md5: 2ff7b4c52f9c3937ebe3002798fbc479
+Source17: http://go-ooo.org/packages/%{snap2}/biblio.tar.bz2
Source50: openabout_pld.png
Source51: openintro_pld.bmp
-Patch0: %{name}-bashizm.patch
+Patch0: %{name}-stl5_fix.patch
Patch1: %{name}-PLD.patch
Patch2: %{name}-vendorname.patch
+Patch3: %{name}-mdbtools_fix.patch
+Patch4: %{name}-nolfs_hack.patch
Patch100: %{name}-STL-lib64.diff
Patch101: %{name}-64bit-inline.diff
Patch102: %{name}-build-pld-splash.diff
Patch103: %{name}-sfx2.badscript.diff
+Patch104: %{name}-portaudio_v19.diff
+Patch105: %{name}-firefox.patch
+Patch106: %{name}-i66982.diff
+Patch107: %{name}-regcomp_ugly_hack.diff
URL: http://www.openoffice.org/
+BuildConflicts: STLport4
BuildRequires: ImageMagick
-BuildRequires: STLport-devel >= 4.5.3-6
-%if %{with th}
+BuildRequires: STLport-devel >= 5.0.0
BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-xserver-Xvfb
BuildRequires: mozilla-firefox-devel
-%else
-%if %{with mozilla}
-BuildRequires: mozilla-devel >= 5:1.7.6-2
-%endif
-BuildRequires: XFree86-devel
-BuildRequires: XFree86-Xvfb
-%endif
BuildRequires: autoconf
BuildRequires: automake
+%{?with_system_beanshell:BuildRequires: beanshell}
BuildRequires: bison >= 1.875-4
BuildRequires: boost-devel
BuildRequires: boost-spirit-devel
@@ -114,8 +124,10 @@
BuildRequires: cairo-devel >= 0.5.2
BuildRequires: cups-devel
BuildRequires: curl-devel >= 7.9.8
+%if %{with system_db}
BuildRequires: db-cxx-devel
BuildRequires: db-devel
+%endif
BuildRequires: /usr/bin/getopt
%if %{with vfs}
BuildRequires: gnome-vfs2-devel
@@ -132,11 +144,21 @@
BuildRequires: fontconfig-devel >= 1.0.1
BuildRequires: freetype-devel >= 2.1
BuildRequires: gtk+2-devel
+BuildRequires: icu
BuildRequires: kdelibs-devel
BuildRequires: libart_lgpl-devel
+%if %{with system_libhnj}
+BuildRequires: libhnj-devel
+%endif
+BuildRequires: libicu-devel
+BuildRequires: libwpd-devel
BuildRequires: libstdc++-devel >= 5:3.2.1
BuildRequires: libxml2-devel >= 2.0
BuildRequires: libjpeg-devel
+BuildRequires: libsndfile-devel
+%if %{with system_mdbtools}
+BuildRequires: mdbtools-devel >= 0.6
+%endif
BuildRequires: nss-devel >= 1:3.10
BuildRequires: nspr-devel >= 1:4.6-0.20041030.3
%if %{with mono}
@@ -145,12 +167,13 @@
%endif
BuildRequires: nas-devel >= 1.7-1
BuildRequires: neon-devel
-BuildRequires: openclipart-png >= 0:0.18
+BuildRequires: openclipart-png >= 0:0.16
BuildRequires: openldap-devel
BuildRequires: pam-devel
BuildRequires: perl-base
BuildRequires: perl-Archive-Zip
BuildRequires: pkgconfig
+BuildRequires: portaudio-devel
BuildRequires: python >= 2.2
BuildRequires: python-devel >= 2.2
BuildRequires: python-modules >= 2.2
@@ -163,6 +186,8 @@
BuildRequires: tcsh
BuildRequires: unixODBC-devel
BuildRequires: unzip
+BuildRequires: xmlsec1-nss-devel
+%{?with_system_xt:BuildRequires: xt}
BuildRequires: zip
BuildRequires: zlib-devel
BuildConflicts: java-sun = 1.4.2
@@ -173,6 +198,7 @@
Requires: libstdc++ >= 5:3.2.1
Requires: mktemp
Requires: sed
+Conflicts: libicu > 3.4.1
Obsoletes: openoffice
#Suggests: chkfontpath
ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
@@ -1775,17 +1801,18 @@
# sources, icons, KDE_icons
ln -sf %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
%{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
- %{SOURCE14} %{SOURCE15} %{SOURCE16} src
+ %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} src
-# bashizm
%patch0 -p1
-
# fixes for the patch subsystem
%patch1 -p1
# teach configure.in about PLD
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
# 64 bit related patches
install %{PATCH100} patches/64bit
install %{PATCH101} patches/64bit/64bit-inline.diff
@@ -1796,6 +1823,11 @@
# macro browser can crash if there's an invalid script container
install %{PATCH103} patches/src680/sfx2.badscript.diff
+install %{PATCH104} patches/src680/portaudio_v19.diff
+install %{PATCH105} patches/src680/mozilla-firefox.diff
+install %{PATCH106} patches/src680/unxlngi4.mk_linker.diff
+install %{PATCH107} patches/src680/regcomp_ugly_hack.diff
+
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
if [ ! -r /proc/cpuinfo ]; then
@@ -1823,11 +1855,10 @@
export CC CXX ENVCFLAGS ENVCFLAGSCXX DESTDIR IGNORE_MANIFEST_CHANGES DISTRO QTINC QTLIB
%if %{with java}
-JAVA_HOME=%{_libdir}/java
+JAVA_HOME=%{java_home}
DB_JAR="%{_javadir}/db.jar"
-export JAVA_HOME DB_JAR
ANT_HOME=%{_prefix}
-export ANT_HOME
+export JAVA_HOME DB_JAR ANT_HOME
%endif
DEFAULT_TO_ENGLISH_FOR_PACKING=1; export DEFAULT_TO_ENGLISH_FOR_PACKING
@@ -1848,16 +1879,19 @@
%ifarch %{x8664}
--with-arch=x86_64 \
%endif
+ --disable-odk \
--with-ccache-allowed \
--with-system-gcc \
--with-system-zlib \
--with-system-jpeg \
--with-system-libxml \
--with-system-python \
- --with-system-sane-headers \
+ --with-system-sane-header \
--with-system-x11-extensions-headers \
--with-system-odbc-headers \
+%if %{with system_db}
--with-system-db \
+%endif
--with-system-curl \
--with-system-freetype \
--with-system-nas \
@@ -1866,9 +1900,25 @@
--with-system-expat \
--with-system-sablot \
--with-system-boost \
- --without-system-neon \
+ --with-system-icu \
+ --with-system-libwpd \
+%if %{with system_mdbtools}
+ --with-system-mdbtools \
+%endif
+ --with-system-neon \
+ --with-system-portaudio \
+ --with-system-sndfile \
+%if %{with system_xt}
+ --with-system-xt \
+ --with-xt-jar=/usr/share/java/classes/ \
+%endif
+%if %{with system_beanshell}
+ --with-system-beanshell \
+%endif
+ --with-system-xmlsec \
%if %{with mozilla}
--with-system-mozilla \
+ --with-firefox \
%else
--disable-mozilla \
%endif
@@ -1896,7 +1946,7 @@
--with-docdir=%{_docdir}/%{name}-%{version} \
--with-python=%{_bindir}/python \
--with-openclipart=%{_datadir}/openclipart \
- --with-stlport4=/usr \
+ --with-stlport=/usr \
--with-x \
--without-fonts \
--without-gpc \
@@ -1924,9 +1974,6 @@
--with-num-cpus=$RPM_BUILD_NR_THREADS
"
-# for cvs snaps
-[ -x ./autogen.sh ] && ./autogen.sh $CONFOPTS
-
# build-ooo script will pickup these
CONFIGURE_OPTIONS="$CONFOPTS"; export CONFIGURE_OPTIONS
@@ -1934,6 +1981,9 @@
:> distro-configs/Common.conf.in
echo "$CONFOPTS" > distro-configs/${DISTRO}.conf.in
+# for cvs snaps
+[ -x ./autogen.sh ] && ./autogen.sh $CONFOPTS
+
# main build
%configure \
$CONFOPTS
@@ -2262,6 +2312,7 @@
%attr(755,root,root) %{_libdir}/%{name}/program/jvmfwk3rc
%attr(755,root,root) %{_libdir}/%{name}/program/JREProperties.class
#%attr(755,root,root) %{_libdir}/%{name}/program/cde-open-url
+%dir %{_libdir}/%{name}/help
%{_libdir}/%{name}/help/en
%{_libdir}/%{name}/help/main_transform.xsl
%{_libdir}/%{name}/program/hid.lst
@@ -2338,6 +2389,24 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.606 2006/10/24 21:46:39 sls
+- updated to beta version 2.0.4, build m4
+- removed bcond th
+- BuildRequires adapted to th enviroment
+- added bconds to build with system db, mdbtools, xt, beanshell, libhnj
+- bcond with java enabled to build with help files
+- removed outdated bashizm patch
+- added patches: i66982, stl5_fix, portaudio_v19,
+ mdbtools_fix, nolfs_hack, firefox, regcomp_ugly_hack
+- fixed java_home dir
+- fixed typo in sane-headers
+- using system libraries/packages: neon, icu, libwpd, mdbtools, portaudio,
+ sndfile, beanshell, xmlsec1
+- added missing dir: _libdir/name/help
+- added source17 (biblio)
+- updated TODO
+- updated info about required disk space
+
Revision 1.605 2006/07/11 12:17:39 adamg
- exclude nsplugin when `--without mozilla' bcond passed
- avoid dependency on kdelibs-libs in openoffice.org-libs (noticed by
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.605&r2=1.606&f=u
More information about the pld-cvs-commit
mailing list