From 7cac346f1247776dc99beb4944990098915537e7e016df7a08a0bce4d89ee28e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 1 Oct 2014 12:25:02 +0000 Subject: [PATCH] - Fix the timestamp on docu (remove) - Try to silence postinst warning during verfication - Fix wrong obsolete lines OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=195 --- libreoffice.changes | 7 +++++++ libreoffice.spec | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 54d3c43..ca21854 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 1 12:24:03 UTC 2014 - tchvatal@suse.com + +- Fix the timestamp on docu (remove) +- Try to silence postinst warning during verfication +- Fix wrong obsolete lines + ------------------------------------------------------------------- Mon Sep 29 13:54:08 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index cd86d50..9b478d7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -652,7 +652,7 @@ if [ -f %{_datadir}/libreoffice/%{1}_list.txt ] ; then \ fi \ \ %postun %{1} \ -if [ "$1" = "0" -a -f %{_datadir}/libreoffice/%{1}_list.txt ]; then \ +if [ "$1" = "0" -a -f %{_datadir}/libreoffice/%{1}_list.txt -a -f %{_datadir}/libreoffice/link-to-ooo-home ]; then \ %{_datadir}/libreoffice/link-to-ooo-home --unlink %{_datadir}/libreoffice/%{1}_list.txt || true \ rm -f %{_datadir}/libreoffice/%{1}_list.txt 2> /dev/null || true \ fi \ @@ -751,7 +751,7 @@ Obsoletes: %{name}-help-%{-L*} < %{version} \ } \ %{-p: \ Provides: %{name}-help-%{-p*} = %{version} \ -Obsoletes: %{name}-help-%{-p*} = %{version} \ +Obsoletes: %{name}-help-%{-p*} < %{version} \ } \ } \ \ @@ -869,6 +869,10 @@ Provides additional %{langname} translations and resources for %{project}. \ # 256x256 icons tar -xjf %{SOURCE20} +# Do not generate doxygen timestamp +echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile +echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile + %build # Parallel build settings ... lo_jobs="%{?jobs:%{jobs}}"