[ape] Update to 2.2.0. Fix FTBFS.

Susi Lehtola jussilehtola at fedoraproject.org
Mon Jun 9 06:46:02 UTC 2014


commit c4c416535f9a4a247ce25faff016ec21fc7f607e
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Mon Jun 9 09:45:53 2014 +0300

    Update to 2.2.0. Fix FTBFS.

 .gitignore           |    1 +
 ape-2.2.0-absp.patch |   14 ++++++++++++++
 ape.spec             |   11 +++++++++--
 sources              |    2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68fa241..1dabc89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /ape-2.0.0.tar.gz
 /ape-2.0.2.tar.gz
 /ape-2.1.0.tar.gz
+/ape-2.2.0.tar.gz
diff --git a/ape-2.2.0-absp.patch b/ape-2.2.0-absp.patch
new file mode 100644
index 0000000..23abc4c
--- /dev/null
+++ b/ape-2.2.0-absp.patch
@@ -0,0 +1,14 @@
+diff -up ape-2.2.0/src/parser_symbols.F90.orig ape-2.2.0/src/parser_symbols.F90
+--- ape-2.2.0/src/parser_symbols.F90.orig	2013-08-05 16:30:18.000000000 +0300
++++ ape-2.2.0/src/parser_symbols.F90	2014-06-09 09:40:04.590591873 +0300
+@@ -250,8 +250,8 @@ contains
+     call oct_parse_putsym("gga_k_yt65",      XC_GGA_K_YT65)
+     call oct_parse_putsym("gga_k_baltin",    XC_GGA_K_BALTIN)
+     call oct_parse_putsym("gga_k_lieb",      XC_GGA_K_LIEB)
+-    call oct_parse_putsym("gga_k_absr1",     XC_GGA_K_ABSR1)
+-    call oct_parse_putsym("gga_k_absr2",     XC_GGA_K_ABSR2)
++    call oct_parse_putsym("gga_k_absp1",     XC_GGA_K_ABSP1)
++    call oct_parse_putsym("gga_k_absp2",     XC_GGA_K_ABSP2)
+     call oct_parse_putsym("gga_k_gr",        XC_GGA_K_GR)
+     call oct_parse_putsym("gga_k_ludena",    XC_GGA_K_LUDENA)
+     call oct_parse_putsym("gga_k_gp85",      XC_GGA_K_GP85)
diff --git a/ape.spec b/ape.spec
index 147cef9..4364bfb 100644
--- a/ape.spec
+++ b/ape.spec
@@ -1,6 +1,6 @@
 Name:		ape
-Version:	2.1.0
-Release:	4%{?dist}
+Version:	2.2.0
+Release:	1%{?dist}
 Summary:	A tool for generating atomic pseudopotentials within a DFT framework
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -8,6 +8,9 @@ URL:		http://www.tddft.org/programs/APE
 Source0:	http://www.tddft.org/programs/APE/sites/default/files/ape-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+# ABSR functional is now ABSP
+Patch0:         ape-2.2.0-absp.patch
+
 BuildRequires:	gcc-gfortran
 BuildRequires:	gsl-devel
 BuildRequires:	libxc-devel
@@ -21,6 +24,7 @@ pseudopotentials within a Density-Functional Theory framework.
 
 %prep
 %setup -q
+%patch0 -p1 -b .absp
 
 %build
 # The APE configure script uses FCFLAGS instead of FFLAGS declared by the configure macro.
@@ -70,6 +74,9 @@ fi
 %{_infodir}/ape.info.*
 
 %changelog
+* Mon Jun 09 2014 Susi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index e87d91e..75c311d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95eeb9e8c03f7dc412c89140a26abe5f  ape-2.1.0.tar.gz
+93cc728d1f832d198fed04662900c19a  ape-2.2.0.tar.gz


More information about the scm-commits mailing list