[jmol] Update to 14.0.3.
Susi Lehtola
jussilehtola at fedoraproject.org
Wed Jan 1 21:27:04 UTC 2014
commit 0a302583820d2fe9ce7861f0cc1537f485cdd308
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date: Wed Jan 1 23:26:51 2014 +0200
Update to 14.0.3.
.gitignore | 1 +
jmol-12.0.48-classpath.patch | 11 ------
jmol-13.2.3-dontsign.patch | 38 ---------------------
jmol-13.2.3-fedorabuild.patch | 44 ------------------------
jmol-13.2.3-unbundle.patch | 27 ---------------
jmol.spec | 75 ++++++++++++++--------------------------
sources | 4 +-
7 files changed, 29 insertions(+), 171 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 61b2417..63a7adc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ jmol-11.8.26-full.tar.gz
/Jmol-13.0.15-full.tar.gz
/Jmol-13.2.3-full.tar.gz
/Jmol-13.2.4-full.tar.gz
+/Jmol_icon13.png
diff --git a/jmol.spec b/jmol.spec
index d667a7a..38ade80 100644
--- a/jmol.spec
+++ b/jmol.spec
@@ -1,5 +1,5 @@
Name: jmol
-Version: 13.2.4
+Version: 14.0.3
Release: 1%{?dist}
Summary: An open-source Java viewer for chemical structures in 3D
Group: Applications/Engineering
@@ -9,42 +9,29 @@ License: LGPLv2+ and IJG and BSD
URL: http://jmol.sourceforge.net
BuildArch: noarch
Source0: http://downloads.sourceforge.net/%{name}/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
+Source1: http://wiki.jmol.org/images/1/1c/Jmol_icon13.png
# Patch to get Jmol to build in Fedora (location of JAR files)
-Patch0: jmol-13.2.3-fedorabuild.patch
-# Unbundle bundled classes from jars
-Patch1: jmol-13.2.3-unbundle.patch
+Patch0: jmol-14.0.3-fedorabuild.patch
# Don't try to sign jars
-Patch2: jmol-13.2.3-dontsign.patch
-# Don't ignore the system classpath
-Patch3: jmol-12.0.48-classpath.patch
-
+Patch1: jmol-14.0.3-dontsign.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant, ant-contrib
BuildRequires: desktop-file-utils
BuildRequires: gettext-devel
-BuildRequires: itext
BuildRequires: apache-commons-cli
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: jspecview
-BuildRequires: naga
-
-%if 0%{?fedora} > 14
+BuildRequires: jspecview
+BuildRequires: naga
# In newer releases some of the necessary Java classes are
# in the browser plugin package
BuildRequires: icedtea-web
-Requires: icedtea-web
-%endif
-
-Requires: java >= 1:1.6.0
-Requires: jpackage-utils
-Requires: itext
-Requires: vecmath
-Requires: apache-commons-cli
+Requires: icedtea-web
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+Requires: apache-commons-cli
%description
Jmol is a free, open source molecule viewer for students, educators,
@@ -52,8 +39,8 @@ and researchers in chemistry and biochemistry.
%package javadoc
-Summary: Java docs for %{name}
-Group: Documentation
+Summary: Java docs for %{name}
+Group: Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
@@ -62,8 +49,8 @@ This package contains the API documentation for %{name}.
%package doc
-Summary: Documentation for %{name}
-Group: Documentation
+Summary: Documentation for %{name}
+Group: Documentation
Requires: %{name} = %{version}-%{release}
%description doc
@@ -73,9 +60,7 @@ The documentation for %{name}.
%prep
%setup -q
%patch0 -p1 -b .fedorabuild
-%patch1 -p1 -b .unbundle
-%patch2 -p1 -b .nosign
-%patch3 -p1 -b .classpath
+%patch1 -p1 -b .nosign
# Remove binaries
find -name '*.class' -exec rm -f '{}' \;
@@ -108,33 +93,25 @@ EOF
%build
export ANT_OPTS="-Dfile.encoding=utf-8"
-%if 0%{?fedora} > 15
# Need to be able to find netscape.javascript.*classes
PLUGIN_JAR=%{_datadir}/icedtea-web/plugin.jar
jar tf $PLUGIN_JAR | grep javascript/JSObject.class
-#ant --execdebug -lib $PLUGIN_JAR doc jar applet-jar
+ant --execdebug -lib $PLUGIN_JAR jar applet-jar doc
-ant --execdebug -lib $PLUGIN_JAR jar
-ant --execdebug -lib $PLUGIN_JAR applet-jar
-ant --execdebug -lib $PLUGIN_JAR doc
-%else
-ant --execdebug doc jar applet-jar
-%endif
+#ant --execdebug -lib $PLUGIN_JAR jar
+#ant --execdebug -lib $PLUGIN_JAR applet-jar
+#ant --execdebug -lib $PLUGIN_JAR doc
%install
rm -rf %{buildroot}
-install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_javadir}/Jmol.jar
+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
-%jpackage_script org.openscience.jmol.app.Jmol "" "" Jmol:commons-cli:vecmath:itext jmol true
+%jpackage_script org.openscience.jmol.app.Jmol "" "" Jmol:commons-cli:jspecview.app:jspecview.applet jmol true
# Install desktop file
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
---vendor=fedora \
-%endif
-jmol.desktop
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications jmol.desktop
# Javadoc files
mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -150,11 +127,7 @@ rm -rf %{buildroot}
%{_javadir}/Jmol.jar
%{_javadir}/JmolApplet.jar
%{_datadir}/pixmaps/%{name}.png
-%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
-%{_datadir}/applications/fedora-%{name}.desktop
-%else
%{_datadir}/applications/%{name}.desktop
-%endif
%files javadoc
%defattr(-,root,root,-)
@@ -165,6 +138,10 @@ rm -rf %{buildroot}
%doc build/doc/*
%changelog
+* Wed Jan 01 2014 Susi Lehtola <jussilehtola at fedoraproject.org> - 14.0.3-1
+- Update to 14.0.3.
+- Updated logo.
+
* Fri Aug 23 2013 Susi Lehtola <jussilehtola at fedoraproject.org> - 13.2.4-1
- Update to 13.2.4.
diff --git a/sources b/sources
index 450f783..eecdf0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-75268c66c9afac86a59d6348745dd1e4 Jmol_icon_128.png
-e513ea91f290990296a6baf1152ef0a5 Jmol-13.2.4-full.tar.gz
+a065ae72e0856e1720ebb6f5a46a9100 Jmol-13.2.4-full.tar.gz
+ec81d40b7583cf4fd9dfac71b84784cd Jmol_icon13.png
More information about the scm-commits
mailing list