From ffe45ee7cf4f3fab66a51a7c1d2ac8c078aecd11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 12 Apr 2011 15:44:10 +0100 Subject: [PATCH] should build now --- .gitignore | 2 ++ libreoffice.spec | 11 +++++++---- sources | 2 ++ unowinreg.dll | Bin 6144 -> 0 bytes 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 unowinreg.dll diff --git a/.gitignore b/.gitignore index 144d88b..a07f39c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ /ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip /fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz /17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 +/185d60944ea767075d27247c3162b3bc-unowinreg.dll /redhat-langpacks.tar.gz /libreoffice-artwork-3.3.2.2.tar.bz2 /libreoffice-base-3.3.2.2.tar.bz2 diff --git a/libreoffice.spec b/libreoffice.spec index 3d9c9e6..e029b0c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -40,7 +40,7 @@ Source16: http://download.documentfoundation.org/libreoffice/src/libreoffi Source17: http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-%{version}.tar.bz2 Source18: http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-%{version}.tar.bz2 Source19: http://download.documentfoundation.org/libreoffice/src/libreoffice-translations-%{version}.tar.bz2 -Source20: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll +Source20: http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll Source21: redhat-langpacks.tar.gz Source22: libreoffice-multiliblauncher.sh Source23: http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz @@ -53,6 +53,7 @@ Source29: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3 #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose #backwards compatability. Source30: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Source31: http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++ BuildRequires: binutils, java-devel >= 1.6.0, boost-devel, zlib-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -69,7 +70,7 @@ BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient, cppunit-devel BuildRequires: jakarta-commons-lang, poppler-devel, fontpackages-devel, junit4 BuildRequires: pentaho-reporting-flow-engine, libXinerama-devel, mythes-devel BuildRequires: silgraphite-devel, libwpg-devel, libwps-devel, vigra-devel -BuildRequires: kdelibs4-devel +BuildRequires: translate-toolkit, kdelibs4-devel Patch1: openoffice.org-2.0.2.rh188467.printingdefaults.patch Patch2: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch @@ -730,10 +731,11 @@ autoconf --without-myspell-dicts --without-fonts --without-ppds --without-afms \ --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" \ --with-external-tar=`pwd`/ext_sources --with-java-target-version=1.5 \ - --enable-kde4 --without-system-hsqldb --disable-graphite + --without-system-translate-toolkit --enable-kde4 --without-system-hsqldb \ + --disable-graphite mkdir -p ext_sources -cp %{SOURCE20} ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll +cp %{SOURCE20} ext_sources cp %{SOURCE23} ext_sources cp %{SOURCE24} ext_sources cp %{SOURCE25} ext_sources @@ -742,6 +744,7 @@ cp %{SOURCE27} ext_sources cp %{SOURCE28} ext_sources cp %{SOURCE29} ext_sources cp %{SOURCE30} ext_sources +cp %{SOURCE31} ext_sources #use the RPM_OPT_FLAGS but remove the OOo overridden ones for i in $RPM_OPT_FLAGS; do diff --git a/sources b/sources index 25b7df5..3d041c3 100644 --- a/sources +++ b/sources @@ -6,6 +6,8 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 +185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll 35c9d670889318e26aad389ed750012f redhat-langpacks.tar.gz 3dec32be5e6d9de3c4c5d549cec6e9e3 libreoffice-artwork-3.3.99.1.tar.bz2 cb1f4e5005a2fd82a85b1982d172a8c0 libreoffice-base-3.3.99.1.tar.bz2 diff --git a/unowinreg.dll b/unowinreg.dll deleted file mode 100644 index d78bb552493d34514a7154c7ee801588967c88d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6144 zcmeHLUuaWj6hG-=8@0M@TGwrb-Og5ImU7cZZHr^6ZFJSv{)whe+r``DHVI4bE%zp? z6*pvKU@a?U4}!11r<%xPr(% zLcTlkCisp`6B7-Bf0^Q634XouVoJU&cuzDKVT?yb+~p-|x2>QnO_y5JKDTIX%$tZlNd+v3t{~x;`(8RMd`K7F__ItM1NrYe(=qZxv(d= z;JKrVr~x`jBC5!>EhfW%{UY|-xOy}W`-dDj2gJE%lE558B05rQgp{~KRLM3dgx@Og ztl>fQwMjQ>V!aGPZUUF()bJ2Z)f%P|ge-D}LhSh>c-HVRo}tEcI3oSz594iMVSads zcIu(`0^1toKww_IJX?YaT-_m&bLPPK9V<~fZnF}OZfo)!&Y*wVK?}8Cb=Y__=;+zvJ=MLd>ue)iL;eNyiT=Zb( z)Xd@jX(!u0zEirOK^`3oP$UE)V&iUwTs7v+iq%TYjd|}Q4ADAPnSDV&EfTBHznOlrs`(P-`;m@J!-gfSk?Bbqu!&<^drkHG2K+5pnq8EPN>GHUx_7DcA$G1U7I$j z!wb6RR)2F>TYX(^C>DEo<8(g9D~W6{^J@-MIb;tg0^;60gZGuw;D3S|ULe{6c?|qF z(BL|vuOXj;?-|f9pbf7R9Rht0x&e9>b?OD32JucsxJlS)1zxR6$U!S9q3I)0%}~Q4 z%-w3-uNr1l*EkQ_qr9&Kg8ERvOlSc!t{8z>bRZDZm5^!#dZQW&fm{PgfPgEzN{_#k z3*Hh_Oj9*`bUj|c<^myM7^)U;(Y3*7_{lI1n5t1Af@quq*S70HCDx$?BT-E)5P~B& z3s@_B$)+-*I+R$r0ZIoh>x*Pf3qoY%jZXl}7VA8P6warMQcT42QN!%KDF zh!!6*gHe}Ui|@9+fvDCu-vS0@_5E7P$Zs%5cOmyI)M}b-$%PJ=kcBW?t|pp zgM;1?&-WyMOIZ2u4!fvDN)+r0iem#_oD7PRMq!{uDMl)gH5w!xUY`jcncR4}+75Cf z299VSy@a(b@EJng75I-rr$AB#wvQ6fNz?(vAnA`Wp2KxNlrU8l$(EV59LK^jNPM8whPG$K3_iNvw3(e(J|VBHSGe4y}1&@$dD@;rU>$+JUWTaBkwxIFVj}c2CzcH z2|Qk{T7hjtHz?RGo$36E5mn)=@ed!Yd@d%UQxMO5ElcdT?XzT#JWtn4ih;zPa^Hp} zPs4C>{K!w9k=MIa*A-Vu-C*6hx^?yU>LYH=9d{pdqh#Vg#vQUpZk6Ab+vTpz_3|{N KupC3-75ES7=