mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 18:43:00 +00:00
fix spec
This commit is contained in:
Sergey A. Sokolov
parent
78ebad98df
commit
0bafb2a828
3 changed files with 7 additions and 44 deletions
28
.abf.yml
28
.abf.yml
|
|
@ -1,44 +1,16 @@
|
|||
removed_sources:
|
||||
libreoffice-4.2.5.2.tar.xz: 42b532233e4226f2b71841806cab555f05132c3f
|
||||
libreoffice-dictionaries-4.2.5.2.tar.xz: c84fa5de085253df3e85952ee09d2726d8de3255
|
||||
libreoffice-help-4.2.5.2.tar.xz: 8c09ab1f8c42a4aeefcb60bd782db45bc5f18e7a
|
||||
libreoffice-translations-4.2.5.2.tar.xz: 8114da4235820205e4dd4650fcdfb049c823e516
|
||||
sources:
|
||||
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz: 452eba922e4f41603539c9dc39947d2271e47093
|
||||
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
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b
|
||||
1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip: 1dd5bd9962e851b5e487b0c2033b5a8951aaefad
|
||||
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
|
||||
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt: e38bfefa6b747db13182e4ea5c1ad2eed3fa9cda
|
||||
472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt: d2b6a076b40d8d517075e52220ddd8f89f655c8f
|
||||
4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt: bf25bef71f72a4622089c85958bfd6c58d8516a6
|
||||
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39
|
||||
53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca
|
||||
8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt: ad53e6f0b18842ade578cad5acc9ea651ad01a03
|
||||
9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt: 0f0e7f1f1fd7951de2dd3b6bb7313c6adb4d17b8
|
||||
CoinMP-1.7.6.tgz: f52c74abcbf55c72cd89f709db658ea33ed45154
|
||||
Mandriva-Rosa_Icons.tar.bz2: 53448c079fcb3008d1fdec7f95305fe392460c1f
|
||||
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
|
||||
libreoffice-4.3.0.4.tar.xz: 68eae0e9e2a483dd04a41ce945c8b06f4654f909
|
||||
libreoffice-dictionaries-4.3.0.4.tar.xz: b8d4ce08c8f8ed257d9988783f3e39be94055d91
|
||||
libreoffice-help-4.3.0.4.tar.xz: e420a5e62d8cfcf2cbb422936484f7e5ea6a2b9d
|
||||
|
|
|
|||
|
|
@ -22,13 +22,3 @@
|
|||
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", OUString("http://download.openoffice.org/"), m_aURI );
|
||||
|
||||
const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n"
|
||||
--- libreoffice-4.3.0/i18nlangtag/qa/cppunit/test_languagetag.cxx.orig 2014-08-05 13:47:52.947357928 +0400
|
||||
+++ libreoffice-4.3.0/i18nlangtag/qa/cppunit/test_languagetag.cxx 2014-08-05 13:48:01.328357612 +0400
|
||||
@@ -592,7 +592,6 @@
|
||||
OUString aCanonicalized;
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized) && aCanonicalized == "en-US" );
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized) && aCanonicalized == "x-foobar" );
|
||||
- CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized) && aCanonicalized == "qaa" );
|
||||
CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "unreg-and-bad", &aCanonicalized) );
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized, true) && aCanonicalized == "en-US" );
|
||||
CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized, true) && aCanonicalized == "x-foobar" );
|
||||
|
|
|
|||
|
|
@ -3331,7 +3331,7 @@ sed -i -e "s,\$ENV{'MD5SUM'},md5sum,g" solenv/bin/modules/installer/systemaction
|
|||
echo "Configure end at: "`date` >> ooobuildtime.log
|
||||
echo "Make start at: "`date` >> ooobuildtime.log
|
||||
|
||||
# some configs to improve build process
|
||||
# some configs to improve build process
|
||||
# http://wiki.services.openoffice.org/wiki/Building_OpenOffice.org
|
||||
# needs to check if it does any effect
|
||||
export nodep=TRUE
|
||||
|
|
@ -3347,6 +3347,7 @@ ln -sf %{SOURCE35} external/tarballs/
|
|||
ln -sf %{SOURCE36} external/tarballs/
|
||||
|
||||
ln -sf %{SOURCE50} external/tarballs/
|
||||
ln -sf %{SOURCE60} external/tarballs/
|
||||
|
||||
ln -sf %{SOURCE68} external/tarballs/
|
||||
ln -sf %{SOURCE69} external/tarballs/
|
||||
|
|
@ -3385,11 +3386,11 @@ mkdir -p %{buildroot}%{_iconsdir}/hicolor/scalable/apps/
|
|||
tar -xjvf %{SOURCE10} --exclude Libre_Office* -C %{buildroot}%{_iconsdir}/hicolor/scalable/apps/
|
||||
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-calc_72/' %{buildroot}%{ooodir}/share/xdg/calc.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-writer_72/' %{buildroot}%{ooodir}/share/xdg/writer.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-impress_72/' %{buildroot}%{ooodir}/share/xdg/impress.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-draw_72/' %{buildroot}%{ooodir}/share/xdg/draw.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-base_72/' %{buildroot}%{ooodir}/share/xdg/base.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-math_72/' %{buildroot}%{ooodir}/share/xdg/math.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-writer_72/' %{buildroot}%{ooodir}/share/xdg/writer.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-impress_72/' %{buildroot}%{ooodir}/share/xdg/impress.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-draw_72/' %{buildroot}%{ooodir}/share/xdg/draw.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-base_72/' %{buildroot}%{ooodir}/share/xdg/base.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-math_72/' %{buildroot}%{ooodir}/share/xdg/math.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo_72/' %{buildroot}%{ooodir}/share/xdg/startcenter.desktop
|
||||
|
||||
# some genius committed commit log files...
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue