rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use system cpp instead of ucpp

Browse Source
This commit is contained in:
David Tardon 2012-12-22 19:54:46 +01:00
parent 88f272a4f4
commit e6dc0f6267
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libreoffice.spec
View File

@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.0 Version: %{libo_version}.0
Release: 3%{?libo_prerelease}%{?dist} Release: 4%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
Group: Applications/Productivity Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop URL: http://www.documentfoundation.org/develop
@ -53,29 +53,28 @@ Source1: %{source_url}/libreoffice-help-%{version}%{?libo_prerelease}.tar
Source2: %{source_url}/libreoffice-translations-%{version}%{?libo_prerelease}.tar.xz Source2: %{source_url}/libreoffice-translations-%{version}%{?libo_prerelease}.tar.xz
Source3: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll Source3: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
Source4: libreoffice-multiliblauncher.sh Source4: libreoffice-multiliblauncher.sh
Source5: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz Source5: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
Source6: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source6: %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
Source7: %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz Source7: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
Source8: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source8: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
Source9: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
#Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose
#backwards compatability. #backwards compatability.
Source10: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source9: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
%if 0%{?rhel} && 0%{?rhel} < 7 %if 0%{?rhel} && 0%{?rhel} < 7
Source11: %{external_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 Source10: %{external_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
Source12: %{external_url}/e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz Source11: %{external_url}/e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz
Source13: %{external_url}/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz Source12: %{external_url}/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
Source14: %{external_url}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz Source13: %{external_url}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
Source15: %{external_url}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz Source14: %{external_url}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
Source16: %{external_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 Source15: %{external_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
Source17: %{external_url}/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 Source16: %{external_url}/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
Source18: %{external_url}/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 Source17: %{external_url}/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
Source19: %{external_url}/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 Source18: %{external_url}/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
Source20: %{external_url}/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 Source19: %{external_url}/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
Source21: %{external_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz Source20: %{external_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
Source22: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz Source21: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
Source23: %{external_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 Source22: %{external_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
Source24: %{external_url}/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz Source23: %{external_url}/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
%endif %endif
# build tools # build tools
@ -1032,6 +1031,7 @@ touch autogen.lastrun
--without-myspell-dicts --without-fonts --without-ppds --without-afms \ --without-myspell-dicts --without-fonts --without-ppds --without-afms \
%{?with_lang} --with-poor-help-localizations="$POORHELPS" \ %{?with_lang} --with-poor-help-localizations="$POORHELPS" \
--with-external-tar="$EXTSRCDIR" --with-java-target-version=1.5 \ --with-external-tar="$EXTSRCDIR" --with-java-target-version=1.5 \
--with-idlc-cpp=cpp \
%{distrooptions} \ %{distrooptions} \
--disable-fetch-external --disable-fetch-external
@ -2051,6 +2051,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Sat Dec 22 2012 David Tardon <dtardon@redhat.com> - 1:4.0.0.0-4.beta2
- use system cpp instead of ucpp
* Wed Dec 19 2012 David Tardon <dtardon@redhat.com> - 1:4.0.0.0-3.beta2 * Wed Dec 19 2012 David Tardon <dtardon@redhat.com> - 1:4.0.0.0-3.beta2
- 4.0.0 beta2 - 4.0.0 beta2

1
sources
View File

@ -5,7 +5,6 @@
74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh 74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
f0abec2ab5b8a31ba47b00f9cfea0305 libreoffice-4.0.0.0.beta2.tar.xz f0abec2ab5b8a31ba47b00f9cfea0305 libreoffice-4.0.0.0.beta2.tar.xz
847b75db75e5b0a501216bb5420083d2 libreoffice-help-4.0.0.0.beta2.tar.xz 847b75db75e5b0a501216bb5420083d2 libreoffice-help-4.0.0.0.beta2.tar.xz
b6caba12606c6616ff283fea4575d118 libreoffice-translations-4.0.0.0.beta2.tar.xz b6caba12606c6616ff283fea4575d118 libreoffice-translations-4.0.0.0.beta2.tar.xz