[freemind] Port to current groovy
Michael Šimáček
msimacek at fedoraproject.org
Thu Mar 12 15:26:09 UTC 2015
commit 11f04f8b5b3b9d230544ae6060d91a68a0fd7813
Author: Michael Simacek <msimacek at redhat.com>
Date: Thu Mar 12 16:25:35 2015 +0100
Port to current groovy
0001-Fix-JOrtho-resource-lookup.patch | 6 +++---
... => 0002-Update-to-current-jgoodies-forms.patch | 6 +++---
...atch => 0003-Update-to-current-JMapViewer.patch | 6 +++---
0004-Update-to-groovy-2.4.patch | 25 ++++++++++++++++++++++
freemind.spec | 18 ++++++++++------
5 files changed, 46 insertions(+), 15 deletions(-)
---
diff --git a/0001-Fix-JOrtho-resource-lookup.patch b/0001-Fix-JOrtho-resource-lookup.patch
index e566b45..8ddf587 100644
--- a/0001-Fix-JOrtho-resource-lookup.patch
+++ b/0001-Fix-JOrtho-resource-lookup.patch
@@ -1,7 +1,7 @@
-From 17d5463684021087f5a3ba7051e1e917b816a7e6 Mon Sep 17 00:00:00 2001
+From 78c22aa504eba7b7b61ddbb84daaf76503d71793 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Fri, 2 May 2014 14:28:16 +0200
-Subject: [PATCH] Fix JOrtho resource lookup
+Subject: [PATCH 1/4] Fix JOrtho resource lookup
Signed-off-by: Michael Simacek <msimacek at redhat.com>
---
@@ -39,5 +39,5 @@ index 2b05070..a7398e2 100644
}
--
-1.9.0
+2.1.0
diff --git a/0001-update-to-current-jgoodies-forms.patch b/0002-Update-to-current-jgoodies-forms.patch
similarity index 97%
rename from 0001-update-to-current-jgoodies-forms.patch
rename to 0002-Update-to-current-jgoodies-forms.patch
index f32c44a..bc17046 100644
--- a/0001-update-to-current-jgoodies-forms.patch
+++ b/0002-Update-to-current-jgoodies-forms.patch
@@ -1,7 +1,7 @@
-From 035ca154938a7db3be019dd1e412149b93904580 Mon Sep 17 00:00:00 2001
+From 40b4f5dc27cb29f7802ef301bbc8351925ad1903 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Fri, 25 Apr 2014 00:14:31 +0200
-Subject: [PATCH] update to current jgoodies-forms
+Subject: [PATCH 2/4] Update to current jgoodies-forms
Signed-off-by: Michael Simacek <msimacek at redhat.com>
---
@@ -113,5 +113,5 @@ index 28c7bea..16f2bd4 100644
setTitle("Enter Password Dialog");
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
--
-1.9.0
+2.1.0
diff --git a/0001-Update-to-current-JMapViewer.patch b/0003-Update-to-current-JMapViewer.patch
similarity index 98%
rename from 0001-Update-to-current-JMapViewer.patch
rename to 0003-Update-to-current-JMapViewer.patch
index a96c612..f5bcdc2 100644
--- a/0001-Update-to-current-JMapViewer.patch
+++ b/0003-Update-to-current-JMapViewer.patch
@@ -1,7 +1,7 @@
-From 408ba4c3f5292c281f6a029a3dcfcb2526cb5756 Mon Sep 17 00:00:00 2001
+From 7b05ea6be997518a57a35de4e290ac8f325c8caf Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Tue, 29 Apr 2014 17:54:21 +0200
-Subject: [PATCH] Update to current JMapViewer
+Subject: [PATCH 3/4] Update to current JMapViewer
Signed-off-by: Michael Simacek <msimacek at redhat.com>
---
@@ -273,5 +273,5 @@ index 302d346..5a7afb5 100644
int y = exacty / tileSize;
// determine other surrounding tiles that are close to the exact
--
-1.9.0
+2.1.0
diff --git a/0004-Update-to-groovy-2.4.patch b/0004-Update-to-groovy-2.4.patch
new file mode 100644
index 0000000..edb4d05
--- /dev/null
+++ b/0004-Update-to-groovy-2.4.patch
@@ -0,0 +1,25 @@
+From f433aaaf94fa8c65a9de63fbb6bf7e0b5c35dd71 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Thu, 12 Mar 2015 15:58:16 +0100
+Subject: [PATCH 4/4] Update to groovy-2.4
+
+---
+ plugins/script/ScriptingEngine.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/script/ScriptingEngine.java b/plugins/script/ScriptingEngine.java
+index 8de5823..2c52dae 100644
+--- a/plugins/script/ScriptingEngine.java
++++ b/plugins/script/ScriptingEngine.java
+@@ -250,7 +250,7 @@ public class ScriptingEngine extends MindMapHookAdapter {
+ throws CompilationFailedException {
+ Script script = null;
+ try {
+- script = parse(in, fileName);
++ script = parse(new java.io.InputStreamReader(in), fileName);
+ securityManager
+ .setFinalSecurityManager(scriptingSecurityManager);
+ return script.run();
+--
+2.1.0
+
diff --git a/freemind.spec b/freemind.spec
index 5c2489a..ef0504b 100644
--- a/freemind.spec
+++ b/freemind.spec
@@ -1,6 +1,6 @@
Name: freemind
Version: 1.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Free mind mapping software
License: GPLv2 and MIT
@@ -8,9 +8,10 @@ URL: http://freemind.sourceforge.net
Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-src-%{version}.tar.gz
Source1: freemind.desktop
Source2: freemind.xml
-Patch0: 0001-update-to-current-jgoodies-forms.patch
-Patch1: 0001-Update-to-current-JMapViewer.patch
-Patch2: 0001-Fix-JOrtho-resource-lookup.patch
+Patch0: 0001-Fix-JOrtho-resource-lookup.patch
+Patch1: 0002-Update-to-current-jgoodies-forms.patch
+Patch2: 0003-Update-to-current-JMapViewer.patch
+Patch3: 0004-Update-to-groovy-2.4.patch
BuildArch: noarch
BuildRequires: ant
@@ -19,7 +20,7 @@ BuildRequires: batik
BuildRequires: bcel
BuildRequires: desktop-file-utils
BuildRequires: fop
-BuildRequires: groovy
+BuildRequires: groovy-lib
BuildRequires: ImageMagick
BuildRequires: java >= 1:1.6.0
BuildRequires: javahelp2
@@ -35,7 +36,7 @@ BuildRequires: xpp3
Requires: batik
Requires: fop
-Requires: groovy
+Requires: groovy-lib
Requires: hicolor-icon-theme
Requires: java >= 1:1.6.0
Requires: javahelp2
@@ -74,6 +75,7 @@ This package contains the API documentation for %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
sed -i 's/\r//' accessories/LICENSE.MIT
@@ -208,6 +210,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Thu Mar 12 2015 Michael Simacek <msimacek at redhat.com> - 1.0.1-6
+- Port to current groovy
+- Use groovy-lib as Requires
+
* Mon Sep 08 2014 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-5
- update mime scriptlet
More information about the scm-commits
mailing list