From 051de5cc468e28b1135402845e3aefb783fd27c1ccdb47e4d0b51e5bfde65697 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 17 Dec 2019 06:35:53 +0000 Subject: [PATCH] Stop overriding default patch fuzz OBS-URL: https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=35 --- scala-2.10.7-source6.patch | 10 ++++++---- scala.changes | 8 ++++++++ scala.spec | 3 --- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/scala-2.10.7-source6.patch b/scala-2.10.7-source6.patch index c38f893..cb42a3e 100644 --- a/scala-2.10.7-source6.patch +++ b/scala-2.10.7-source6.patch @@ -1,6 +1,8 @@ ---- scala-2.10.7/build.xml 2019-11-27 17:42:56.487021401 +0100 -+++ scala-2.10.7/build.xml 2019-11-27 17:43:39.491264930 +0100 -@@ -757,7 +757,7 @@ +Index: scala-2.10.7/build.xml +=================================================================== +--- scala-2.10.7.orig/build.xml ++++ scala-2.10.7/build.xml +@@ -758,7 +758,7 @@ TODO: destdir="${@{project}-classes}" classpath="${@{project}-classes}" includes="**/*.java" @@ -9,7 +11,7 @@ compiler="javac1.6" includeantruntime="false" > -@@ -793,7 +793,7 @@ +@@ -794,7 +794,7 @@ TODO: includes="**/*.java" excludes="@{excludes}" includeantruntime="false" diff --git a/scala.changes b/scala.changes index b0c497a..be1b661 100644 --- a/scala.changes +++ b/scala.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 17 06:34:27 UTC 2019 - Fridrich Strba + +- Stop overriding default fuzz in spec file +- Changed patch: + * scala-2.10.7-source6.patch + + Refresh using source service + ------------------------------------------------------------------- Fri Dec 13 11:11:24 UTC 2019 - Guillaume GARDET diff --git a/scala.spec b/scala.spec index bb9f852..35472be 100644 --- a/scala.spec +++ b/scala.spec @@ -137,9 +137,6 @@ object-oriented and functional programming. This package enables support for the Scala ant tasks. %prep - -%global _default_patch_fuzz 2 - %setup -q -n %{base_name}-%{version} %patch1 -p1 -b .tool %patch2 -p1 -b .sysjline