From c30b497836a5d5da0ecc587671e16cbebf67adcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 6 Dec 2010 16:22:30 +0000
Subject: [PATCH] html variants gone now

---
 libreoffice.spec | 25 ++++++++++++++++++-------
 sources          |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/libreoffice.spec b/libreoffice.spec
index 5fb4b6b..ed2b8aa 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -831,12 +831,27 @@ fi
 if [ $ok == "false" ]; then
     exit 1
 fi
-mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}
-rsync -apl --link-dest=`readlink -f ../unxlng*.pro/LibreOffice/installed/install/en-US` ../unxlng*.pro/LibreOffice/installed/install/en-US/ $RPM_BUILD_ROOT/%{baseinstdir}
+if dmake openoffice_en-US; then
+    ok=true
+    break
+else
+    echo - ---dump log start---
+    cat ../unx*.pro/OpenOffice/installed/logging/en-US/log_*_en-US.log
+    echo - ---dump log end---
+    ok=false
+fi
+if [ $ok == "false" ]; then
+    exit 1
+fi
+mv ../unxlng*.pro/OpenOffice/installed/install/en-US/* $RPM_BUILD_ROOT/%{instdir}
 chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir}
 %if %{langpacks}
 dmake ooolanguagepack
-rsync -apl --link-dest=`readlink -f ../unxlng*.pro/LibreOffice_languagepack/installed/install/` ../unxlng*.pro/LibreOffice_languagepack/installed/install/ $RPM_BUILD_ROOT/%{baseinstdir}
+rm -rf ../unxlng*.pro/OpenOffice_languagepack/installed/install/log
+for langpack in ../unxlng*.pro/OpenOffice_languagepack/installed/install/*; do
+  cp -rp $langpack/* $RPM_BUILD_ROOT/%{instdir}
+  rm -rf $langpack
+done
 %endif
 for file in swriter scalc simpress sdraw ; do
     cp -f ../../desktop/$OUTPATH.pro/bin/$file $RPM_BUILD_ROOT/%{baseinstdir}/program/$file.bin
@@ -1621,10 +1636,8 @@ rm -rf $RPM_BUILD_ROOT
 %{baseinstdir}/program/setuprc
 %{baseinstdir}/program/versionrc
 %doc %{baseinstdir}/LICENSE
-%doc %{baseinstdir}/LICENSE.html
 %doc %{baseinstdir}/LICENSE.odt
 %doc %{baseinstdir}/README
-%doc %{baseinstdir}/README.html
 %doc %{baseinstdir}/THIRDPARTYLICENSEREADME.html
 %dir %{baseinstdir}/program
 %{baseinstdir}/program/about.*
@@ -1645,9 +1658,7 @@ rm -rf $RPM_BUILD_ROOT
 %docdir %{baseinstdir}/share/readme
 %dir %{baseinstdir}/share/readme
 %{baseinstdir}/share/readme/LICENSE_en-US
-%{baseinstdir}/share/readme/LICENSE_en-US.html
 %{baseinstdir}/share/readme/README_en-US
-%{baseinstdir}/share/readme/README_en-US.html
 %dir %{baseinstdir}/share/registry
 %{baseinstdir}/share/registry/brand.xcd
 %{baseinstdir}/share/xdg/
diff --git a/sources b/sources
index 5cac61b..55aa42c 100644
--- a/sources
+++ b/sources
@@ -5,7 +5,6 @@
 a7983f859eafb2677d7ff386a023bc40  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 ada24d37d8d638b3d8a9985e80bc2978  ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 fdb27bfe2dbe2e7b57ae194d9bf36bab  fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-7d38610a11453ee5d12aefe7abda7e91  redhat-langpacks.tar.gz
 70443d68797b04e6fdfb41a0b3fd6bac  libreoffice-artwork-3.3.0.1.tar.bz2
 52450011cf1bd3d1766eff2f3de44c8f  libreoffice-base-3.3.0.1.tar.bz2
 7692be15664db00acfbef0dc5c788ca0  libreoffice-bootstrap-3.3.0.1.tar.bz2
@@ -26,3 +25,4 @@ ccf9556a3736756c4781b2da97022d65  libreoffice-postprocess-3.3.0.1.tar.bz2
 2111be322729e14a6447383923d1671a  libreoffice-testing-3.3.0.1.tar.bz2
 8c25924e5e9afbc21c4333ab94e854b1  libreoffice-ure-3.3.0.1.tar.bz2
 ccc42fc6875d817297d83e56af74bbe2  libreoffice-writer-3.3.0.1.tar.bz2
+6c13201d695d6805915a2845446f0428  redhat-langpacks.tar.gz