[libreoffice] Resolves: rhbz#901346 do not install 512x512 icons

David Tardon dtardon at fedoraproject.org
Mon Jan 21 06:47:39 UTC 2013


commit 9472e15c6bc011e1ea117836c9a843fbe74c7a7b
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jan 21 07:47:02 2013 +0100

    Resolves: rhbz#901346 do not install 512x512 icons

 libreoffice.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index e2eb095..37775ab 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        2%{?libo_prerelease}%{?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 and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -1293,7 +1293,8 @@ pushd sysui/output/usr/share/
 rm -rf icons/gnome applications application-registry
 
 #relocate the rest of them
-for icon in `find icons -type f`; do
+# rhbz#901346 512x512 icons are not used by anything
+for icon in `find icons -path '*/512x512' -prune -o -type f -print`; do
     mkdir -p $RPM_BUILD_ROOT/%{_datadir}/`dirname $icon`
     cp -p $icon $RPM_BUILD_ROOT/%{_datadir}/`echo $icon | sed -e s at office$ICONVERSION at office@ | sed -e s at office$PRODUCTVERSION at office@`
 done
@@ -2051,6 +2052,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Mon Jan 21 2013 David Tardon <dtardon at redhat.com> - 1:4.0.0.1-2
+- Resolves: rhbz#901346 do not install 512x512 icons
+
 * Tue Jan 15 2013 David Tardon <dtardon at redhat.com> - 1:4.0.0.1-1
 - 4.0.0 rc1
 


More information about the scm-commits mailing list