Author: cieciwa Date: Wed Jan 21 12:11:31 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to version OOO3_m9
---- Files affected: SPECS: openoffice.org3.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/openoffice.org3.spec diff -u SPECS/openoffice.org3.spec:1.7 SPECS/openoffice.org3.spec:1.8 --- SPECS/openoffice.org3.spec:1.7 Thu Oct 23 13:53:48 2008 +++ SPECS/openoffice.org3.spec Wed Jan 21 13:11:25 2009 @@ -38,27 +38,26 @@ %undefine with_system_hsqldb %endif - Summary: OpenOffice.org - powerful office suite Summary(pl.UTF-8): OpenOffice.org - potężny pakiet biurowy Name: openoffice.org Version: 3.0.0 -Release: 0.1 +Release: 0.2 Epoch: 1 License: GPL/LGPL Group: X11/Applications -Source0: http://openoffice.virginmedia.com/stable/3.0.0/OOo_%{version}_src_core.tar.bz2 -# Source0-md5: ff57567943a0af401819602f04d9bd9f -Source1: http://openoffice.virginmedia.com/stable/3.0.0/OOo_%{version}_src_system.tar.bz2 -# Source1-md5: e2a0f2f99bffed214b802ffda5b96526 -Source2: http://openoffice.virginmedia.com/stable/3.0.0/OOo_%{version}_src_binfilter.tar.bz2 -# Source2-md5: 98414b82b1e976cd42a0323c80c5b773 -Source3: http://openoffice.virginmedia.com/stable/3.0.0/OOo_%{version}_src_l10n.tar.bz2 -# Source3-md5: dde12b88d53220188cf69379e42ef8fc -Source4: http://openoffice.virginmedia.com/stable/3.0.0/OOo_%{version}_src_extensions.tar.bz2 -# Source4-md5: b0ba7be8247b017c8a19f09afebe2b0a +Source0: http://ftp.cc.uoc.gr/openoffice.org/stable/%{version}/OOo_%{version}_src_core.tar.bz2 +# Source0-md5: 29c1e2fef9747e5cae52350b5c2a2260 +Source1: http://ftp.cc.uoc.gr/openoffice.org/stable/%{version}/OOo_%{version}_src_system.tar.bz2 +# Source1-md5: 7312232d0118f4f825c8eaca92991fa8 +Source2: http://ftp.cc.uoc.gr/openoffice.org/stable/%{version}/OOo_%{version}_src_binfilter.tar.bz2 +# Source2-md5: 8c167a99d874c484edc900bcb5f46c97 +Source3: http://ftp.cc.uoc.gr/openoffice.org/stable/%{version}/OOo_%{version}_src_l10n.tar.bz2 +# Source3-md5: 24081cb2e0295d7c7256a3c48b14ce51 +Source4: http://ftp.cc.uoc.gr/openoffice.org/stable/%{version}/OOo_%{version}_src_extensions.tar.bz2 +# Source4-md5: 5044613b6241bc5cd5b97f637bc5f92c # patches applied in prep section -##Patch0: %{name}-PLD.patch +Patch0: OOO300_m9-bridge_missing_include.patch ##Patch1: %{name}-gcc-Wextra.patch # patch50/51 need review ##Patch50: %{name}-mdbtools_fix.diff @@ -67,7 +66,7 @@ ##Patch100: %{name}-lang.patch #Patch101: %{name}-java6.patch ##Patch103: %{name}-missing-includes.diff -##Patch104: %{name}-xulrunner.patch +Patch104: openoffice.org-xulrunner.patch # patches 1000+ need review ##Patch1001: %{name}-64bit-inline.diff ##Patch1002: %{name}-build-pld-splash.diff @@ -2033,7 +2032,9 @@ bashowe uzupełnianie nazw dla Openoffice.org. %prep -%setup -q -b1 -b2 -b3 -b4 -n OOO300_m8 +%setup -q -b1 -b2 -b3 -b4 -n OOO300_m9 +%patch0 +%patch104 -p0 %build cd config_office @@ -2196,8 +2197,9 @@ --%{?with_mono:en}%{!?with_mono:dis}able-mono \ --enable-pam-link \ --enable-opengl \ - --enable-openldap \ + --with-openldap \ --enable-openxml \ + --enable-evolution2 \ --enable-cups \ --enable-fontconfig \ --enable-libsn \ @@ -2234,8 +2236,45 @@ dmake %install -dmake install +%ifarch %{ix86} + . ./LinuxX86Env.Set.sh +%endif +%ifarch %{x8664} + . ./LinuxX86-64Env.Set.sh +%endif + export DESTDIR=$RPM_BUILD_ROOT + export TMP="%{tmpdir}" + export TMPDIR="%{tmpdir}" + export TEMP="%{tmpdir}" + export DEFAULT_TO_ENGLISH_FOR_PACKING=1 +# export INPATH=unxlngi6.pro + +install -d $RPM_BUILD_ROOT/$INPATH/bin + +pwd +#cd config_office +##dmake install SOLARVER=$RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT prefix=/usr + +## prepare language list +## DIRTY HACK !!!!!!!!!!!!! +dd bs=1 skip=14 if=helpcontent2/$INPATH/inc/aux_langs.mk > lang +#sed -e s/" "/","/g lang + + +## HACK +#exit 0 + +cd instsetoo_native/util +export OUT=$INPATH +export LOCAL_OUT=$INPATH +export LOCAL_COMMON_OUT=$INPATH +export DEFAULT_TO_ENGLISH_FOR_PACKING=1 +export PYTHONPATH=$SOLARVER/$INPATH/bin:$SOLARVER/$INPATH/lib:$PYTHONPATH +perl $SOLARENV/bin/make_installer.pl -f openoffice.lst -l `sed -e s/" "/","/g ../../lang` -p OpenOffice -buildid 0 -simple $DESTDIR$prefix + + + %clean rm -rf $RPM_BUILD_ROOT @@ -3825,8 +3864,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.7 2008/10/23 11:53:48 cieciwa -- updated to OO 3.0.0 final. +Revision 1.8 2009/01/21 12:11:25 cieciwa +- updated to version OOO3_m9 Revision 1.6 2008/10/08 18:14:22 cieciwa - buildrequires: dmake ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org3.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
