Compare commits

..

No commits in common. 'i9ce' and 'c8' have entirely different histories.
i9ce ... c8

@ -1 +1 @@
4722c647024271540f2adcf83456ebdeb1b7d6a6 SOURCES/metis-5.1.0.tar.gz 4722c647024271540f2adcf83456ebdeb1b7d6a6 SOURCES/metis-5.1.0.tar.gz

@ -1,22 +0,0 @@
--- GKlib/GKlib.orig.h 2013-03-30 17:24:45.000000000 +0100
+++ GKlib/GKlib.h 2019-02-05 14:45:44.051629682 +0100
@@ -43,7 +43,7 @@
#include <sys/stat.h>
#if defined(__WITHPCRE__)
- #include <pcreposix.h>
+ #include <pcre2posix.h>
#else
#if defined(USE_GKREGEX)
#include "gkregex.h"
--- GKlib/test/Makefile.in.orig.old 2013-03-30 17:24:45.000000000 +0100
+++ GKlib/test/Makefile.in.old 2019-02-05 15:04:35.009847901 +0100
@@ -196,7 +196,7 @@
#Libraries needed for linking
LIBSDIR = -L$(BUILDDIR) -L$(GKLIBBUILDDIR) -L$(HOME)/local/lib
- LIBS = -lGKlib -lpcreposix -lpcre -lz -lm
+ LIBS = -lGKlib -lpcre2-posix -lz -lm
# Standard file extensions
OBJEXT = .o

