From 9c3cde8a0717d9c902c7e8a56c839e21cadda092 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 8 Mar 2011 13:22:57 +0100 Subject: [PATCH] install 128x128 px icons --- 0001-install-high-resolution-icons.patch | 34 ++++++++++++++++++++++++ libreoffice.spec | 7 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-install-high-resolution-icons.patch diff --git a/0001-install-high-resolution-icons.patch b/0001-install-high-resolution-icons.patch new file mode 100644 index 0000000..be16625 --- /dev/null +++ b/0001-install-high-resolution-icons.patch @@ -0,0 +1,34 @@ +From 14fcbd54c96d9f46365f76f8df6b51d2e8074d74 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 8 Mar 2011 13:16:32 +0100 +Subject: [PATCH] install high-resolution icons + +--- + sysui/desktop/share/create_tree.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh +index 160b2db..fded41e 100644 +--- a/sysui/desktop/share/create_tree.sh ++++ b/sysui/desktop/share/create_tree.sh +@@ -3,7 +3,7 @@ umask 022 + if [ "${KDEMAINDIR}" ] + then + echo Copying icons .. +- for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"` ++ for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/???x??? hicolor/??x?? locolor} -name "*.png"` + do + targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i` + mkdir -p $targetdir +@@ -22,7 +22,7 @@ fi + if [ "${GNOMEDIR}" ] + then + echo Copying GNOME icons .. +- for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? -name "*.png"` ++ for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? ???x??? -name "*.png"` + do + targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname $i` + mkdir -p $targetdir +-- +1.7.4 + diff --git a/libreoffice.spec b/libreoffice.spec index 334d9fa..02c8f8e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,7 +28,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Version: 3.3.1.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -118,6 +118,7 @@ Patch30: 0001-Resolves-rhbz-681159-bandaid-for-crash.patch Patch31: 0001-Resolves-fdo-33701-ensure-node-outlives-path.patch Patch32: 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch Patch33: 0001-valgrind-don-t-leave-an-evil-thread-running-after-ma.patch +Patch34: 0001-install-high-resolution-icons.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -754,6 +755,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch31 -p1 -b .fdo33701-ensure-node-outlives-path.patch %patch32 -p1 -b .rhbz672818-bandaid-for-crash-in-SwTxtNode-.patch %patch33 -p1 -b .valgrind-don-t-leave-an-evil-thread-running-after-ma.patch +%patch34 -p1 -b .install-high-resolution-icons.patch touch scripting/source/pyprov/delzip touch scripting/util/provider/beanshell/delzip touch scripting/util/provider/javascript/delzip @@ -2099,6 +2101,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog +* Tue Mar 08 2011 David Tardon 3.3.1.2-4 +- install 128x128 px icons + * Thu Mar 02 2011 Caolán McNamara 3.3.1.2-3 - Resolves: rhbz#681159 crash in writer - Resolves: rhbz#672818 crash in writer