Revert "use system cpp instead of ucpp"

This reverts commit e6dc0f6267.

Build fails with cpp 4.8.0. That is fixable by passing -P to cpp, but
then idlc produces empty urd files (with module descriptions only). I
have no idea why, because a randomly checked preprocessed file looks
fine and idlc seems to parse it correctly. It even seems to dump the
data...

libreoffice.spec

@@ -57,28 +57,29 @@ Source1:        %{source_url}/libreoffice-help-%{version}%{?libo_prerelease}.tar
 Source2:        %{source_url}/libreoffice-translations-%{version}%{?libo_prerelease}.tar.xz
 Source3:        http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 Source4:        libreoffice-multiliblauncher.sh
-Source5:        %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-Source6:        %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-Source7:        %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-Source8:        %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+Source5:        %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+Source6:        %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+Source7:        %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+Source8:        %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.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
 #backwards compatability.
-Source9:        %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+Source10:       %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 %if 0%{?rhel} && 0%{?rhel} < 7
-Source10:       %{external_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
-Source11:       %{external_url}/e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz
-Source12:       %{external_url}/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
-Source13:       %{external_url}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-Source14:       %{external_url}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
-Source15:       %{external_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-Source16:       %{external_url}/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
-Source17:       %{external_url}/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
-Source18:       %{external_url}/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
-Source19:       %{external_url}/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
-Source20:       %{external_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
-Source21:       %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
-Source22:       %{external_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
-Source23:       %{external_url}/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
+Source11:       %{external_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
+Source12:       %{external_url}/e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz
+Source13:       %{external_url}/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
+Source14:       %{external_url}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
+Source15:       %{external_url}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
+Source16:       %{external_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
+Source17:       %{external_url}/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
+Source18:       %{external_url}/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
+Source19:       %{external_url}/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
+Source20:       %{external_url}/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
+Source21:       %{external_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
+Source22:       %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+Source23:       %{external_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
+Source24:       %{external_url}/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 %endif
 
 # build tools
@@ -1045,7 +1046,6 @@ touch autogen.lastrun
  --without-myspell-dicts --without-fonts --without-ppds --without-afms \
  %{?with_lang} --with-poor-help-localizations="$POORHELPS" \
  --with-external-tar="$EXTSRCDIR" --with-java-target-version=1.5 \
- --with-idlc-cpp=cpp \
  %{distrooptions} \
  --disable-fetch-external
 
@@ -2030,6 +2030,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %changelog
 * Wed Jan 23 2013 David Tardon <dtardon@redhat.com> - 1:4.0.0.2-1
 - 4.0.0 rc2
+- use ucpp again
 
 * Tue Jan 22 2013 David Tardon <dtardon@redhat.com> - 1:4.0.0.1-3
 - Resolves: rhbz#760765 Impress doesn't copy custom styles from one file

sources

@@ -5,6 +5,7 @@
 74939c9ea525374776f09bf972ede99f  libreoffice-multiliblauncher.sh
 a7983f859eafb2677d7ff386a023bc40  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 1f24ab1d39f4a51faf22244c94a6203f  1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+0168229624cfac409e766913506961a8  0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 d861dfa6d29851b3266ead28ba3ed7dc  libreoffice-4.0.0.2.tar.xz
 bf488979d1d66744d082e34fc9e429cd  libreoffice-help-4.0.0.2.tar.xz
 4cc5d35ec71c3f4d11464a61b389f7cb  libreoffice-translations-4.0.0.2.tar.xz