diff --git a/27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt b/27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt deleted file mode 100644 index 1624f13..0000000 --- a/27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8a8a9ad79352f4d07ec162a356955dde3d3efb808bbc0d8a432ff150c2d09e1 -size 2603105 diff --git a/gdocs_3.0.0.diff b/gdocs_3.0.0.diff deleted file mode 100644 index 862a260..0000000 --- a/gdocs_3.0.0.diff +++ /dev/null @@ -1,518 +0,0 @@ ---- gdocs_3.0.0/build.xml.old 2012-02-28 12:24:51.000000000 +0100 -+++ gdocs_3.0.0/build.xml 2012-02-28 12:47:49.000000000 +0100 -@@ -1,70 +1,83 @@ -- -- -- -- -- -- Builds, tests, and runs the project Addin. -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+
-+ -+
-+
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
---- gdocs_3.0.0/src/MathWindowState.xcu.old 2012-02-28 12:47:49.000000000 +0100 -+++ gdocs_3.0.0/src/MathWindowState.xcu 2012-02-28 12:47:49.000000000 +0100 -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -+ Google Docs & Zoho -+ -+ -+ false -+ -+ -+ true -+ -+ -+ -+ -+ ---- gdocs_3.0.0/src/StartModuleWindowState.xcu.old 2012-02-28 12:47:49.000000000 +0100 -+++ gdocs_3.0.0/src/StartModuleWindowState.xcu 2012-02-28 12:47:49.000000000 +0100 -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -+ Google Docs & Zoho -+ -+ -+ false -+ -+ -+ true -+ -+ -+ -+ -+ ---- gdocs_3.0.0/src/CalcWindowState.xcu.old 2012-02-28 12:47:49.000000000 +0100 -+++ gdocs_3.0.0/src/CalcWindowState.xcu 2012-02-28 12:47:49.000000000 +0100 -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -+ Google Docs & Zoho -+ -+ -+ false -+ -+ -+ true -+ -+ -+ -+ -+ ---- gdocs_3.0.0/src/DrawWindowState.xcu.old 2012-02-28 12:47:49.000000000 +0100 -+++ gdocs_3.0.0/src/DrawWindowState.xcu 2012-02-28 12:47:49.000000000 +0100 -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -+ Google Docs & Zoho -+ -+ -+ false -+ -+ -+ true -+ -+ -+ -+ -+ ---- gdocs_3.0.0/src/Addons.xcu.old 2012-02-28 12:24:49.000000000 +0100 -+++ gdocs_3.0.0/src/Addons.xcu 2012-02-28 12:52:53.000000000 +0100 -@@ -1,4 +1,4 @@ -- -+ - - - -@@ -184,7 +184,6 @@ - - - com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument -- - - - Export to Google Docs -@@ -205,7 +204,7 @@ - _self - - -- -+ com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument - - - Import from Google Docs -@@ -227,7 +226,6 @@ - - - com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument -- - - - Export to Zoho -@@ -248,7 +246,7 @@ - _self - - -- -+ com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument - - - Import from Zoho -@@ -269,7 +267,7 @@ - _self - - -- -+ com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument - - - Export with WebDAV -@@ -286,7 +284,16 @@ - - - -- %origin%/images/ooo2gd.png -+ %origin%/images/sc_ooo2gd.png -+ -+ -+ %origin%/images/lc_ooo2gd.png -+ -+ -+ %origin%/images/sc_ooo2gd.png -+ -+ -+ %origin%/images/lc_ooo2gd.png - - - -@@ -296,7 +303,16 @@ - - - -- %origin%/images/upload-doc.png -+ %origin%/images/sc_upload_doc.png -+ -+ -+ %origin%/images/lc_upload_doc.png -+ -+ -+ %origin%/images/sc_upload_doc.png -+ -+ -+ %origin%/images/lc_upload_doc.png - - - -@@ -306,7 +322,16 @@ - - - -- %origin%/images/download-doc.png -+ %origin%/images/sc_download_doc.png -+ -+ -+ %origin%/images/lc_download_doc.png -+ -+ -+ %origin%/images/sc_download_doc.png -+ -+ -+ %origin%/images/lc_download_doc.png - - - -@@ -317,7 +342,16 @@ - - - -- %origin%/images/upload-zoho.png -+ %origin%/images/sc_upload_zoho.png -+ -+ -+ %origin%/images/lc_upload_zoho.png -+ -+ -+ %origin%/images/sc_upload_zoho.png -+ -+ -+ %origin%/images/lc_upload_zoho.png - - - -@@ -328,7 +362,16 @@ - - - -- %origin%/images/download-zoho.png -+ %origin%/images/sc_download_zoho.png -+ -+ -+ %origin%/images/lc_download_zoho.png -+ -+ -+ %origin%/images/sc_download_zoho.png -+ -+ -+ %origin%/images/lc_download_zoho.png - - - -@@ -339,7 +382,16 @@ - - - -- %origin%/images/upload-webdav.png -+ %origin%/images/sc_upload_webdav.png -+ -+ -+ %origin%/images/lc_upload_webdav.png -+ -+ -+ %origin%/images/sc_upload_webdav.png -+ -+ -+ %origin%/images/lc_upload_webdav.png - - - ---- gdocs_3.0.0/src/WriterWindowState.xcu.old 2012-02-28 12:47:49.000000000 +0100 -+++ gdocs_3.0.0/src/WriterWindowState.xcu 2012-02-28 12:47:49.000000000 +0100 -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -+ Google Docs & Zoho -+ -+ -+ false -+ -+ -+ true -+ -+ -+ -+ -+ ---- gdocs_3.0.0/src/uno-extension-manifest.xml.old 2012-02-28 12:24:49.000000000 +0100 -+++ gdocs_3.0.0/src/uno-extension-manifest.xml 2012-02-28 12:47:49.000000000 +0100 -@@ -1,9 +1,14 @@ - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -\ Chybí znak konce řádku na konci souboru ---- gdocs_3.0.0/src/BasicIDEWindowState.xcu.old 2012-02-28 12:47:49.000000000 +0100 -+++ gdocs_3.0.0/src/BasicIDEWindowState.xcu 2012-02-28 12:47:49.000000000 +0100 -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -+ Google Docs & Zoho -+ -+ -+ false -+ -+ -+ true -+ -+ -+ -+ -+ ---- gdocs_3.0.0/src/ProtocolHandler.xcu.old 2012-02-28 12:24:49.000000000 +0100 -+++ gdocs_3.0.0/src/ProtocolHandler.xcu 2012-02-28 12:47:49.000000000 +0100 -@@ -1,6 +1,5 @@ -- -- -- -+ -+ - - - ---- gdocs_3.0.0/src/ImpressWindowState.xcu.old 2012-02-28 12:47:49.000000000 +0100 -+++ gdocs_3.0.0/src/ImpressWindowState.xcu 2012-02-28 12:47:49.000000000 +0100 -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -+ Google Docs & Zoho -+ -+ -+ false -+ -+ -+ true -+ -+ -+ -+ -+ ---- gdocs_3.0.0/src/BaseWindowState.xcu.old 2012-02-28 12:47:49.000000000 +0100 -+++ gdocs_3.0.0/src/BaseWindowState.xcu 2012-02-28 12:47:49.000000000 +0100 -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -+ Google Docs & Zoho -+ -+ -+ false -+ -+ -+ true -+ -+ -+ -+ -+ diff --git a/gdocs_3.0.0.tar.bz2 b/gdocs_3.0.0.tar.bz2 deleted file mode 100644 index a864090..0000000 --- a/gdocs_3.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:154810d9e08cae88264efd42564c180c72a8391b7f757c60ea77a2c6f882c7f5 -size 2069427 diff --git a/libreoffice.changes b/libreoffice.changes index 773fc7e..7f5aa80 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Apr 11 14:14:14 UTC 2014 - tchvatal@suse.com + +- Remove googledoc extension as it is uttery broken and this is + safer. + +------------------------------------------------------------------- +Fri Apr 11 11:43:01 UTC 2014 - tchvatal@suse.com + +- Require link-to-ooo-home script properly in postun phase. + Fixes bnc#749059. + ------------------------------------------------------------------- Thu Apr 10 11:27:52 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 80503f6..6559693 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -26,7 +26,6 @@ %global langpack_langs %{nil} # extensions %define ct2n_version 1.3.2 -%define gdocs_version 3.0.1 %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ @@ -49,16 +48,10 @@ Source201: sofficerc-upstream # create compat symlinks from %{_datadir} to %{_prefix}/lib(64); used by noarch packages Source300: link-to-ooo-home # prebuilt extensions -Source401: %{external_url}/27211596cf0ad97cab7321239406fde0-gdocs_%{gdocs_version}_modified.oxt Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt # used extensions sources Source450: %{external_url}/451ccf439a36a568653b024534669971-ConvertTextToNumber-%{ct2n_version}.oxt Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 -# unused extensions sources -# FIXME: this is just because of license; we do not build gdocs from sources now -# gdocs sources -Source500: gdocs_3.0.0.tar.bz2 -Source501: gdocs_3.0.0.diff # Internal bundled stuff we can't remove # XMLSec is patched over and over in here Source2000: %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -296,6 +289,7 @@ License: LGPL-2.1 Group: Productivity/Office/Suite Supplements: packageand(libreoffice:kdebase3-session) Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -309,6 +303,7 @@ License: LGPL-3.0 Group: Productivity/Office/Suite Supplements: libreoffice Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -322,6 +317,7 @@ License: LGPL-3.0 Group: Productivity/Office/Suite Supplements: libreoffice Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -335,6 +331,7 @@ License: LGPL-3.0 or CC-BY-SA-3.0 Group: Productivity/Office/Suite Supplements: packageand(libreoffice:kdebase4-workspace) Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -348,6 +345,7 @@ License: LGPL-3.0 Group: Productivity/Office/Suite Supplements: libreoffice Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -361,6 +359,7 @@ License: LGPL-3.0 Group: Productivity/Office/Suite Supplements: packageand(libreoffice:gnome-session) Requires(post): %{name} = %{version} +Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} BuildArch: noarch @@ -622,7 +621,6 @@ Recommends: jre-64 >= 1.6 %description writer-extensions This package provides extensions for LibreOffice Writer: -- Google Docs, Zoho, and WebDAV Export/Import - MediaWiki Publisher # Symlinking macro for /usr/lib64 and /usr/share packing @@ -719,6 +717,7 @@ Summary: %{langname} Localization Files for LibreOffice \ Group: Productivity/Office/Suite \ Requires: %{name} = %{version} \ Requires(post,): %{name} = %{version} \ +Requires(postun,): %{name} = %{version} \ Provides: locale(libreoffice:%{lang}) \ BuildArch: noarch \ %{-m:Requires: libreoffice-thesaurus-%{-m*}}%{!-m:%{-M:Requires: libreoffice-thesaurus-%{lang}}} \ @@ -956,7 +955,6 @@ export NOCONFIGURE=yes --enable-hardlink-deliver \ --enable-ext-ct2n \ --enable-ext-nlpsolver \ - --enable-ext-google-docs \ --enable-ext-numbertext \ --enable-ext-wiki-publisher \ --enable-ext-mariadb-connector \ @@ -1116,7 +1114,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ # rather remove it (fdo#53006, fdo#51252, bnc#769448) # Remove after 12.2 is out of support/migration scope. bundled_cache="%{_libdir}/%{name}/share/prereg/bundled" -if [ -d "$bundled_cache" ]; then +if [ -d "$bundled_cache" ]; then rm -rf "$bundled_cache"/* || true fi # Directory to symlink is not working in RPM so workaround it @@ -1266,7 +1264,6 @@ fi %files writer-extensions %defattr(-,root,root) -%{_libdir}/%{name}/share/extensions/gdocs %{_libdir}/%{name}/share/extensions/wiki-publisher %files icon-theme-crystal