[libreoffice] drop integrated patches

Caolan McNamara caolanm at fedoraproject.org
Wed Jan 12 16:57:27 UTC 2011


commit 9a48ff5ca07865ddcc5ea5c14a35c7e8e616bd8a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 12 16:57:16 2011 +0000

    drop integrated patches

 ...e-paste-when-pasting-text-into-cell-comme.patch |   39 --------------------
 ...-rhbz-660342-Undo-Redo-crash-with-postits.patch |   35 ------------------
 ...z-663857-font-color-missing-C-FAQ-10.3-do.patch |   26 -------------
 libreoffice.spec                                   |   16 +++-----
 4 files changed, 6 insertions(+), 110 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index f883f9f..e240e21 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -97,11 +97,7 @@ Patch11: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
 Patch12: turn-script-providers-into-extensions.patch
 Patch13: libreoffice-installfix.patch
 Patch14: 0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
-Patch15: 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch
-Patch16: 0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch
-Patch17: 0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch
-Patch18: libreoffice-bootstrap-kde.patch
-Patch19: 0001-Resolves-rhbz-666088-clean-up-search-cache-singleton.patch
+Patch15: libreoffice-bootstrap-kde.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -719,11 +715,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch12 -p1 -b .turn-script-providers-into-extensions.patch
 %patch13 -p1 -b .libreoffice-installfix.patch
 %patch14 -p1 -b .don-t-bail-out-on-mislength-records.patch
-%patch15 -p1 -b .font-color-missing-C-FAQ-10.3-do.patch
-%patch16 -p1 -b .Avoid-double-paste-when-pasting-text-into-cell-comme.patch
-%patch17 -p1 -b .rhbz-660342-Undo-Redo-crash-with-postits.patch
-%patch18 -p1 -b .libreoffice-bootstrap-kde.patch
-%patch19 -p1 -b .rhbz-666088-clean-up-search-cache-singleton.patch
+%patch15 -p1 -b .libreoffice-bootstrap-kde.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -2064,6 +2056,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %changelog
 * Wed Jan 12 2011 Caolán McNamara <caolanm at redhat.com> 3.3.0.3-1
 - latest version
+- drop integrated 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch
+- drop integrated 0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch
+- drop integrated 0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch
+- drop integrated 0001-Resolves-rhbz-666088-clean-up-search-cache-singleton.patch
 
 * Thu Jan 06 2011 Caolán McNamara <caolanm at redhat.com> 3.3.0.2-5
 - Resolves: rhbz#666088 don't crash on clean up of search cache


More information about the scm-commits mailing list