diff --git a/0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch b/0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch index ebef053..6be0cc3 100644 --- a/0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch +++ b/0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch @@ -1,19 +1,7 @@ -From 3f9f18c53d9876106b274769dec9d0e3916feb8f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 29 Feb 2012 11:10:31 +0000 -Subject: [PATCH] Resolves: rhbz#788045 swriter --help etc doesn't show help - -because the test in soffice to skip oosplash is for only -one argument, and swriter points to soffice with an additional ---writer argument, so the test is skipped ---- - desktop/scripts/soffice.sh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh +diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in index 4d14051..2d42613 100755 ---- a/desktop/scripts/soffice.sh -+++ b/desktop/scripts/soffice.sh +--- a/desktop/scripts/soffice.sh.in ++++ b/desktop/scripts/soffice.sh.in @@ -158,8 +158,8 @@ if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then fi @@ -34,6 +22,3 @@ index 4d14051..2d42613 100755 # oosplash does the rest: forcing pages in, javaldx etc. are exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@" --- -1.7.7.6 - diff --git a/libreoffice.spec b/libreoffice.spec index ddac1d7..469fee5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 1%{?dist} +Release: 2%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -1426,7 +1426,7 @@ rm -rf icons/gnome applications application-registry #relocate the rest of them for icon in `find icons -type f`; do mkdir -p $RPM_BUILD_ROOT/%{_datadir}/`dirname $icon` - cp -p $icon $RPM_BUILD_ROOT/%{_datadir}/`echo $icon | sed -e s@office$ICONVERSION@office@` + cp -p $icon $RPM_BUILD_ROOT/%{_datadir}/`echo $icon | sed -e s@office$ICONVERSION@office@ | sed -e s@office$PRODUCTVERSION@office@` done mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime-info cp -p mime-info/libreoffice$PRODUCTVERSION.keys $RPM_BUILD_ROOT/%{_datadir}/mime-info/libreoffice.keys @@ -2252,6 +2252,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %changelog * Wed Feb 29 2012 Caolán McNamara - 3.5.1.1-2 - Resolves: rhbz#788045 swriter --help doesn't show help +- Resolves: rhbz#798667 missing .desktop icons * Sun Feb 26 2012 David Tardon - 3.5.1.1-1 - 3.5.1 rc1