@ -1,4 +1,10 @@
%undefine _ld_as_needed %if 0%{?fedora} <= 22
%global _hardened_build 1
%endif
%if 0%{?rhel} < 7
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64 %if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64
%global arch64 1 %global arch64 1
@ -8,9 +14,10 @@
Name: metis Name: metis
Version: 5.1.0 Version: 5.1.0
Release: 32%{?dist} Release: 17%{?dist}
Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering
License: ASL 2.0 and BSD and LGPLv2+ License: ASL 2.0 and BSD and LGPLv2+
Group: Development/Libraries
URL: http://glaros.dtc.umn.edu/gkhome/views/%{name} URL: http://glaros.dtc.umn.edu/gkhome/views/%{name}
Source0: http://glaros.dtc.umn.edu/gkhome/fetch/sw/%{name}/%{name}-%{version}.tar.gz Source0: http://glaros.dtc.umn.edu/gkhome/fetch/sw/%{name}/%{name}-%{version}.tar.gz
@ -34,15 +41,8 @@ Patch3: %{name}-GKREGEX-GKRAND-LIBSUFFIX-fix.patch
## Rename library of 64 integer version ## Rename library of 64 integer version
Patch4: %{name}_lib64.patch Patch4: %{name}_lib64.patch
Patch5: %{name}-pcre2.patch BuildRequires: cmake
BuildRequires: make
BuildRequires: cmake3, gcc, gcc-c++
%if 0%{?rhel} && 0%{?rhel} < 9
BuildRequires: pcre-devel BuildRequires: pcre-devel
%else
BuildRequires: pcre2-devel
%endif
BuildRequires: help2man BuildRequires: help2man
BuildRequires: chrpath BuildRequires: chrpath
@ -56,14 +56,16 @@ partitioning schemes developed in our lab.
METIS is distributed with OpenMP support. METIS is distributed with OpenMP support.
%package devel %package devel
Summary: METIS headers and development-related files Summary: The OpenMP Metis headers and development-related files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
Header and library files of Metis. Header and library files of Metis, OpenMP version.
%if 0%{?arch64} %if 0%{?arch64}
%package -n metis64 %package -n metis64
Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering (64bit INTEGER) Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering (64bit INTEGER)
Group: System Environment/Libraries
%description -n metis64 %description -n metis64
METIS is a set of serial programs for partitioning graphs, METIS is a set of serial programs for partitioning graphs,
@ -76,7 +78,8 @@ METIS is distributed with OpenMP support.
This build has 64bit INTEGER support. This build has 64bit INTEGER support.
%package -n metis64-devel %package -n metis64-devel
Summary: METIS development libraries (64bit INTEGER) Summary: LAPACK development libraries (64bit INTEGER)
Group: Development/Libraries
Requires: metis64%{?_isa} = %{version}-%{release} Requires: metis64%{?_isa} = %{version}-%{release}
%description -n metis64-devel %description -n metis64-devel
@ -86,12 +89,11 @@ OpenMP version (64bit INTEGER).
%prep %prep
%setup -qc %setup -qc
pushd %{name}-%{version} pushd %{name}-%{version}
%patch0 -p0 %patch0 -p0
%patch1 -p0 %patch1 -p0
%patch3 -p0 %patch3 -p0
%patch5 -p0
## Remove default compiler flag ## Remove default compiler flag
sed -e 's|-O3||g' -i GKlib/GKlibSystem.cmake sed -e 's|-O3||g' -i GKlib/GKlibSystem.cmake
@ -102,47 +104,41 @@ cp -a %{name}-%{version} metis64
%endif %endif
%build %build
%if 0%{?rhel} && 0%{?rhel} < 9 pushd %{name}-%{version}/build
PCRE_LDFLAGS="-lpcreposix" export CC=gcc
%else %cmake \
PCRE_LDFLAGS="-lpcre2-posix" -DGKLIB_PATH=../GKlib \
%endif
%cmake3 -S %{name}-%{version} -B %{name}-%{version}/build \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DGKLIB_PATH=%{name}-%{version}/GKlib \
-DSHARED:BOOL=TRUE \ -DSHARED:BOOL=TRUE \
-DOPENMP:BOOL=ON \ -DOPENMP:BOOL=ON \
-DPCRE:BOOL=ON \ -DPCRE:BOOL=ON \
-DCMAKE_C_FLAGS:STRING="%{optflags} -pthread" \ -DCMAKE_C_FLAGS:STRING="%{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -pthread" \
-DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -fPIC -pie -Wl,-z,now" \
-DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -fPIC -pie -Wl,-z,now" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} ..
%make_build -C %{name}-%{version}/build make %{?_smp_mflags}
popd
%if 0%{?arch64} %if 0%{?arch64}
cd metis64 cd metis64
patch -p0 < %{PATCH2} patch -p0 < %{PATCH2}
patch -p0 < %{PATCH4} patch -p0 < %{PATCH4}
cd .. mkdir -p build64
mkdir -p metis64/build64 pushd build64
%if 0%{?rhel} && 0%{?rhel} < 9 export CC=gcc
PCRE_LDFLAGS="-lpcreposix" %cmake \
%else -DGKLIB_PATH=../GKlib \
PCRE_LDFLAGS="-lpcre2-posix"
%endif
%cmake3 -S metis64 -B metis64/build64 \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DGKLIB_PATH=metis64/GKlib \
-DSHARED:BOOL=TRUE \ -DSHARED:BOOL=TRUE \
-DOPENMP:BOOL=ON \ -DOPENMP:BOOL=ON \
-DPCRE:BOOL=ON \ -DPCRE:BOOL=ON \
-DCMAKE_C_FLAGS:STRING="%{optflags} -pthread" \ -DCMAKE_C_FLAGS:STRING="%{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -pthread" \
-DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -fPIC -pie -Wl,-z,now" \
-DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -fPIC -pie -Wl,-z,now" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .. -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} ..
%make_build -C metis64/build64 make %{?_smp_mflags}
popd
cd ../
%endif %endif
%install %install
@ -221,7 +217,14 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./graphchk64 4elt.graph
%endif %endif
popd popd
%ldconfig_scriptlets
%if 0%{?arch64}
%ldconfig_scriptlets -n metis64
%endif
%files %files
%{!?_licensedir:%global license %doc}
%doc %{name}-%{version}/Changelog %{name}-%{version}/manual/manual.pdf %doc %{name}-%{version}/Changelog %{name}-%{version}/manual/manual.pdf
%license %{name}-%{version}/LICENSE.txt %license %{name}-%{version}/LICENSE.txt
%{_bindir}/cmpfillin %{_bindir}/cmpfillin
@ -229,7 +232,6 @@ popd
%{_bindir}/graphchk %{_bindir}/graphchk
%{_bindir}/m2gmetis %{_bindir}/m2gmetis
%{_bindir}/mpmetis %{_bindir}/mpmetis
%{_bindir}/ndmetis %{_bindir}/ndmetis
%{_mandir}/man1/*.1.gz %{_mandir}/man1/*.1.gz
%{_libdir}/lib%{name}.so.* %{_libdir}/lib%{name}.so.*
@ -240,6 +242,7 @@ popd
%if 0%{?arch64} %if 0%{?arch64}
%files -n metis64 %files -n metis64
%{!?_licensedir:%global license %doc}
%doc metis64/Changelog metis64/manual/manual.pdf %doc metis64/Changelog metis64/manual/manual.pdf
%license metis64/LICENSE.txt %license metis64/LICENSE.txt
%{_bindir}/cmpfillin64 %{_bindir}/cmpfillin64
@ -256,55 +259,6 @@ popd
%endif %endif
%changelog %changelog
* Mon Apr 01 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 5.1.0-32
- Rebuilt for MSVSphere 9.3
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jul 14 2021 Petr Pisar <ppisar@redhat.com> - 5.1.0-30
- Rebuild against pcre2-10.37 (bug #1965025)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Jan 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 5.1.0-28
- Change CMake options
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-27
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 17 2020 Merlin Mathesius <mmathesi@redhat.com> - 5.1.0-25
- Minor conditional fixes for ELN
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jan 25 2020 Antonio Trande <sagitter@fedoraproject.org> - 5.1.0-23
- Remove old conditions
* Thu Oct 24 2019 Antonio Trande <sagitter@fedoraproject.org> - 5.1.0-22
- Fix descriptions
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sun Nov 04 2018 Antonio Trande <sagitter@fedoraproject.org> - 5.1.0-19
- Some minor changes
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Feb 17 2018 Antonio Trande <sagitter@fedoraproject.org> - 5.1.0-17 * Sat Feb 17 2018 Antonio Trande <sagitter@fedoraproject.org> - 5.1.0-17
- Use %%ldconfig_scriptlets - Use %%ldconfig_scriptlets

Loading…
Cancel
Save