- 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

Changed files:
    JXplorer.jxconfig.txt -> 1.3
    JXplorer.sh -> 1.8
    JXplorer.spec -> 1.14

diff --git a/JXplorer.jxconfig.txt b/JXplorer.jxconfig.txt
index 4f917eb11d3f25e666dac645b4e59a50e29f829b..5b16d1f910b382c7cd1a311b5701dfa8ff86ae5a 100644 (file)
--- a/JXplorer.jxconfig.txt
+++ b/JXplorer.jxconfig.txt
@@ -19,11 +19,11 @@ baseDN=c\=au
 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/
 

diff --git a/JXplorer.sh b/JXplorer.sh
index cf8155caf0ca6c97314ee9812d61c1020fe3af48..4d6bb0810ce69a75414bed079de5242ec61a3a23 100644 (file)
--- a/JXplorer.sh
+++ b/JXplorer.sh
@@ -22,11 +22,13 @@ fi
 
 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

diff --git a/JXplorer.spec b/JXplorer.spec
index 6c870dd8aec0c5e74eda2b37572d82b0529a4ad2..ccb02bd49caed1a60f43459839b66fc6e5b2e14f 100644 (file)
--- a/JXplorer.spec
+++ b/JXplorer.spec
@@ -1,9 +1,12 @@
+# 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
@@ -25,9 +28,9 @@ BuildRequires:        rpmbuild(macros) >= 1.553
 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)
 
@@ -54,7 +57,8 @@ icotool -x -o jxplorer.png jxplorer.ico
 
 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