From 14ae80d9c0554c55024479bc538133e3c77f16e0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 9 May 2017 19:29:39 +0200 Subject: [PATCH] not needed anymore --- 0001-never-run-autogen.sh.patch | 25 ------------------------- libreoffice.spec | 14 ++++++-------- 2 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 0001-never-run-autogen.sh.patch diff --git a/0001-never-run-autogen.sh.patch b/0001-never-run-autogen.sh.patch deleted file mode 100644 index 4b9deaf..0000000 --- a/0001-never-run-autogen.sh.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3b80333b8d98e74bef22e5484b9db2b79310303f Mon Sep 17 00:00:00 2001 -From: rpmbuild -Date: Thu, 20 Feb 2014 19:44:49 +0100 -Subject: [PATCH] never run autogen.sh - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 41479bd..a5d7368 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -19,7 +19,7 @@ build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\ - - SRCDIR := @SRC_ROOT@ - BUILDDIR := @BUILDDIR@ --GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T) -+GIT_BUILD := - - # Run autogen.sh if needed and force make to restart itself. - # ... but there are several cases where we do not want to run --- -2.1.0 - diff --git a/libreoffice.spec b/libreoffice.spec index 8308b78..92e891a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -231,18 +231,16 @@ Requires: %{name}-math%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-base%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-emailmerge%{?_isa} = %{epoch}:%{version}-%{release} -# not upstreamed -Patch0: 0001-never-run-autogen.sh.patch # not upstreamed: upstream wants an automatic restart after a crash; we # want a nice abrt report -Patch1: 0001-don-t-suppress-crashes.patch +Patch0: 0001-don-t-suppress-crashes.patch # not upstreamed -Patch2: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch +Patch1: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch # not upstreamed -Patch3: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch -Patch4: 0001-apparently-the-executable-does-not-need-pdfium-direc.patch -Patch5: 0001-add-missing-dep-on-dir.patch -Patch6: 0001-Use-gcd-from-boost-math-gcd.patch +Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch +Patch3: 0001-apparently-the-executable-does-not-need-pdfium-direc.patch +Patch4: 0001-add-missing-dep-on-dir.patch +Patch5: 0001-Use-gcd-from-boost-math-gcd.patch %if 0%{?rhel} # not upstreamed