rpms/jmol/EL-5 jmol-11.8.14-dontsign.patch, NONE, 1.1 jmol-11.8.14-fedorabuild.patch, NONE, 1.1 jmol.spec, 1.9, 1.10 sources, 1.5, 1.6 Jmol_icon_128.png, 1.1, NONE jmol-11.8-fedorabuild.patch, 1.1, NONE

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7219

Modified Files:
	jmol.spec sources 
Added Files:
	jmol-11.8.14-dontsign.patch jmol-11.8.14-fedorabuild.patch 
Removed Files:
	Jmol_icon_128.png jmol-11.8-fedorabuild.patch 
Log Message:
Update to 11.8.14.

jmol-11.8.14-dontsign.patch:
 build.xml |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE jmol-11.8.14-dontsign.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-23 20:20:36.116683801 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:29:48.147621634 +0200
@@ -389,12 +389,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
+   <!-- <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
              signedjar="${jmol.build.dir}/Jmol.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsigned.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsigned.jar"/>-->
     <jar destfile="${jmol.build.dir}/JmolUnsignedF.jar"
          manifest="manifest/applicationData.txt">
       <fileset dir="${classes.dir}" >
@@ -423,12 +423,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/cli/** **/vecmath/**" />
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
+    <!--<signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
              signedjar="${jmol.build.dir}/JmolData.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>-->
     <copy todir="${jmol.build.dir}">
       <fileset dir=".">
         <include name="jmol" />
@@ -455,11 +455,11 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
     </jar>
 
-  	<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
+  	<!--<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
              signedjar="${jmol.build.dir}/Jvxl.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
              storepass="selfSignedCertificate" alias="selfSignedCertificate" />
-    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>
+    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>-->
 
   </target>
 

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

--- NEW FILE jmol-11.8.14-fedorabuild.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-22 08:47:38.000000000 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:19:02.940613996 +0200
@@ -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: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/EL-5/jmol.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- jmol.spec	2 Oct 2009 16:26:40 -0000	1.9
+++ jmol.spec	23 Dec 2009 19:10:48 -0000	1.10
@@ -1,27 +1,20 @@
-%define svnrel 11581
-
 Name:		jmol
-Version:	11.8
-Release:	1.%{svnrel}svn%{?dist}
+Version:	11.8.14
+Release:	1%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
 URL:		http://jmol.sourceforge.net
 BuildArch:	noarch
-
-# The official release package doesn't have support for building the jar files,
-# 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_8/Jmol
-# tar jcf jmol-%{version}.%{svnrel}svn.tar.bz2 Jmol
-Source0:	%{name}-%{version}.%{svnrel}svn.tar.bz2
+Source0:	http://downloads.sourceforge.net/project/jmol/Jmol/Version%2011.8/Version%20%{version}/jmol-%{version}-full.tar.gz
 # 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
+Patch0:		jmol-11.8.14-fedorabuild.patch
 # Patch to change jar file location to %{_javadir}
 Patch1:		jmol-11.8-jarlocation.patch 
+# Don't try to sign jars
+Patch2:		jmol-11.8.14-dontsign.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,15 +56,25 @@ The documentation for %{name}.
 
 
 %prep
-%setup -q -n Jmol
+%setup -q
 %patch0 -p1 -b .fedorabuild
 %patch1 -p1 -b .jarlocation
+%patch2 -p1 -b .nosign
+
+# Remove binaries
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
+rm -f jars/*
 
 # Remove executable permissions from documentation
-chmod 644 README.txt
-chmod 644 COPYRIGHT.txt
+find -name "*.txt" -exec chmod 644 {} \;
+# Fix EOL encoding
+for doc in README.txt COPYRIGHT.txt LICENSE.txt; do
+ sed "s|\r||g" $doc > $doc.new && \
+ touch -r $doc $doc.new && \
+ mv $doc.new $doc
+done
+
 
 # Make desktop file
 cat > jmol.desktop << EOF
@@ -92,7 +95,7 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/Jmol.jar %{buildroot}%{_javadir}/Jmol.jar
+install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_javadir}/Jmol.jar
 install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_javadir}/JmolApplet.jar
 install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
@@ -124,6 +127,11 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Wed Dec 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8.14-1
+- Build from stable release tarballs works now, switch to using stable
+  releases.
+- Update to 11.8.14.
+
 * 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Oct 2009 16:26:40 -0000	1.5
+++ sources	23 Dec 2009 19:10:48 -0000	1.6
@@ -1 +1,2 @@
-af9c8b8dae12f783ec930ac8c8dd86ee  jmol-11.8.11581svn.tar.bz2
+c59f2db61859bb2eddab51c3e145b1f7  jmol-11.8.14-full.tar.gz
+75268c66c9afac86a59d6348745dd1e4  Jmol_icon_128.png


--- jmol-11.8-fedorabuild.patch DELETED ---