From 704b2279273713a63b882c5efc574a34ea3f04b54fb6ce65d779b4ff000ab785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 16 Oct 2015 08:11:46 +0000 Subject: [PATCH] - Drop upstreamed patch: * kde4filepicker.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=335 --- kde4filepicker.patch | 20 -------------------- libreoffice.changes | 2 ++ libreoffice.spec | 3 --- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 kde4filepicker.patch diff --git a/kde4filepicker.patch b/kde4filepicker.patch deleted file mode 100644 index 03352ea..0000000 --- a/kde4filepicker.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: libreoffice-5.0.2.1/configure.ac -=================================================================== ---- libreoffice-5.0.2.1.orig/configure.ac -+++ libreoffice-5.0.2.1/configure.ac -@@ -11318,6 +11318,7 @@ int main(int argc, char **argv) { - - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #define SAL_OVERRIDE -+#include - #include "tst_exclude_socket_notifiers.moc" - - int main(int argc, char *argv[]) -@@ -11351,6 +11352,7 @@ int main(int argc, char *argv[]) - - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #define SAL_OVERRIDE -+#include - #include "tst_exclude_posted_events.moc" - - int main(int argc, char *argv[]) diff --git a/libreoffice.changes b/libreoffice.changes index 26cb06d..1df9b2e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -2,6 +2,8 @@ Fri Oct 16 08:04:32 UTC 2015 - tchvatal@suse.com - Version update to 5.0.3RC1 as it should fix i586 test failure +- Drop upstreamed patch: + * kde4filepicker.patch ------------------------------------------------------------------- Fri Oct 16 07:26:33 UTC 2015 - meissner@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 1bc27d1..49e5109 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -168,8 +168,6 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-SUSE: do not declare java6 available for without system libs build Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch -# PATCH-FIX-UPSTREAM: detect kde4 filepicker properly with old compilers -Patch8: kde4filepicker.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -996,7 +994,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %if !%{with systemlibs} %patch7 -p1 %endif -%patch8 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20}