rpms/portecle/devel portecle.sh.in,1.1,1.2 portecle.spec,1.9,1.10

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/portecle/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8385

Modified Files:
	portecle.sh.in portecle.spec 
Log Message:
* Sat May  8 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.5-2
- Drop workaround for #461683, require jpackage-utils containing the fix.



Index: portecle.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/portecle/devel/portecle.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- portecle.sh.in	12 Nov 2009 21:54:49 -0000	1.1
+++ portecle.sh.in	8 May 2010 16:46:31 -0000	1.2
@@ -2,6 +2,7 @@
 #
 # Portecle startup script
 
+_prefer_jre=true
 . /usr/share/java-utils/java-functions
 
 if [ -f /etc/java/portecle.conf ] ; then
@@ -16,14 +17,6 @@ BASE_FLAGS="-splash:@DOCDIR@/images/spla
 BASE_OPTIONS="-Dportecle.experimental=@EXPERIMENTAL@"
 BASE_JARS="bcprov portecle"
 
-# java-functions prefers a sdk as of jpackage-utils 1.7.5 which may cause
-# problems so we try to find a jre instead:
-# - https://bugzilla.redhat.com/461683
-# - https://bugzilla.redhat.com/498831
-if [ -z "$_JAVA_HOME" ] ; then
-    JAVA_HOME=$( ls -1 $JVM_ROOT/jre-?.?.? | LC_ALL=C sort -r | head -n 1 )
-fi
-
 set_jvm
 set_classpath $BASE_JARS
 set_flags $BASE_FLAGS


Index: portecle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/portecle/devel/portecle.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- portecle.spec	2 Jan 2010 23:22:00 -0000	1.9
+++ portecle.spec	8 May 2010 16:46:31 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           portecle
 Version:        1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multipurpose keystore and certificate tool
 
 Group:          Applications/System
@@ -18,7 +18,8 @@ BuildRequires:  bouncycastle >= 1.44
 BuildRequires:  desktop-file-utils
 BuildRequires:  jpackage-utils
 Requires:       bouncycastle >= 1.44
-Requires:       jpackage-utils
+# >= 1.7.5-3.9 for _prefer_jre in launcher script (#461683, #498831)
+Requires:       jpackage-utils >= 1.7.5-3.9
 Requires:       hicolor-icon-theme
 BuildRequires:  java-devel >= 1.6.0
 Requires:       jre >= 1.6.0
@@ -86,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat May  8 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.5-2
+- Drop workaround for #461683, require jpackage-utils containing the fix.
+
 * Sun Jan  3 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.5-1
 - Update to 1.5.