packages: JXplorer/JXplorer.jxconfig.txt, JXplorer/JXplorer.sh, JXplorer/JX...

[pawelz]

Author: pawelz                       Date: Fri Apr 23 13:43:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- force java-sun-jre, it builds on any JDK, but works only on java-sun
- corect use of run() jpackage-utils function
- use @ instead of == to mark substitution placeholders
- rel 3

---- Files affected:
packages/JXplorer:
   JXplorer.jxconfig.txt (1.2 -> 1.3) , JXplorer.sh (1.7 -> 1.8) , JXplorer.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/JXplorer/JXplorer.jxconfig.txt
diff -u packages/JXplorer/JXplorer.jxconfig.txt:1.2 packages/JXplorer/JXplorer.jxconfig.txt:1.3
--- packages/JXplorer/JXplorer.jxconfig.txt:1.2	Sat Aug  2 14:50:19 2008
+++ packages/JXplorer/JXplorer.jxconfig.txt	Fri Apr 23 15:43:01 2010
@@ -19,11 +19,11 @@
 com.ca.level=UNUSED
 
 #dir  this sets the directories that JXplorer reads its resources from.
-dir.help===DATADIR==/help/
-dir.htmldocs===DATADIR==/htmldocs/
-dir.icons===DATADIR==/icons/
-dir.images===DATADIR==/images/
-dir.local===DATADIR==/
+dir.help=@DATADIR@/help/
+dir.htmldocs=@DATADIR@/htmldocs/
+dir.icons=@DATADIR@/icons/
+dir.images=@DATADIR@/images/
+dir.local=@DATADIR@/
 dir.plugins=plugins/
 dir.templates=templates/
 

================================================================
Index: packages/JXplorer/JXplorer.sh
diff -u packages/JXplorer/JXplorer.sh:1.7 packages/JXplorer/JXplorer.sh:1.8
--- packages/JXplorer/JXplorer.sh:1.7	Mon Apr 19 20:34:36 2010
+++ packages/JXplorer/JXplorer.sh	Fri Apr 23 15:43:01 2010
@@ -22,11 +22,13 @@
 
 cd "$HOME/.JXplorer"
 CLASSPATH=$(build-classpath junit jhall JXplorer)
+MAIN_CLASS=com.ca.directory.jxplorer.JXplorer
+JAVA_HOME=@JVMDIR@/java-sun-jre
 
 if [ "$#" == "0" ]; then
-    run com.ca.directory.jxplorer.JXplorer < /dev/null > /dev/null 2>&1 &
+    run < /dev/null > /dev/null 2>&1 &
   else if [ "$1" = "console" ] ; then
-    run com.ca.directory.jxplorer.JXplorer
+    run
   else
     echo "Usage: $0 [console|help]"
   fi

================================================================
Index: packages/JXplorer/JXplorer.spec
diff -u packages/JXplorer/JXplorer.spec:1.13 packages/JXplorer/JXplorer.spec:1.14
--- packages/JXplorer/JXplorer.spec:1.13	Tue Apr 20 18:12:18 2010
+++ packages/JXplorer/JXplorer.spec	Fri Apr 23 15:43:01 2010
@@ -1,10 +1,13 @@
 # $Revision$, $Date$
+# NOTE:
+# - it builds with any JDK, but it runs on java-sun only. It's not able to
+#   connect to LDAP on icedtea6
 %include	/usr/lib/rpm/macros.java
 Summary:	LDAP browser
 Summary(pl.UTF-8):	Przeglądarka LDAP
 Name:		JXplorer
 Version:	3.2
-Release:	2
+Release:	3
 License:	Computer Associates Open Source Software License
 Group:		Applications/Databases/Interfaces
 Source0:	http://dl.sourceforge.net/jxplorer/JXv%{version}deploy.tar.bz2
@@ -26,9 +29,9 @@
 BuildRequires:	sed >= 4.0
 BuildConflicts:	java-gcj-compat-devel
 Requires:	java-help
-Requires:	jpackage-utils
-Requires:	jre-X11
 Requires:	java-junit
+Requires:	java-sun-jre-base-X11
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,7 +58,8 @@
 
 install %{SOURCE2} jxplorer.sh
 install %{SOURCE3} jxconfig.txt
-%{__sed} -i -e 's~==DATADIR==~%{_datadir}/%{name}~g' jxconfig.txt
+%{__sed} -i -e 's~@DATADIR@~%{_datadir}/%{name}~g' jxconfig.txt
+%{__sed} -i -e 's~@JVMDIR@~%{_jvmdir}~g' jxconfig.sh
 
 echo 'JX_JAVADIR=%{_javadir}/%{name}' > jxplorer.sysconfig
 echo 'JX_DATADIR=%{_datadir}/%{name}' >> jxplorer.sysconfig
@@ -135,6 +139,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/04/23 13:43:01  pawelz
+- force java-sun-jre, it builds on any JDK, but works only on java-sun
+- corect use of run() jpackage-utils function
+- use @ instead of == to mark substitution placeholders
+- rel 3
+
 Revision 1.13  2010/04/20 16:12:18  pawelz
 - s/junit/java-junit/ in deps
 - rel 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/JXplorer/JXplorer.jxconfig.txt?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/JXplorer/JXplorer.sh?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/JXplorer/JXplorer.spec?r1=1.13&r2=1.14&f=u