- more @DATADIR@ substitutions

- don't install help.jar, we use classes from java-help package
- don't create subdirectory in %{_javadir} for single jar
- drop /etc/sysconfig stuff

Changed files:
    JXplorer.sh -> 1.9
    JXplorer.spec -> 1.15

diff --git a/JXplorer.sh b/JXplorer.sh
index 4d6bb0810ce69a75414bed079de5242ec61a3a23..c8bdbcf1c9e7975f614700eaf90bc319794adca6 100644 (file)
--- a/JXplorer.sh
+++ b/JXplorer.sh
@@ -8,8 +8,7 @@ if [ -r /etc/sysconfig/jxplorer ]; then
        . /etc/sysconfig/jxplorer
 fi
 
-JX_JAVADIR=${JX_JAVADIR:-"/usr/share/java/JXplorer"}
-JX_DATADIR=${JX_DATADIR:-"/usr/share/JXplorer"}
+JX_DATADIR=${JX_DATADIR:-"@DATADIR@/JXplorer"}
 
 if ! [ -d "$HOME/.JXplorer" ]; then
   mkdir "$HOME/.JXplorer"
@@ -21,7 +20,7 @@ if ! [ -d "$HOME/.JXplorer" ]; then
 fi
 
 cd "$HOME/.JXplorer"
-CLASSPATH=$(build-classpath junit jhall JXplorer)
+CLASSPATH=$(build-classpath junit jhall jxplorer)
 MAIN_CLASS=com.ca.directory.jxplorer.JXplorer
 JAVA_HOME=@JVMDIR@/java-sun-jre
 

diff --git a/JXplorer.spec b/JXplorer.spec
index ccb02bd49caed1a60f43459839b66fc6e5b2e14f..08db2dce3d3ee3bb20edab534e19e1800a060609 100644 (file)
--- a/JXplorer.spec
+++ b/JXplorer.spec
@@ -57,11 +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~@JVMDIR@~%{_jvmdir}~g' jxconfig.sh
-
-echo 'JX_JAVADIR=%{_javadir}/%{name}' > jxplorer.sysconfig
-echo 'JX_DATADIR=%{_datadir}/%{name}' >> jxplorer.sysconfig
+%{__sed} -i -e 's~@DATADIR@~%{_datadir}/%{name}~g' jxconfig.txt jxplorer.sh
+%{__sed} -i -e 's~@JVMDIR@~%{_jvmdir}~g' jxplorer.sh
 
 %build
 export JAVA_HOME="%{java_home}"
@@ -74,16 +71,12 @@ export LC_ALL=en_US # source code not US-ASCII
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install jxplorer.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/jxplorer
 install -d $RPM_BUILD_ROOT%{_bindir}
 install jxplorer.sh $RPM_BUILD_ROOT%{_bindir}/jxplorer
 
 install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
-install jxplorer.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jxplorer-%{version}.jar
-install jars/help.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/help-%{version}.jar
-ln -s jxplorer-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jxplorer.jar
-ln -s help-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/help.jar
+install jxplorer.jar $RPM_BUILD_ROOT%{_javadir}/jxplorer-%{version}.jar
+ln -s jxplorer-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jxplorer-%{version}.jar
 
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{htmldocs,icons,images,language,security,conftemplate}
 install htmldocs/* $RPM_BUILD_ROOT%{_datadir}/%{name}/htmldocs
@@ -122,7 +115,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc RELEASE.TXT example.ldif licence.txt
 %attr(755,root,root) %{_bindir}/jxplorer
-%{_javadir}/%{name}
+%{_javadir}/jxplorer.jar
+%{_javadir}/jxplorer-%{version}.jar
 %{_datadir}/%{name}
 %{_pixmapsdir}/jxplorer.png
 %{_desktopdir}/jxplorer.desktop
@@ -130,4 +124,3 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/connections.txt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/log4j.xml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/jxconfig.txt
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/jxplorer