- 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
This commit is contained in:
Tomáš Chvátal 2014-10-01 12:25:02 +00:00 committed by Git OBS Bridge
parent 7b8a533c5d
commit 7cac346f12
2 changed files with 13 additions and 2 deletions

View File

@ -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

View File

@ -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}}"