rpms/jmol/devel jmol-11.8-jarlocation.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 jmol.spec, 1.13, 1.14 sources, 1.6, 1.7

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20341

Modified Files:
	.cvsignore jmol.spec sources 
Added Files:
	jmol-11.8-jarlocation.patch 
Log Message:
Update to 11581svn, use bz2 source.

jmol-11.8-jarlocation.patch:
 jmol |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

--- NEW FILE jmol-11.8-jarlocation.patch ---
diff -up Jmol/jmol.orig Jmol/jmol
--- Jmol/jmol.orig	2006-08-28 15:58:20.000000000 +0300
+++ Jmol/jmol	2009-09-27 11:55:14.126801748 +0300
@@ -7,14 +7,5 @@ while [ `echo $1 | egrep '^-D|^-m' | wc 
 	shift
 done
 
-if [ -f ./Jmol.jar ] ; then
-  jarpath=./Jmol.jar
-elif [ -f $JMOL_HOME/Jmol.jar ] ; then
-  jarpath=$JMOL_HOME/Jmol.jar
-elif [ -f /usr/share/jmol/Jmol.jar ] ; then
-  jarpath=/usr/share/jmol/Jmol.jar
-else
-  echo Jmol.jar not found
-  exit
-fi
+jarpath=/usr/share/java/Jmol.jar
 $command -Xmx512m -jar $jarpath $@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Sep 2009 23:48:44 -0000	1.6
+++ .cvsignore	2 Oct 2009 15:51:15 -0000	1.7
@@ -1 +1 @@
-jmol-11.8.11564.tar.xz
+jmol-11.8.11581svn.tar.bz2


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/jmol.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- jmol.spec	27 Sep 2009 08:53:51 -0000	1.13
+++ jmol.spec	2 Oct 2009 15:51:15 -0000	1.14
@@ -1,4 +1,4 @@
-%define svnrel 11564
+%define svnrel 11581
 
 Name:		jmol
 Version:	11.8
@@ -13,14 +13,15 @@ BuildArch:	noarch
 # so we use SVN instead.
 
 # The source package has been created from SVN sources:
-# svn export -r %{svnrel} https://jmol.svn.sourceforge.net/svnroot/jmol/branches/v11_6/Jmol
-# tar cvf jmol-%{name}-%{version}.%{svnrel}.tar
-# xz %{name}-%{version}.%{svnrel}.tar
-Source0:	%{name}-%{version}.%{svnrel}.tar.xz
+# svn export -r %{svnrel} https://jmol.svn.sourceforge.net/svnroot/jmol/branches/v11_8/Jmol
+# tar jcf jmol-%{version}.%{svnrel}svn.tar.bz2 Jmol
+Source0:	%{name}-%{version}.%{svnrel}svn.tar.bz2
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
 Source1:	Jmol_icon_128.png
 # Patch to get Jmol to build in Fedora
 Patch0:		jmol-11.8-fedorabuild.patch
+# Patch to change jar file location to %{_javadir}
+Patch1:		jmol-11.8-jarlocation.patch 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,10 +33,6 @@ BuildRequires:	jpackage-utils
 # For javax.vecmath
 BuildRequires:	vecmath
 
-%if 0%{?rhel} == 5
-BuildRequires:	xz
-%endif
-
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
 
@@ -48,6 +45,7 @@ and researchers in chemistry and biochem
 Summary:	Javadocs for %{name}
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
+Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -65,6 +63,7 @@ The documentation for %{name}.
 %prep
 %setup -q -n Jmol
 %patch0 -p1 -b .fedorabuild
+%patch1 -p1 -b .jarlocation
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
@@ -82,7 +81,7 @@ Exec=jmol
 Icon=jmol
 Terminal=false
 Type=Application
-Categories=Education;Science;
+Categories=Education;Science;Chemistry;Physics;DataVisualization;
 EOF
 
 %build
@@ -123,6 +122,10 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Fri Oct 02 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8-1.11581
+- Switch back to tar.bz2 source since xz doesn't work in EL-5.
+- Update to svn revision 11581.
+
 * Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8-1.11564
 - Update to 11.8 series, svn revision 11564.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Sep 2009 23:48:45 -0000	1.6
+++ sources	2 Oct 2009 15:51:15 -0000	1.7
@@ -1 +1 @@
-3f772a8fe552f9bcedca0d071be1e496  jmol-11.8.11564.tar.xz
+af9c8b8dae12f783ec930ac8c8dd86ee  jmol-11.8.11581svn.tar.bz2