Djam/libreoffice
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libreoffice.git synced 2025-02-23 18:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9 from dsilakov/libreoffice:rosa2014.1

Browse source 
Use javaless build
This commit is contained in:
dsilakov 2014-11-27 12:50:56 +04:00
commit 5b180bc82c
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.abf.yml
View file

@ -18,6 +18,7 @@ removed_sources:
libreoffice-translations-4.3.1.2.tar.xz: 7f30323404d845c9c4e241dfe8169a7bedee1b5f
libreoffice-translations-4.3.2.2.tar.xz: 3ad09b28613781f7a563c2546ba605bee1b69392
sources:
048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip: 885cc4b6c9472d95e2515e777f6018a90657e974
09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt: 42c9235d7f876645ea6553770e7572c1b0b8609a
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz: 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3
@ -26,6 +27,8 @@ sources:
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz: 8f949ae74a6d66278a595bd063f13e0ad196d14a
23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt: da769c6f73206f0f0e6db4697f802c0bacbf4d02
27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt: 6d400d83fa2080847ad9d7e2ca466a98ee2dbfa4
2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz: efc1ab026e8e9ac4cd150cb4cf1b7e4663cddc84
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz: 5c604f102e0716597b3d2659ac3e77f80a02f22d
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050
3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2: ee43834dbd358d2d538b39cdf0b33f15f3195246
3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt: c01632cfaee10322bc4badef316bedd08a759224
@ -35,6 +38,7 @@ sources:
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39
53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca
8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz: c78ddd06845e267ba5bec20a38430f66eec3e0e4
8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt: ad53e6f0b18842ade578cad5acc9ea651ad01a03
9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt: 0f0e7f1f1fd7951de2dd3b6bb7313c6adb4d17b8
CoinMP-1.7.6.tgz: f52c74abcbf55c72cd89f709db658ea33ed45154
@ -42,12 +46,15 @@ sources:
OpenCOLLADA-master-6509aa13af.tar.bz2: c4f5760a1d21213dc52e2cf3ad9c0b9112585f36
a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt: d831314cf4c74f5afb3b37ee718dd58f981b97a8
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz: d490a9bb30ea9e8b95c250f4d96842e0ce0c60d7
af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip: c71f095bf032e29ab0afc277fd2718e592ba6ba4
apache-ant-1.8.1-bin.tar.bz2: 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1
b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt: 27847d6c320297905303ca7d2a45dbd0c492f705
b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389
bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt: c89331a8d7642429f4fe3ffe07ee6d675f99561a
e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz: 95f0805de0be927c42f5f6eb14b643cb37e7caad
libgltf-0.0.2.tar.bz2: 49860235c52b0be395b216d3f33955f935036f8e
libreoffice-4.3.3.2.tar.xz: 10446fd4c40e4e1343b215ea9526094d509e3d63
libreoffice-dictionaries-4.3.3.2.tar.xz: df20a954230ffcdb4b5dfd400222c7b18d63bb57

24
libreoffice.spec
View file

@ -17,7 +17,7 @@
%define helplangs en-US
%endif
%define javaless 0
%define javaless 1
%define relurl http://download.documentfoundation.org/libreoffice/src/%{version}
%define devurl http://dev-www.libreoffice.org/ooo_external
@ -47,7 +47,7 @@ Version: 4.3.3
%if "%{beta}" != ""
Release: 0.%{beta}.1
%else
Release: 1
Release: 2
%endif
Source0: %{relurl}/%{ooname}-%{buildver}.tar.xz
Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz
@ -59,6 +59,14 @@ Url: http://www.libreoffice.org
Source4: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
Source10: Mandriva-Rosa_Icons.tar.bz2
%if %{javaless}
Source20: http://archive.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2
Source30: %{devurl}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
Source31: %{devurl}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
Source32: %{devurl}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
Source322: %{devurl}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
Source321: %{devurl}/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
%endif
Source33: %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
Source34: %{devurl}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
Source35: %{devurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@ -3310,8 +3318,7 @@ touch autogen.lastrun
--without-junit \
%if %{javaless}
--with-ant-home="%{antpath}" \
# %else
# --with-system-hsqldb \
--without-system-apache-commons \
%endif
--with-lang="%{langs}" \
--without-myspell-dicts \
@ -3369,6 +3376,15 @@ mkdir -p external/tarballs
ln -sf %{SOURCE2} external/tarballs/
ln -sf %{SOURCE3} external/tarballs/
cp %{SOURCE4} external/tarballs/
%if %{javaless}
ln -sf %{SOURCE30} external/tarballs/
ln -sf %{SOURCE31} external/tarballs/
ln -sf %{SOURCE32} external/tarballs/
ln -sf %{SOURCE321} external/tarballs/
ln -sf %{SOURCE322} external/tarballs/
%endif
ln -sf %{SOURCE33} external/tarballs/
ln -sf %{SOURCE34} external/tarballs/
ln -sf %{SOURCE35} external/tarballs/