From 3a6f75b141d222e61ad2299f4cea63b41c3881a04829d160dc6071568aa23b2a Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 24 Dec 2020 12:25:23 +0000
Subject: [PATCH] - Update to release 14.31.20

OBS-URL: https://build.opensuse.org/package/show/science/jmol?expand=0&rev=19
---
 jmol-14.30.1.tar.xz  |  3 ---
 jmol-14.31.20.tar.xz |  3 +++
 jmol.changes         |  9 +++++++++
 jmol.spec            | 14 ++++++--------
 sanitize_binpkg.sh   |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 jmol-14.30.1.tar.xz
 create mode 100644 jmol-14.31.20.tar.xz

diff --git a/jmol-14.30.1.tar.xz b/jmol-14.30.1.tar.xz
deleted file mode 100644
index e263061..0000000
--- a/jmol-14.30.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:beb8a3617423382176b2a6ee9015d38192848f8fd6026a972cbf9f93c4057a9a
-size 11735168
diff --git a/jmol-14.31.20.tar.xz b/jmol-14.31.20.tar.xz
new file mode 100644
index 0000000..329800d
--- /dev/null
+++ b/jmol-14.31.20.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5a730d4697e6582a1d50b86c69462f33b309c9d91254922db3219bc8d9b5839
+size 8204076
diff --git a/jmol.changes b/jmol.changes
index 10f3ba3..cbfa7d7 100644
--- a/jmol.changes
+++ b/jmol.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Dec 24 12:19:31 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 14.31.20
+  * Topology CIF reading of _topol_xxx records
+  * GenNBOReader supports older NBO 3.0 output.properties
+    rather than missing .46 labels file
+  * NBO command expanded to allow named orbitals
+
 -------------------------------------------------------------------
 Thu Dec 19 22:25:59 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/jmol.spec b/jmol.spec
index 2475625..82162cb 100644
--- a/jmol.spec
+++ b/jmol.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jmol
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           jmol
-Version:        14.30.1
+Version:        14.31.20
 Release:        0
 Summary:        3D Viewer for chemical structures
 License:        LGPL-2.1-only
@@ -33,20 +33,18 @@ Source4:        %name.desktop
 Source9:        sanitize_binpkg.sh
 Patch1:         datadir.diff
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  desktop-file-utils
 BuildRequires:  dos2unix
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
-Requires:       java
+Requires:       java >= 7
 
 %description
 Jmol is a Java-based viewer for chemical structures in 3D with
 features for chemicals, crystals, materials and biomolecules.
 
 %prep
-%setup -q
-%patch -P 1 -p1
+%autosetup -p1
 cp %{S:2} .
 
 %build
@@ -74,8 +72,8 @@ desktop-file-install --dir %buildroot%_datadir/applications %{S:4}
 %suse_update_desktop_file %name
 
 %files
-%defattr(-,root,root)
-%doc README.txt LICENSE.txt COPYRIGHT.txt CHANGES.txt
+%license LICENSE.txt COPYRIGHT.txt
+%doc README.txt CHANGES.txt
 %_bindir/%name
 %_datadir/%name
 %_datadir/applications/%name.desktop
diff --git a/sanitize_binpkg.sh b/sanitize_binpkg.sh
index cbc74c0..3689c15 100644
--- a/sanitize_binpkg.sh
+++ b/sanitize_binpkg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-v=14.30.1
+v=14.31.20
 if [ ! -e "Jmol-$v-binary.tar.gz" ]; then
 	wget -c http://downloads.sf.net/jmol/Jmol-$v-binary.tar.gz
 fi