From 20b50778093d8461baa4bb2d6813c2b8c7a8e201 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 9 May 2017 19:29:11 +0200 Subject: [PATCH] this is apparently not needed anymore --- 0001-installation-fix.patch | 71 ------------------------------------- libreoffice.spec | 16 ++++----- 2 files changed, 7 insertions(+), 80 deletions(-) delete mode 100644 0001-installation-fix.patch diff --git a/0001-installation-fix.patch b/0001-installation-fix.patch deleted file mode 100644 index 677b689..0000000 --- a/0001-installation-fix.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 3d36f9efa2e2f7a39a926e2d1acea2255b990b03 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 3 Feb 2014 21:41:00 +0100 -Subject: [PATCH] installation fix - ---- - solenv/bin/modules/installer/scriptitems.pm | 15 ++++++--------- - solenv/bin/modules/installer/worker.pm | 1 - - 2 files changed, 6 insertions(+), 10 deletions(-) - -diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm -index 5f8dfd6..dff0f13 100644 ---- a/solenv/bin/modules/installer/scriptitems.pm -+++ b/solenv/bin/modules/installer/scriptitems.pm -@@ -1131,11 +1131,10 @@ sub remove_Files_Without_Sourcedirectory - - if ( ! $installer::globals::languagepack && !$installer::globals::helppack) - { -- $infoline = "ERROR: Removing file $filename from file list.\n"; -+ $infoline = "WARNING: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - -- push(@missingfiles, "ERROR: File not found: $filename\n"); -- $error_occurred = 1; -+ push(@missingfiles, "WARNING: File not found: $filename\n"); - - next; # removing this file from list, if sourcepath is empty - } -@@ -1143,11 +1142,10 @@ sub remove_Files_Without_Sourcedirectory - { - if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) - { -- $infoline = "ERROR: Removing file $filename from file list.\n"; -+ $infoline = "WARNING: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - -- push(@missingfiles, "ERROR: File not found: $filename\n"); -- $error_occurred = 1; -+ push(@missingfiles, "WARNING: File not found: $filename\n"); - - next; # removing this file from list, if sourcepath is empty - } -@@ -1165,11 +1163,10 @@ sub remove_Files_Without_Sourcedirectory - { - if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) - { -- $infoline = "ERROR: Removing file $filename from file list.\n"; -+ $infoline = "WARNING: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - -- push(@missingfiles, "ERROR: File not found: $filename\n"); -- $error_occurred = 1; -+ push(@missingfiles, "WARNING: File not found: $filename\n"); - - next; # removing this file from list, if sourcepath is empty - } -diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm -index aab676f..0e6f67d 100644 ---- a/solenv/bin/modules/installer/worker.pm -+++ b/solenv/bin/modules/installer/worker.pm -@@ -96,7 +96,6 @@ sub create_installation_directory - - $installdir = installer::systemactions::create_directories("install", $languageref); - installer::logger::print_message( "... creating installation set in $installdir ...\n" ); -- remove_old_installation_sets($installdir); - my $inprogressinstalldir = $installdir . "_inprogress"; - installer::systemactions::rename_directory($installdir, $inprogressinstalldir); - $installdir = $inprogressinstalldir; --- -2.9.3 - diff --git a/libreoffice.spec b/libreoffice.spec index d342d2f..8308b78 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -232,19 +232,17 @@ Requires: %{name}-base%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-emailmerge%{?_isa} = %{epoch}:%{version}-%{release} # not upstreamed -Patch0: 0001-installation-fix.patch -# not upstreamed -Patch1: 0001-never-run-autogen.sh.patch +Patch0: 0001-never-run-autogen.sh.patch # not upstreamed: upstream wants an automatic restart after a crash; we # want a nice abrt report -Patch2: 0001-don-t-suppress-crashes.patch +Patch1: 0001-don-t-suppress-crashes.patch # not upstreamed -Patch3: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch +Patch2: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch # not upstreamed -Patch4: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch -Patch5: 0001-apparently-the-executable-does-not-need-pdfium-direc.patch -Patch6: 0001-add-missing-dep-on-dir.patch -Patch7: 0001-Use-gcd-from-boost-math-gcd.patch +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 %if 0%{?rhel} # not upstreamed