[portecle/f17: 2/2] Remove unneeded JRE version check to get rid of warning at startup.

[Ville Skyttä]

commit 989bcd8d04ba30512f4e40edcf00ad8c315682c7
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Apr 24 00:13:07 2012 +0300

    Remove unneeded JRE version check to get rid of warning at startup.

 portecle-1.7-no-jre-check.patch |   95 +++++++++++++++++++++++++++++++++++++++
 portecle.spec                   |    9 +++-
 2 files changed, 103 insertions(+), 1 deletions(-)
---
diff --git a/portecle-1.7-no-jre-check.patch b/portecle-1.7-no-jre-check.patch
new file mode 100644
index 0000000..b390314
--- /dev/null
+++ b/portecle-1.7-no-jre-check.patch
@@ -0,0 +1,95 @@
+diff -up portecle-1.7-src/src/main/net/sf/portecle/FPortecle.java~ portecle-1.7-src/src/main/net/sf/portecle/FPortecle.java
+--- portecle-1.7-src/src/main/net/sf/portecle/FPortecle.java~	2011-01-22 19:08:14.000000000 +0200
++++ portecle-1.7-src/src/main/net/sf/portecle/FPortecle.java	2012-04-23 23:48:34.568650353 +0300
+@@ -136,8 +136,6 @@ import net.sf.portecle.gui.password.DGet
+ import net.sf.portecle.gui.password.DGetPassword;
+ import net.sf.portecle.gui.statusbar.StatusBar;
+ import net.sf.portecle.gui.statusbar.StatusBarChangeHandler;
+-import net.sf.portecle.version.JavaVersion;
+-import net.sf.portecle.version.VersionException;
+ 
+ import org.bouncycastle.jce.PKCS10CertificationRequest;
+ import org.bouncycastle.openssl.PEMReader;
+@@ -5850,69 +5848,6 @@ public class FPortecle
+ 	}
+ 
+ 	/**
+-	 * Check that a recent enough JRE is being used.
+-	 * 
+-	 * @return True if this is the case, false otherwise
+-	 */
+-	private static boolean checkJRE()
+-	{
+-		// Get the current Java Runtime Environment version
+-		String sJreVersion = System.getProperty("java.version");
+-
+-		assert sJreVersion != null;
+-
+-		JavaVersion actualJreVersion;
+-
+-		try
+-		{
+-			actualJreVersion = new JavaVersion(sJreVersion);
+-		}
+-		catch (VersionException ex)
+-		{
+-			// Could not parse actual JRE version
+-			String sMessage =
+-			    MessageFormat.format(RB.getString("FPortecle.NoParseJreVersion.message"), sJreVersion);
+-			LOG.warning(sMessage);
+-			JOptionPane.showMessageDialog(new JFrame(), sMessage, RB.getString("FPortecle.Title"),
+-			    JOptionPane.WARNING_MESSAGE);
+-			return true;
+-		}
+-
+-		// Get the required Java Runtime Environment version
+-		JavaVersion reqJreVersion;
+-
+-		try
+-		{
+-			reqJreVersion = new JavaVersion(REQ_JRE_VERSION);
+-		}
+-		catch (VersionException ex)
+-		{
+-			// Could not parse required JRE version
+-			String sMessage =
+-			    MessageFormat.format(RB.getString("FPortecle.NoParseJreVersion.message"), sJreVersion);
+-			LOG.warning(sMessage);
+-			JOptionPane.showMessageDialog(new JFrame(), sMessage, RB.getString("FPortecle.Title"),
+-			    JOptionPane.WARNING_MESSAGE);
+-			return true;
+-		}
+-
+-		// Recent enough JRE?
+-		if (actualJreVersion.compareTo(reqJreVersion) < 0)
+-		{
+-			// It isn't - warn the user and exit
+-			String sMessage =
+-			    MessageFormat.format(RB.getString("FPortecle.MinJreVersionReq.message"), actualJreVersion,
+-			        reqJreVersion);
+-			LOG.severe(sMessage);
+-			JOptionPane.showMessageDialog(new JFrame(), sMessage, RB.getString("FPortecle.Title"),
+-			    JOptionPane.ERROR_MESSAGE);
+-			return false;
+-		}
+-		// else OK.
+-		return true;
+-	}
+-
+-	/**
+ 	 * Exit the application.
+ 	 */
+ 	private void exitApplication()
+@@ -6742,12 +6677,6 @@ public class FPortecle
+ 	 */
+ 	public static void main(String[] args)
+ 	{
+-		// Check that the correct JRE is being used
+-		if (!checkJRE())
+-		{
+-			System.exit(1);
+-		}
+-
+ 		// Make Metal theme use non-bold fonts (see javax.swing.plaf.metal.MetalLookAndFeel javadoc)
+ 		UIManager.put("swing.boldMetal", Boolean.FALSE);
+ 
diff --git a/portecle.spec b/portecle.spec
index cf62f6a..a92655f 100644
--- a/portecle.spec
+++ b/portecle.spec
@@ -2,13 +2,15 @@
 
 Name:           portecle
 Version:        1.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Multipurpose keystore and certificate tool
 
 License:        GPLv2+
 URL:            http://portecle.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/portecle/%{name}-%{version}-src.zip
 Source1:        portecle.sh.in
+# http://portecle.git.sourceforge.net/git/gitweb.cgi?p=portecle/portecle;a=commitdiff;h=02e4545
+Patch0:         %{name}-1.7-no-jre-check.patch
 
 BuildArch:      noarch
 BuildRequires:  ant
@@ -30,6 +32,8 @@ certificate revocation lists and more.
 
 %prep
 %setup -q -n %{name}-%{version}-src
+%patch0 -p1
+rm -r src/main/net/sf/portecle/version # see Patch0
 rm lib/*.jar
 cp -p src/main/net/sf/portecle/images/splash.png doc/images/
 
@@ -81,6 +85,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Apr 23 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7-5
+- Remove unneeded JRE version check to get rid of warning at startup.
+
 * Fri Feb 24 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7-4
 - Do icon dir timestamp update in %%post with lua.
 - Drop no longer needed specfile constructs.