marcindulak pushed to nwchem (epel7). "fix bug #1196616"

[notifications at fedoraproject.org]

>From 1cc877961e4a20668dbd328d55cc3e7dc21565aa Mon Sep 17 00:00:00 2001
From: marcindulak <Marcin.Dulak at gmail.com>
Date: Mon, 2 Mar 2015 21:33:54 +0100
Subject: fix bug #1196616


diff --git a/Makefileh_use_arur.patch b/Makefileh_use_arur.patch
new file mode 100644
index 0000000..6f19dfd
--- /dev/null
+++ b/Makefileh_use_arur.patch
@@ -0,0 +1,16 @@
+Index: config/makefile.h
+===================================================================
+--- src/config/makefile.h	(revision 26907)
++++ src/config/makefile.h	(revision 26908)
+@@ -251,6 +251,11 @@
+ 	@exit 1
+     endif
+ 
++# -U option needed for introducing timestamps in libraries
++# see https://bugzilla.redhat.com/show_bug.cgi?id=1195883
++    ifdef USE_ARUR
++        ARFLAGS = rU
++    endif
+ #
+ # Machine specific stuff
+ #
diff --git a/nwchem.spec b/nwchem.spec
index e20a978..6ac60da 100644
--- a/nwchem.spec
+++ b/nwchem.spec
@@ -49,9 +49,10 @@ ExcludeArch: aarch64
 # 32-bit integer arguments (de facto default)
 %global BLAS_SIZE 4
 
+
 Name:			nwchem
 Version:		%{major_version}.%{minor_version}
-Release:		13%{?dist}
+Release:		14%{?dist}
 Summary:		Delivering High-Performance Computational Chemistry to Science
 
 License:		ECL 2.0
@@ -59,6 +60,7 @@ URL:			http://www.nwchem-sw.org/
 # Nwchem changes naming convention of tarballs very often!
 Source0:		http://www.nwchem-sw.org/images/%{upstream_name}-%{major_version}.revision%{minor_version}-src.%{posttag}.tar.gz
 Patch0:			Makefile_gcc4x8x9.patch
+Patch1:			Makefileh_use_arur.patch
 
 # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags
 # One needs to patch gfortran/gcc makefiles in order to use
@@ -159,6 +161,8 @@ This package contains the data files.
 %setup -q -n %{upstream_name}-%{major_version}.revision%{minor_version}-src.%{posttag}
 # gcc 4{8,9} patch
 %patch0 -p0
+# ar patch
+%patch1 -p0
 # remove -march=native -mtune=native -mfpmath=sse: cause koji to fail with
 # f951: error: CPU you selected does not support x86-64 instruction set
 sed -e 's|-march=native||g' -i src/config/makefile.h
@@ -190,6 +194,13 @@ echo export NWCHEM_TARGET=%{NWCHEM_TARGET} >> settings.sh
 #
 echo export CC=gcc >> settings.sh
 echo export FC=gfortran >> settings.sh
+# http://www.nwchem-sw.org/index.php/Special:AWCforum/st/id1590/Nwchem-dev.revision26704-src.201....html
+%if 0%{?fedora} >= 21
+echo export USE_ARUR=TRUE >> settings.sh
+%endif
+%if 0%{?rhel} >= 7
+echo export USE_ARUR=TRUE >> settings.sh
+%endif
 #
 echo export USE_NOFSCHECK=TRUE >> settings.sh
 echo export NWCHEM_FSCHECK=N >> settings.sh
@@ -452,6 +463,9 @@ mv QA.orig QA
 
 
 %changelog
+* Mon Mar  2 2015 Marcin Dulak <Marcin.Dulak at gmail.com> - 6.5.26243-14
+- fix bug #1196616
+
 * Sat Nov 15 2014 Marcin Dulak <Marcin.Dulak at gmail.com> - 6.5.26243-13
 - upstream update
 - MRCC_THEORY and NWCHEM_LONG_PATHS enabled
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nwchem.git/commit/?h=epel7&id=1cc877961e4a20668dbd328d55cc3e7dc21565aa