rpms/jmol/F-11 jmol-11.8-fedorabuild.patch, NONE, 1.1 jmol-11.8-jarlocation.patch, NONE, 1.1 jmol.spec, 1.9, 1.10 sources, 1.5, 1.6
Jussi Lehtola
jussilehtola at fedoraproject.org
Fri Oct 2 16:26:41 UTC 2009
- Previous message (by thread): rpms/jmol/F-10 jmol-11.8-fedorabuild.patch, NONE, 1.1 jmol-11.8-jarlocation.patch, NONE, 1.1 jmol.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message (by thread): rpms/mojito/devel .cvsignore, 1.10, 1.11 mojito.spec, 1.19, 1.20 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jussilehtola
Update of /cvs/pkgs/rpms/jmol/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31516/F-11
Modified Files:
jmol.spec sources
Added Files:
jmol-11.8-fedorabuild.patch jmol-11.8-jarlocation.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." />
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: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-11/jmol.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- jmol.spec 16 Jul 2009 21:02:18 -0000 1.9
+++ jmol.spec 2 Oct 2009 16:26:41 -0000 1.10
@@ -1,8 +1,8 @@
-%define svnrel 11223
+%define svnrel 11581
Name: jmol
-Version: 11.6
-Release: 11.%{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+
@@ -13,20 +13,27 @@ 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
-Source0: %{name}-%{version}.%{svnrel}.tar.bz2
+# 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"
-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
+# Patch to change jar file location to %{_javadir}
+Patch1: jmol-11.8-jarlocation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ant
+BuildRequires: ant, ant-contrib
BuildRequires: desktop-file-utils
BuildRequires: gettext-devel
+BuildRequires: itext
+BuildRequires: jakarta-commons-cli
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
+# For javax.vecmath
+BuildRequires: vecmath
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -40,6 +47,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}.
@@ -56,8 +64,10 @@ The documentation for %{name}.
%prep
%setup -q -n Jmol
-%patch0 -p1
-find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
+%patch0 -p1 -b .fedorabuild
+%patch1 -p1 -b .jarlocation
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
# Remove executable permissions from documentation
chmod 644 README.txt
@@ -73,7 +83,7 @@ Exec=jmol
Icon=jmol
Terminal=false
Type=Application
-Categories=Education;Science;
+Categories=Education;Science;Chemistry;Physics;DataVisualization;
EOF
%build
@@ -82,9 +92,9 @@ 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/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
-install -D -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -D -p -m 644 build/Jmol.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
# Install desktop file
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=fedora jmol.desktop
@@ -100,7 +110,8 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%doc build/doc/* README.txt COPYRIGHT.txt LICENSE.txt
%{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{_javadir}/Jmol.jar
+%{_javadir}/JmolApplet.jar
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop
@@ -113,6 +124,16 @@ 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.
+
+* 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
+
* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.6-11.11223svn
- Include desktop file in the spec.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 16 Jul 2009 14:27:47 -0000 1.5
+++ sources 2 Oct 2009 16:26:41 -0000 1.6
@@ -1 +1 @@
-6cdf1f77df024e9a0c07a6df6643002e jmol-11.6.11223.tar.bz2
+af9c8b8dae12f783ec930ac8c8dd86ee jmol-11.8.11581svn.tar.bz2
- Previous message (by thread): rpms/jmol/F-10 jmol-11.8-fedorabuild.patch, NONE, 1.1 jmol-11.8-jarlocation.patch, NONE, 1.1 jmol.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message (by thread): rpms/mojito/devel .cvsignore, 1.10, 1.11 mojito.spec, 1.19, 1.20 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list