packages: JXplorer/JXplorer.sh, JXplorer/JXplorer.spec - more @DATADIR@ sub...

[pawelz]

Author: pawelz                       Date: Fri Apr 23 13:52:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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

---- Files affected:
packages/JXplorer:
   JXplorer.sh (1.8 -> 1.9) , JXplorer.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/JXplorer/JXplorer.sh
diff -u packages/JXplorer/JXplorer.sh:1.8 packages/JXplorer/JXplorer.sh:1.9
--- packages/JXplorer/JXplorer.sh:1.8	Fri Apr 23 15:43:01 2010
+++ packages/JXplorer/JXplorer.sh	Fri Apr 23 15:52:52 2010
@@ -8,8 +8,7 @@
 	. /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 @@
 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
 

================================================================
Index: packages/JXplorer/JXplorer.spec
diff -u packages/JXplorer/JXplorer.spec:1.14 packages/JXplorer/JXplorer.spec:1.15
--- packages/JXplorer/JXplorer.spec:1.14	Fri Apr 23 15:43:01 2010
+++ packages/JXplorer/JXplorer.spec	Fri Apr 23 15:52:52 2010
@@ -58,11 +58,8 @@
 
 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}"
@@ -75,16 +72,12 @@
 
 %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
@@ -123,7 +116,8 @@
 %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
@@ -131,7 +125,6 @@
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -139,6 +132,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2010/04/23 13:52:52  pawelz
+- 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
+
 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/JXplorer/JXplorer.sh?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/JXplorer/JXplorer.spec?r1=1.14&r2=1.15&f=u