rpms/jmol/devel jmol-11.8-fedorabuild.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 jmol.spec, 1.11, 1.12 sources, 1.5, 1.6 jmol.patch, 1.1, NONE

[Jussi Lehtola]

Author: jussilehtola

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

Modified Files:
	.cvsignore jmol.spec sources 
Added Files:
	jmol-11.8-fedorabuild.patch 
Removed Files:
	jmol.patch 
Log Message:
Update to 11.8 series.

jmol-11.8-fedorabuild.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE jmol-11.8-fedorabuild.patch ---
diff -up Jmol/build.xml.fedorabuild Jmol/build.xml
--- Jmol/build.xml.fedorabuild	2009-09-17 05:37:36.000000000 +0300
+++ Jmol/build.xml	2009-09-23 17:25:56.101688225 +0300
@@ -20,7 +20,7 @@
   <property name="jvxl_version" value="0.1" />
 
   <property name="tests.source.dir" value="source-tests" />
-  <property name="lib.dir" value="jars" />
+  <property name="lib.dir" value="/usr/share/java" />
   <property name="plugin.dir" value="plugin-jars" />
   <property name="appjars.dir" value="build/appjars" />
   <property name="classes.dir" value="build/classes" />
@@ -34,9 +34,9 @@
   <property name="jmol.build.dir" value="build" />
   <property name="docbook-xsl" value="docbook-xsl-1.74.0" />
   <property name="docbook-xml" value="docbook-xml-4.4" />
-  <property name="vecmath.jar" value="vecmath1.2-1.14.jar" />
-  <property name="itext.jar" value="itext-1.4.5.jar" />
-  <property name="commons-cli.jar" value="commons-cli-1.0.jar" />
+  <property name="vecmath.jar" value="vecmath.jar" />
+  <property name="itext.jar" value="itext.jar" />
+  <property name="commons-cli.jar" value="commons-cli.jar" />
 
   <!-- you can set this by defining it in ~/.jmol.build.properties -->
   <property name="keystore.name" value="Must be set by user." />


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Jul 2009 14:24:22 -0000	1.5
+++ .cvsignore	26 Sep 2009 23:48:44 -0000	1.6
@@ -1 +1 @@
-jmol-11.6.11223.tar.bz2
+jmol-11.8.11564.tar.xz


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/jmol.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- jmol.spec	25 Jul 2009 04:03:51 -0000	1.11
+++ jmol.spec	26 Sep 2009 23:48:45 -0000	1.12
@@ -1,8 +1,8 @@
-%define svnrel 11223
+%define svnrel 11564
 
 Name:		jmol
-Version:	11.6
-Release:	12.%{svnrel}svn%{?dist}
+Version:	11.8
+Release:	1.%{svnrel}svn%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
@@ -14,19 +14,27 @@ BuildArch:	noarch
 
 # The source package has been created from SVN sources:
 # svn export -r %{svnrel} https://jmol.svn.sourceforge.net/svnroot/jmol/branches/v11_6/Jmol
-Source0:	%{name}-%{version}.%{svnrel}.tar.bz2
+# tar cvf jmol-%{name}-%{version}.%{svnrel}.tar
+# xz %{name}-%{version}.%{svnrel}.tar
+Source0:	%{name}-%{version}.%{svnrel}.tar.xz
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
-Source2:	Jmol_icon_128.png
-# Patch disabling jar signing
-Patch0:		jmol.patch
+Source1:	Jmol_icon_128.png
+# Patch to get Jmol to build in Fedora
+Patch0:		jmol-11.8-fedorabuild.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	ant
+BuildRequires:	ant, ant-contrib
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
+# For javax.vecmath
+BuildRequires:	vecmath
+
+%if 0%{?rhel} == 5
+BuildRequires:	xz
+%endif
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
@@ -56,8 +64,9 @@ The documentation for %{name}.
 
 %prep
 %setup -q -n Jmol
-%patch0 -p1
-find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
+%patch0 -p1 -b .fedorabuild
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
 
 # Remove executable permissions from documentation
 chmod 644 README.txt
@@ -82,9 +91,10 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
+#install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
+install -D -p -m 644 build/Jmol.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
 install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
-install -D -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 # Install desktop file
 desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=fedora jmol.desktop
@@ -113,6 +123,9 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8-1.11564
+- Update to 11.8 series, svn revision 11564.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.6-12.11223svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Jul 2009 14:24:22 -0000	1.5
+++ sources	26 Sep 2009 23:48:45 -0000	1.6
@@ -1 +1 @@
-6cdf1f77df024e9a0c07a6df6643002e  jmol-11.6.11223.tar.bz2
+3f772a8fe552f9bcedca0d071be1e496  jmol-11.8.11564.tar.xz


--- jmol.patch DELETED ---