From eb0642b8655faf1f1824d71565082c923d8d4372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 25 Nov 2013 14:16:18 +0000 Subject: [PATCH] drop rhel6 limits patch --- libreoffice-rhel6limits.patch | 13 ------------- libreoffice.spec | 10 ++++------ 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 libreoffice-rhel6limits.patch diff --git a/libreoffice-rhel6limits.patch b/libreoffice-rhel6limits.patch deleted file mode 100644 index 7cd3bcc..0000000 --- a/libreoffice-rhel6limits.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/basic/source/classes/propacc.cxx 2013-02-11 12:23:01.571839617 +0000 -+++ b/basic/source/classes/propacc.cxx 2013-02-11 12:23:04.808850284 +0000 -@@ -21,8 +21,9 @@ - #include "propacc.hxx" - - #include --#include - #include -+#include -+#include - - using com::sun::star::uno::Reference; - using namespace com::sun::star; diff --git a/libreoffice.spec b/libreoffice.spec index 29526fa..1f5498a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -258,10 +258,9 @@ Patch6: libreoffice-installfix.patch Patch7: libreoffice-rhel6gcj.patch Patch8: libreoffice-rhel6poppler.patch Patch9: libreoffice-rhel6langs.patch -Patch10: libreoffice-rhel6limits.patch -Patch11: libreoffice-rhel6glib.patch +Patch10: libreoffice-rhel6glib.patch %endif -Patch12: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch +Patch11: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -993,10 +992,9 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch7 -p1 -b .rhel6gcj.patch %patch8 -p1 -b .rhel6poppler.patch %patch9 -p1 -b .rhel6langs.patch -%patch10 -p1 -b .rhel6limits.patch -%patch11 -p1 -b .rhel6glib.patch +%patch10 -p1 -b .rhel6glib.patch %endif -%patch12 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.patch +%patch11 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.patch # TODO: check this # these are horribly incomplete--empty translations and copied english