diff --git a/metis.spec b/metis.spec index c9a8afd..4a9dbcf 100644 --- a/metis.spec +++ b/metis.spec @@ -1,6 +1,10 @@ +%if 0%{?fedora} <= 22 +%global _hardened_build 1 +%endif + Name: metis Version: 5.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering License: ASL 2.0 and BSD and LGPLv2+ Group: Development/Libraries @@ -35,7 +39,6 @@ BuildRequires: openmpi-devel BuildRequires: pcre-devel BuildRequires: help2man - %description METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes, and producing fill reducing @@ -59,10 +62,8 @@ Header and library files of Metis. if [ %{__isa_bits} = "64" ]; then %patch2 -p0 fi - %patch4 -p0 - %build # Build metis @@ -79,13 +80,13 @@ cd build -DSHARED=1 \ -DOPENMP=%{_includedir}/openmpi-%{_arch} \ -DPCRE=%{_includedir} \ - -DCMAKE_CXX_FLAGS="%{optflags} -fopenmp -pthread" -DCMAKE_C_FLAGS="%{optflags} -fopenmp -pthread" \ + -DCMAKE_CXX_FLAGS="%{optflags} -Wl,-z,now -fopenmp -pthread" \ + -DCMAKE_C_FLAGS="%{optflags} -Wl,-z,now -fopenmp -pthread" \ -DCMAKE_VERBOSE_MAKEFILE=1 \ -DCMAKE_INSTALL_PREFIX=%{_prefix} .. make %{?_smp_mflags} cd ../ - %check cp -p %{buildroot}%{_bindir}/* graphs pushd graphs @@ -107,7 +108,6 @@ help2man --version-option="%{version}" -n "Partitions a graph into a specified n -N --output="gpmetis.1" -h -help %{buildroot}%{_bindir}/gpmetis ## Can't get manpage from ndmetis. Use 'ndmetis -h' command - LD_PRELOAD=%{buildroot}%{_libdir}/lib%{name}.so.0 \ help2man --version-option="%{version}" -n "Partitions a mesh into a specified number of parts." \ -N --output="mpmetis.1" -h -help %{buildroot}%{_bindir}/mpmetis @@ -117,7 +117,6 @@ help2man --version-option="%{version}" -n "Converts a mesh into a graph that is -N --output="m2gmetis.1" -h -help %{buildroot}%{_bindir}/m2gmetis %else - LD_PRELOAD=%{buildroot}%{_libdir}/lib%{name}.so.0 \ help2man --version-string="%{version}" -n "Partitions a graph into a specified number of parts." \ -N --output="gpmetis.1" --no-discard-stderr --help-option="-help" %{buildroot}%{_bindir}/gpmetis @@ -134,24 +133,19 @@ help2man --version-string="%{version}" -n "Partitions a mesh into a specified nu LD_PRELOAD=%{buildroot}%{_libdir}/lib%{name}.so.0 \ help2man --version-string="%{version}" -n "Converts a mesh into a graph that is compatible with METIS." \ -N --output="m2gmetis.1" --no-discard-stderr -h "-help" %{buildroot}%{_bindir}/m2gmetis - %endif mkdir -p %{buildroot}%{_mandir}/man1 mv *.1 %{buildroot}%{_mandir}/man1 popd - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files +%{!?_licensedir:%global license %doc} %doc Changelog manual/manual.pdf -%if 0%{?fedora} %license LICENSE.txt -%else -%doc LICENSE.txt -%endif %{_bindir}/* %{_mandir}/man1/*.1.gz %{_libdir}/lib%{name}.so.* @@ -162,6 +156,10 @@ popd %{_libdir}/lib%{name}.so %changelog +* Thu Oct 29 2015 Antonio Trande - 5.1.0-7 +- Rebuild for cmake 3.4.0 +- Hardened builds on - 5.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild