jussilehtola pushed to libxc (master). "Fix FTBFS."

[notifications at fedoraproject.org]

>From 6ad8f4224c980ec5e8dd0fda03f0ef5fe688fd5b Mon Sep 17 00:00:00 2001
From: Susi Lehtola <jussilehtola at fedoraproject.org>
Date: Fri, 24 Apr 2015 22:56:10 +0200
Subject: Fix FTBFS.


diff --git a/libxc-2.1.2-build.patch b/libxc-2.1.2-build.patch
new file mode 100644
index 0000000..1caa3b8
--- /dev/null
+++ b/libxc-2.1.2-build.patch
@@ -0,0 +1,18 @@
+diff -up libxc-2.1.2/src/Makefile.am.orig libxc-2.1.2/src/Makefile.am
+--- libxc-2.1.2/src/Makefile.am.orig	2015-02-19 14:35:44.000000000 +0100
++++ libxc-2.1.2/src/Makefile.am	2015-04-24 22:46:53.997186406 +0200
+@@ -62,11 +62,13 @@ libxc_la_SOURCES = $(libxc_la_FUNC_SOURC
+ 
+ if COMPILE_SINGLE
+   nodist_libxc_la_SOURCES = $(libxc_la_FUNC_SINGLE_SOURCES)
++else
++  nodist_libxc_la_SOURCES =
+ endif
+ 
+ if COMPILE_FORTRAN
+   libxc_la_SOURCES += xc_f.c
+-  nodist_libxc_la_SOURCES = libxc_funcs.f90 libxc.f90
++  nodist_libxc_la_SOURCES += libxc_funcs.f90 libxc.f90
+ if COMPILE_SINGLE
+     nodist_libxc_la_SOURCES += xc_f_s.c libxc_s.f90
+ endif
diff --git a/libxc.spec b/libxc.spec
index 91177e5..f7ab1d5 100644
--- a/libxc.spec
+++ b/libxc.spec
@@ -8,16 +8,21 @@
 Name:		libxc
 Summary:	Library of exchange and correlation functionals to be used in DFT codes
 Version:	2.1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv3+
 Group:		Applications/Engineering
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 Source0:	http://www.tddft.org/programs/octopus/down.php?file=libxc/libxc-%{version}.tar.gz
 # Workaround for BZ #1079415 causing builds to fail on ppc archs in EPEL
 Patch0:         libxc-2.1.0-ppc.patch
+# Fix broken makefile
+Patch1:         libxc-2.1.2-build.patch
 URL:		http://www.tddft.org/programs/octopus/wiki/index.php/Libxc
 
 BuildRequires:	gcc-gfortran
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
 
 %description 
 libxc is a library of exchange and correlation functionals. Its purpose is to
@@ -57,6 +62,9 @@ in order to compile programs against libxc.
 %endif
 %endif
 
+%patch1 -p1 -b .build
+autoreconf -i
+
 %build
 # Don't insert C code during preprocessing
 export FCCPP="cpp -ffreestanding"
@@ -102,6 +110,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libxc.pc
 
 %changelog
+* Fri Apr 24 2015 Susi Lehtola <jussilehtola at fedoraproject.org> - 2.1.2-2
+- Patch broken makefiles.
+
 * Thu Feb 19 2015 Susi Lehtola <jussilehtola at fedoraproject.org> - 2.1.2-1
 - Update to 2.1.2.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libxc.git/commit/?h=master&id=6ad8f4224c980ec5e8dd0fda03f0ef5fe688fd5b