Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
e2fa821704 |
6 changed files with 3 additions and 282 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -1,6 +0,0 @@
|
|||
/ape-1.1.0.tar.gz
|
||||
/ape-2.0.0.tar.gz
|
||||
/ape-2.0.2.tar.gz
|
||||
/ape-2.1.0.tar.gz
|
||||
/ape-2.2.0.tar.gz
|
||||
/ape-2.2.1.tar.gz
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
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)
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
diff -up ape-2.2.1/m4/fortran.m4.old ape-2.2.1/m4/fortran.m4
|
||||
--- ape-2.2.1/m4/fortran.m4.old 2015-01-23 16:07:22.000000000 +0100
|
||||
+++ ape-2.2.1/m4/fortran.m4 2016-02-15 15:02:34.000000000 +0100
|
||||
@@ -1,21 +1,21 @@
|
||||
## Copyright (C) 2002 M. Marques, A. Castro, A. Rubio, G. Bertsch
|
||||
##
|
||||
## This program is free software; you can redistribute it and/or modify
|
||||
-## it under the terms of the GNU Lesser General Public License as published by
|
||||
+## it under the terms of the GNU General Public License as published by
|
||||
## the Free Software Foundation; either version 2, or (at your option)
|
||||
## any later version.
|
||||
##
|
||||
## This program is distributed in the hope that it will be useful,
|
||||
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
-## GNU Lesser General Public License for more details.
|
||||
+## GNU General Public License for more details.
|
||||
##
|
||||
-## You should have received a copy of the GNU Lesser General Public License
|
||||
+## You should have received a copy of the GNU General Public License
|
||||
## along with this program; if not, write to the Free Software
|
||||
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
## 02110-1301, USA.
|
||||
##
|
||||
-## $Id: acx.m4 3881 2008-03-12 23:51:07Z xavier $
|
||||
+## $Id: fortran.m4 14718 2015-10-30 19:07:50Z xavier $
|
||||
##
|
||||
|
||||
################################################
|
||||
@@ -88,8 +88,13 @@ AC_DEFUN([ACX_GREP_FCCPP],[
|
||||
|
||||
echo "$2" > conftest.F90
|
||||
|
||||
- if (eval "$FCCPP conftest.F90") 2>&5 |
|
||||
- grep "$1" >/dev/null 2>&1; then :
|
||||
+ # see if the attempt to preprocess raises an error
|
||||
+ if ! $FCCPP conftest.F90 > /dev/null 2>&5 ; then
|
||||
+ $4
|
||||
+ fi
|
||||
+
|
||||
+ if (eval "$FCCPP conftest.F90" 2>&5) |
|
||||
+ grep -q "$1" 2>&5; then :
|
||||
$3
|
||||
else
|
||||
$4
|
||||
@@ -106,7 +111,7 @@ AC_DEFUN([ACX_FCCPP],[
|
||||
continue
|
||||
fi
|
||||
|
||||
- for FCCPP in "$FCCPP_base" "$FCCPP_base -ansi"; do
|
||||
+ for FCCPP in "$FCCPP_base" "$FCCPP_base -ansi" "$FCCPP_base -C -ffreestanding"; do
|
||||
AC_MSG_CHECKING([whether $FCCPP is usable for Fortran preprocessing])
|
||||
acx_fpp_ok=yes
|
||||
|
||||
@@ -122,8 +127,7 @@ ADD_I(h)]),
|
||||
# in Fortran this is string concatenation, must not be stripped
|
||||
# some cpp's (e.g. icc -E -ansi) might actually insert a space between // too which is not acceptable
|
||||
ACX_GREP_FCCPP([rout // ine], AC_LANG_PROGRAM([],[
|
||||
-#define PUSH_SUB(x) x // ine
|
||||
-PUSH_SUB(rout)]),
|
||||
+rout // ine]),
|
||||
[], [acx_fpp_ok=no; AC_MSG_RESULT([preprocessor mangles C++ style comment])])
|
||||
|
||||
if test x"$acx_fpp_ok" = xyes; then
|
||||
@@ -142,3 +146,50 @@ PUSH_SUB(rout)]),
|
||||
|
||||
AC_SUBST(FCCPP)
|
||||
])
|
||||
+
|
||||
+###############################################
|
||||
+# ACX_FORTRAN_LOC checks for the presence of the loc intrinsics
|
||||
+# --------------------------
|
||||
+AC_DEFUN([ACX_FORTRAN_LOC], [
|
||||
+ AC_MSG_CHECKING(for loc)
|
||||
+ AC_LINK_IFELSE(
|
||||
+ [
|
||||
+ AC_LANG_PROGRAM(,
|
||||
+ [
|
||||
+ implicit none
|
||||
+
|
||||
+ integer :: ii, jj
|
||||
+
|
||||
+ ii = loc(jj)
|
||||
+ ])
|
||||
+ ],
|
||||
+ [
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ AC_DEFINE(HAVE_FORTRAN_LOC, 1,
|
||||
+ [Define if the compiler provides the loc instrinsic])
|
||||
+ ],
|
||||
+ [
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ ])
|
||||
+])
|
||||
+
|
||||
+#
|
||||
+# Check for Fortran 2008's COMPILER_VERSION
|
||||
+# ----------------------------------------------------------
|
||||
+
|
||||
+AC_DEFUN([ACX_FC_COMPILER_VERSION],
|
||||
+[
|
||||
+AC_MSG_CHECKING([for Fortran compiler_version intrinsic])
|
||||
+
|
||||
+AC_LINK_IFELSE(
|
||||
+ AC_LANG_PROGRAM( [], [[
|
||||
+ use iso_fortran_env
|
||||
+ implicit none
|
||||
+ print *, trim (compiler_version())
|
||||
+ ]]),
|
||||
+ [AC_MSG_RESULT(yes)
|
||||
+ AC_DEFINE(HAVE_FC_COMPILER_VERSION, 1,
|
||||
+ [Fortran compiler supports the compiler_version intrinsic])],
|
||||
+ [AC_MSG_RESULT(no)]
|
||||
+ )
|
||||
+])
|
||||
146
ape.spec
146
ape.spec
|
|
@ -1,146 +0,0 @@
|
|||
Name: ape
|
||||
Version: 2.2.1
|
||||
Release: 4%{?dist}
|
||||
Summary: A tool for generating atomic pseudopotentials within a DFT framework
|
||||
Group: Applications/Engineering
|
||||
License: GPLv2+
|
||||
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
|
||||
# Allow gfortran for preprocessing
|
||||
Patch1: ape-2.2.1-fortran.patch
|
||||
|
||||
BuildRequires: gcc-gfortran
|
||||
BuildRequires: gsl-devel
|
||||
BuildRequires: libxc-devel
|
||||
BuildRequires: atlas-devel
|
||||
BuildRequires: automake, autoconf, libtool
|
||||
|
||||
Requires(post): info
|
||||
Requires(preun): info
|
||||
|
||||
%description
|
||||
APE (Atomic Pseudopotential Engine) is a tool for generating atomic
|
||||
pseudopotentials within a Density-Functional Theory framework.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .absp
|
||||
%patch1 -p1 -b .fortran
|
||||
autoreconf -if
|
||||
aclocal
|
||||
|
||||
%build
|
||||
# The APE configure script uses FCFLAGS instead of FFLAGS declared by the configure macro.
|
||||
export FC=gfortran
|
||||
export FCFLAGS="%{optflags} -ffree-form -ffree-line-length-none -I%{_fmoddir}"
|
||||
export FCCPP="cpp -C -ansi -ffreestanding"
|
||||
# Libs
|
||||
#%if 0%{?fedora} > 20 || 0%{?rhel} > 6
|
||||
#export LIBS="-L%{_libdir}/atlas -lsatlas"
|
||||
#%else
|
||||
export LIBS="-L%{_libdir}/atlas -lcblas -latlas"
|
||||
#%endif
|
||||
|
||||
%configure
|
||||
# SMP make is not working.
|
||||
#make %{?_smp_mflags}
|
||||
make
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot}
|
||||
# Get rid of spurious directory
|
||||
rm -rf %{buildroot}%{_infodir}/dir
|
||||
# Get rid of testsuite, it's already run in check phase.
|
||||
rm -rf %{buildroot}%{_datadir}/ape
|
||||
rm %{buildroot}%{_bindir}/ape-run*
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ] ; then
|
||||
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
fi
|
||||
|
||||
# Check phase is disabled, since it fails sometimes on 32-bit architectures due
|
||||
# to some hardly catchable rounding error, which has been fixed in the middle
|
||||
# of big changes all over the program sometime after the release of 1.1.0.
|
||||
# It should be enabled when version 1.2 is released.
|
||||
|
||||
#%check
|
||||
## Add binary to PATH
|
||||
#export PATH=$PATH:`pwd`/src
|
||||
#cd testsuite
|
||||
#./ape-run_testsuite -l
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README TODO sample
|
||||
%{_bindir}/ape
|
||||
%{_infodir}/ape.info.*
|
||||
|
||||
%changelog
|
||||
* Mon Feb 15 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-4
|
||||
- Fix FTBFS on rawhide.
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat Feb 21 2015 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.2.1-1
|
||||
- Update to 2.2.1.
|
||||
|
||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Mon Jun 09 2014 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.2.0-1
|
||||
- Update to 2.2.0.
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu May 16 2013 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.1.0-2
|
||||
- Update to new tarball with aarch64 support.
|
||||
|
||||
* Wed Mar 06 2013 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.1.0-1
|
||||
- Update to 2.1.0.
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Mon Dec 10 2012 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.0.2-1
|
||||
- Update to 2.0.2.
|
||||
- Build against libxc 2.0.0.
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jul 07 2012 Jussi Lehtola <jussilehtola@fedoraproject.org> - 2.0.0-1
|
||||
- Update to 2.0.0.
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Jan 26 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.1.0-2
|
||||
- Disable %%check phase due to problems on 32-bit architectures. It needs to be
|
||||
re-enabled when version 1.2 (which does not suffer from the rounding issues
|
||||
causing the problems) is released.
|
||||
|
||||
* Tue Jan 18 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.1.0-1
|
||||
- Initial spec.
|
||||
3
dead.package
Normal file
3
dead.package
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
2016-05-31: Retired because of broken deps in preparation of Fedora 24
|
||||
Reference: https://fedorahosted.org/rel-eng/ticket/6416
|
||||
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
ab81da85bd749c0c136af088c7f9ad58 ape-2.2.1.tar.gz
|
||||
Reference in a new issue