From f83b51f9f30fe453bb9a2ec387b259bd82e9a560 Mon Sep 17 00:00:00 2001 From: Aninda Date: Fri, 3 Jan 2025 19:51:57 +0000 Subject: [PATCH 1/2] Upgraded metis to version 5.1.0.3 --- .../metis-GKREGEX-GKRAND-LIBSUFFIX-fix.patch | 8 +- SPECS-EXTENDED/metis/metis-libmetis.patch | 19 +- SPECS-EXTENDED/metis/metis-pcre2.patch | 8 +- SPECS-EXTENDED/metis/metis-shared-GKlib.patch | 18 +- .../metis/metis-width-datatype.patch | 12 - SPECS-EXTENDED/metis/metis.signatures.json | 4 +- SPECS-EXTENDED/metis/metis.spec | 372 ++++++++++-------- SPECS-EXTENDED/metis/metis_lib64.patch | 62 +-- cgmanifest.json | 4 +- 9 files changed, 277 insertions(+), 230 deletions(-) delete mode 100644 SPECS-EXTENDED/metis/metis-width-datatype.patch diff --git a/SPECS-EXTENDED/metis/metis-GKREGEX-GKRAND-LIBSUFFIX-fix.patch b/SPECS-EXTENDED/metis/metis-GKREGEX-GKRAND-LIBSUFFIX-fix.patch index 24c59c4db48..37ac80aaf9c 100644 --- a/SPECS-EXTENDED/metis/metis-GKREGEX-GKRAND-LIBSUFFIX-fix.patch +++ b/SPECS-EXTENDED/metis/metis-GKREGEX-GKRAND-LIBSUFFIX-fix.patch @@ -1,5 +1,5 @@ ---- GKlib/Makefile.orig 2013-03-11 20:50:42.000000000 +0100 -+++ GKlib/Makefile 2013-03-17 14:26:23.632867727 +0100 +--- src/GKlib/Makefile.orig 2013-03-11 20:50:42.000000000 +0100 ++++ src/GKlib/Makefile 2013-03-17 14:26:23.632867727 +0100 @@ -41,10 +41,10 @@ CONFIG_FLAGS += -DPCRE=$(pcre) endif @@ -14,8 +14,8 @@ ifneq ($(prefix), not-set) CONFIG_FLAGS += -DCMAKE_INSTALL_PREFIX=$(prefix) ---- Makefile.origin 2013-03-30 17:24:45.000000000 +0100 -+++ Makefile 2013-04-14 20:04:38.887674462 +0200 +--- src/Makefile.origin 2013-03-30 17:24:45.000000000 +0100 ++++ src/Makefile 2013-04-14 20:04:38.887674462 +0200 @@ -9,6 +9,11 @@ gklib_path = not-set shared = not-set diff --git a/SPECS-EXTENDED/metis/metis-libmetis.patch b/SPECS-EXTENDED/metis/metis-libmetis.patch index 919812dc309..fd2af4de8a0 100644 --- a/SPECS-EXTENDED/metis/metis-libmetis.patch +++ b/SPECS-EXTENDED/metis/metis-libmetis.patch @@ -1,20 +1,15 @@ ---- libmetis/CMakeLists.orig.txt 2011-06-22 19:47:13.000000000 +0200 -+++ libmetis/CMakeLists.txt 2013-03-15 17:13:19.948911972 +0100 -@@ -4,13 +4,14 @@ - file(GLOB metis_sources *.c) - # Build libmetis. - add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) +--- src/libmetis/CMakeLists.orig.txt 2011-06-22 19:47:13.000000000 +0200 ++++ src/libmetis/CMakeLists.txt 2013-03-15 17:13:19.948911972 +0100 +@@ -8,8 +8,9 @@ + PRIVATE ${PROJECT_SOURCE_DIR}/src/GKlib ${PROJECT_BINARY_DIR}/src/include + ) + target_link_libraries(metis PRIVATE $<$:m>) +set_target_properties(metis PROPERTIES SOVERSION 0) - if(UNIX) - target_link_libraries(metis m) - endif() - if(METIS_INSTALL) - install(TARGETS metis + install(TARGETS metis - LIBRARY DESTINATION lib - RUNTIME DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) - endif() diff --git a/SPECS-EXTENDED/metis/metis-pcre2.patch b/SPECS-EXTENDED/metis/metis-pcre2.patch index d618ea2ec74..04748f50364 100644 --- a/SPECS-EXTENDED/metis/metis-pcre2.patch +++ b/SPECS-EXTENDED/metis/metis-pcre2.patch @@ -1,5 +1,5 @@ ---- GKlib/GKlib.orig.h 2013-03-30 17:24:45.000000000 +0100 -+++ GKlib/GKlib.h 2019-02-05 14:45:44.051629682 +0100 +--- src/GKlib/GKlib.orig.h 2013-03-30 17:24:45.000000000 +0100 ++++ src/GKlib/GKlib.h 2019-02-05 14:45:44.051629682 +0100 @@ -43,7 +43,7 @@ #include @@ -9,8 +9,8 @@ #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 +--- src/GKlib/test/Makefile.in.orig.old 2013-03-30 17:24:45.000000000 +0100 ++++ src/GKlib/test/Makefile.in.old 2019-02-05 15:04:35.009847901 +0100 @@ -196,7 +196,7 @@ #Libraries needed for linking diff --git a/SPECS-EXTENDED/metis/metis-shared-GKlib.patch b/SPECS-EXTENDED/metis/metis-shared-GKlib.patch index acfa59e60bd..ae38f407139 100644 --- a/SPECS-EXTENDED/metis/metis-shared-GKlib.patch +++ b/SPECS-EXTENDED/metis/metis-shared-GKlib.patch @@ -1,16 +1,16 @@ ---- GKlib/CMakeLists.orig.txt 2013-03-11 20:50:14.000000000 +0100 -+++ GKlib/CMakeLists.txt 2013-03-17 19:53:44.220827579 +0100 -@@ -7,7 +7,7 @@ +--- src/GKlib/CMakeLists.orig.txt 2013-03-11 20:50:14.000000000 +0100 ++++ src/GKlib/CMakeLists.txt 2013-03-17 19:53:44.220827579 +0100 +@@ -6,7 +6,7 @@ + unset(abs) include(GKlibSystem.cmake) - include_directories(".") -add_library(GKlib STATIC ${GKlib_sources}) +add_library(GKlib SHARED ${GKlib_sources}) - if(UNIX) - target_link_libraries(GKlib m) - endif(UNIX) -@@ -16,6 +16,6 @@ - add_subdirectory("test") + target_link_libraries(GKlib PRIVATE $<$:m>) + target_include_directories(GKlib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) + +@@ -15,6 +15,6 @@ + endif() install(TARGETS GKlib - ARCHIVE DESTINATION lib diff --git a/SPECS-EXTENDED/metis/metis-width-datatype.patch b/SPECS-EXTENDED/metis/metis-width-datatype.patch deleted file mode 100644 index f583d05f34d..00000000000 --- a/SPECS-EXTENDED/metis/metis-width-datatype.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- include/metis.orig.h 2013-03-11 20:50:00.000000000 +0100 -+++ include/metis.h 2013-03-16 12:14:59.117329640 +0100 -@@ -30,7 +30,7 @@ - GCC does provides these definitions in stdint.h, but it may require some - modifications on other architectures. - --------------------------------------------------------------------------*/ --#define IDXTYPEWIDTH 32 -+#define IDXTYPEWIDTH 64 - - - /*-------------------------------------------------------------------------- - diff --git a/SPECS-EXTENDED/metis/metis.signatures.json b/SPECS-EXTENDED/metis/metis.signatures.json index 43f8dc00b37..1aee96cdbe2 100644 --- a/SPECS-EXTENDED/metis/metis.signatures.json +++ b/SPECS-EXTENDED/metis/metis.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "metis-5.1.0.tar.gz": "76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2" + "METIS-5.1.0.3.tar.gz": "c860b393f61ef017f288692b00fd26eec2d3fdbc7a2bb3bed8b0f01e836e53cf" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/metis/metis.spec b/SPECS-EXTENDED/metis/metis.spec index 070a812f62f..124f6210a29 100644 --- a/SPECS-EXTENDED/metis/metis.spec +++ b/SPECS-EXTENDED/metis/metis.spec @@ -7,14 +7,14 @@ %endif Name: metis -Version: 5.1.0 -Release: 25%{?dist} +Version: 5.1.0.3 +Release: 7%{?dist} Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering -License: ASL 2.0 and BSD and LGPLv2+ +License: Apache-2.0 Vendor: Microsoft Corporation Distribution: Azure Linux URL: http://glaros.dtc.umn.edu/gkhome/views/%{name} -Source0: http://glaros.dtc.umn.edu/gkhome/fetch/sw/%{name}/%{name}-%{version}.tar.gz +Source0: https://github.com/scivision/METIS/archive/refs/tags/v%{version}/METIS-%{version}.tar.gz ## This patch sets up libmetis soname of libmetis Patch0: %{name}-libmetis.patch @@ -22,14 +22,6 @@ Patch0: %{name}-libmetis.patch ## This patch sets up shared GKlib library Patch1: %{name}-shared-GKlib.patch -## Specify the width (32 or 64 bits) of the elementary data type -## used in METIS. This is controled by the IDXTYPEWIDTH -## constant. -## For now, on a 32 bit architecture you can only specify a width of 32, -## whereas for a 64 bit architecture you can specify a width of either -## 32 or 64 bits. -Patch2: %{name}-width-datatype.patch - ## This patch sets up GKREGEX, GKRAND, libsuffix options to the Makefiles Patch3: %{name}-GKREGEX-GKRAND-LIBSUFFIX-fix.patch @@ -38,14 +30,16 @@ Patch4: %{name}_lib64.patch Patch5: %{name}-pcre2.patch -BuildRequires: cmake3, gcc, gcc-c++ -%if 0%{?rhel} +BuildRequires: make +BuildRequires: cmake, gcc, gcc-c++ +%if 0%{?rhel} && 0%{?rhel} < 9 BuildRequires: pcre-devel %else BuildRequires: pcre2-devel %endif BuildRequires: help2man BuildRequires: chrpath +#BuildRequires: GKlib-devel %description METIS is a set of serial programs for partitioning graphs, @@ -88,30 +82,33 @@ OpenMP version (64bit INTEGER). %prep %setup -qc -pushd %{name}-%{version} -%patch 0 -p0 -%patch 1 -p0 -%patch 3 -p0 -%patch 5 -p0 - -## Remove default compiler flag -sed -e 's|-O3||g' -i GKlib/GKlibSystem.cmake +pushd METIS-%{version} +rm -rf archive + +%patch -P 0 -p0 -b .backup +%patch -P 1 -p0 -b .backup +%patch -P 3 -p0 -b .backup +%patch -P 5 -p0 -b .backup popd %if 0%{?arch64} -cp -a %{name}-%{version} metis64 +cp -a METIS-%{version} metis64 +pushd metis64 +%patch -P 4 -p0 -b .backup +popd %endif %build -pushd %{name}-%{version}/build -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 PCRE_LDFLAGS="-lpcreposix" %else PCRE_LDFLAGS="-lpcre2-posix" %endif -%cmake3 \ +%cmake -S METIS-%{version} -B METIS-%{version} \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DGKLIB_PATH=../GKlib \ + -DGKLIB_PATH=METIS-%{version}/src//GKlib \ + -DGKRAND:BOOL=ON \ + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES\ -DSHARED:BOOL=TRUE \ -DOPENMP:BOOL=ON \ -DPCRE:BOOL=ON \ @@ -119,24 +116,21 @@ PCRE_LDFLAGS="-lpcre2-posix" -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .. -%make_build -popd + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} +%make_build -C METIS-%{version} %if 0%{?arch64} -cd metis64 -patch -p0 < %{PATCH2} -patch -p0 < %{PATCH4} -mkdir -p build64 -pushd build64 -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 PCRE_LDFLAGS="-lpcreposix" %else PCRE_LDFLAGS="-lpcre2-posix" %endif -%cmake3 \ +%cmake -S metis64 -B metis64 \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DGKLIB_PATH=../GKlib \ + -Dintsize:STRING=64 -Drealsize:STRING=64 \ + -DGKLIB_PATH=METIS-%{version}/src/GKlib \ + -DGKRAND:BOOL=ON \ + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES\ -DSHARED:BOOL=TRUE \ -DOPENMP:BOOL=ON \ -DPCRE:BOOL=ON \ @@ -144,32 +138,15 @@ PCRE_LDFLAGS="-lpcre2-posix" -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .. -%make_build -popd -cd ../ + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} +%make_build -C metis64 %endif %install -pushd %{name}-%{version}/build +pushd METIS-%{version} %make_install ## Generate manpages from binaries -%if 0%{?el6} -LD_PRELOAD=%{buildroot}%{_libdir}/lib%{name}.so.0 \ -help2man --version-option="%{version}" -n "Partitions a graph into a specified number of parts." \ - -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 - -LD_PRELOAD=%{buildroot}%{_libdir}/lib%{name}.so.0 \ -help2man --version-option="%{version}" -n "Converts a mesh into a graph that is compatible with METIS." \ - -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 @@ -186,7 +163,6 @@ 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 @@ -196,7 +172,7 @@ popd mv %{buildroot}%{_includedir}/metis.h %{buildroot}%{_includedir}/metis32.h %if 0%{?arch64} -pushd metis64/build64 +pushd metis64 %make_install # Save metis.h with IDXTYPEWIDTH = 64 mv %{buildroot}%{_includedir}/metis.h %{buildroot}%{_includedir}/metis64.h @@ -210,40 +186,42 @@ mv %{buildroot}%{_includedir}/metis32.h %{buildroot}%{_includedir}/metis.h chrpath -d %{buildroot}%{_bindir}/* %check -cp -p %{buildroot}%{_bindir}/* %{name}-%{version}/graphs -pushd %{name}-%{version}/graphs +cp -p %{buildroot}%{_bindir}/*metis METIS-%{version}/src/graphs/ +cp -p %{buildroot}%{_bindir}/graphchk METIS-%{version}/src/graphs/ +cd METIS-%{version}/src/graphs LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./ndmetis mdual.graph LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./mpmetis metis.mesh 2 LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./gpmetis test.mgraph 4 LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./gpmetis copter2.graph 4 LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./graphchk 4elt.graph +cd ../../ +%ctest -- --test-dir ./ +cd ../ %if 0%{?arch64} +cp -p %{buildroot}%{_bindir}/*metis64 metis64/src/graphs/ +cp -p %{buildroot}%{_bindir}/graphchk64 metis64/src/graphs/ +cd metis64/src/graphs LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./ndmetis64 mdual.graph LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./mpmetis64 metis.mesh 2 LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./gpmetis64 test.mgraph 4 LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./gpmetis64 copter2.graph 4 LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./graphchk64 4elt.graph -%endif -popd - -%ldconfig_scriptlets - -%if 0%{?arch64} -%ldconfig_scriptlets -n metis64 +cd ../../ +%ctest -- --test-dir ./ +cd ../ %endif %files -%doc %{name}-%{version}/Changelog %{name}-%{version}/manual/manual.pdf -%license %{name}-%{version}/LICENSE.txt +%doc METIS-%{version}/src/Changelog METIS-%{version}/src/manual/manual.pdf +%license METIS-%{version}/src/LICENSE.txt %{_bindir}/cmpfillin %{_bindir}/gpmetis %{_bindir}/graphchk %{_bindir}/m2gmetis %{_bindir}/mpmetis - %{_bindir}/ndmetis %{_mandir}/man1/*.1.gz -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.0 %files devel %{_includedir}/%{name}.h @@ -251,15 +229,15 @@ popd %if 0%{?arch64} %files -n metis64 -%doc metis64/Changelog metis64/manual/manual.pdf -%license metis64/LICENSE.txt +%doc metis64/src/Changelog metis64/src/manual/manual.pdf +%license metis64/src/LICENSE.txt %{_bindir}/cmpfillin64 %{_bindir}/gpmetis64 %{_bindir}/graphchk64 %{_bindir}/m2gmetis64 %{_bindir}/mpmetis64 %{_bindir}/ndmetis64 -%{_libdir}/lib%{name}64.so.* +%{_libdir}/lib%{name}64.so.0 %files -n metis64-devel %{_includedir}/%{name}64.h @@ -267,131 +245,203 @@ popd %endif %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 5.1.0-25 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Thu Jan 03 2025 Aninda Pradhan - 5.1.0.3-7 +- Initial Azure Linux import from Fedora 41 (license: MIT) +- License verified. + +* Thu Jul 18 2024 Fedora Release Engineering - 5.1.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 5.1.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 5.1.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Dec 17 2023 Antonio Trande - 5.1.0.3-3 +- Fix License tag + +* Thu Jul 20 2023 Fedora Release Engineering - 5.1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jul 16 2023 Antonio Trande - 5.1.0.3-1 +- Use modernized build system| New source code archive + +* Sun Jul 16 2023 Antonio Trande - 5.1.0-51 +- Renew SPEC file + +* Thu Jan 19 2023 Fedora Release Engineering - 5.1.0-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 5.1.0-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 5.1.0-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Wed Jan 29 2020 Fedora Release Engineering - 5.1.0-24 +* Thu Jul 22 2021 Fedora Release Engineering - 5.1.0-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 14 2021 Petr Písař - 5.1.0-46 +- Rebuild against pcre2-10.37 (bug #1965025) + +* Tue Jan 26 2021 Fedora Release Engineering - 5.1.0-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Jan 23 2021 Antonio T - 5.1.0-44 +- Change CMake options /4 + +* Sat Jan 23 2021 Antonio T - 5.1.0-43 +- Change CMake options /3 + +* Sat Jan 23 2021 Antonio T - 5.1.0-42 +- Change CMake options /2 + +* Sat Jan 23 2021 Antonio T - 5.1.0-41 +- Change CMake options + +* Fri Jan 08 2021 Tom Stellard - 5.1.0-40 +- Add BuildRequires: make + +* Tue Aug 04 2020 sagitter - 5.1.0-39 +- Enable __cmake_in_source_build + +* Sat Aug 01 2020 Fedora Release Engineering - 5.1.0-38 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 5.1.0-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 17 2020 Merlin Mathesius - 5.1.0-36 +- Minor conditional fixes for ELN + +* Wed Jan 29 2020 Fedora Release Engineering - 5.1.0-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Sat Jan 25 2020 Antonio Trande - 5.1.0-23 +* Sat Jan 25 2020 sagitter - 5.1.0-34 +- Fix BR packages + +* Sat Jan 25 2020 sagitter - 5.1.0-33 - Remove old conditions -* Thu Oct 24 2019 Antonio Trande - 5.1.0-22 +* Thu Oct 24 2019 sagitter - 5.1.0-32 - Fix descriptions -* Thu Jul 25 2019 Fedora Release Engineering - 5.1.0-21 +* Thu Jul 25 2019 Fedora Release Engineering - 5.1.0-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Fri Feb 01 2019 Fedora Release Engineering - 5.1.0-20 +* Tue Feb 05 2019 sagitter - 5.1.0-30 +- Disable as-needed flag again + +* Tue Feb 05 2019 sagitter - 5.1.0-29 +- Use pcre2 on Fedora 30+ + +* Tue Feb 05 2019 sagitter - 5.1.0-28 +- Disable as-needed linker flag + +* Fri Feb 01 2019 Fedora Release Engineering - 5.1.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Sun Nov 04 2018 Antonio Trande - 5.1.0-19 +* Mon Jan 28 2019 Igor Gnatenko - 5.1.0-26 +- Fix RHEL conditions + +* Sun Nov 04 2018 sagitter - 5.1.0-25 +- Another fix + +* Sun Nov 04 2018 sagitter - 5.1.0-24 +- Fix autosetup macro + +* Sun Nov 04 2018 sagitter - 5.1.0-23 - Some minor changes -* Fri Jul 13 2018 Fedora Release Engineering - 5.1.0-18 +* Sun Jul 15 2018 sagitter - 5.1.0-22 +- Add gcc-c++ as BR + +* Sun Jul 15 2018 sagitter - 5.1.0-21 +- Add gcc as BR + +* Fri Jul 13 2018 Fedora Release Engineering - 5.1.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Sat Feb 17 2018 Antonio Trande - 5.1.0-17 -- Use %%ldconfig_scriptlets +* Sat Feb 17 2018 sagitter - 5.1.0-19 +- Fix %%%%ldconfig_scriptlets for metis64 + +* Sat Feb 17 2018 sagitter - 5.1.0-18 +- Use %%%%ldconfig_scriptlets -* Thu Feb 08 2018 Fedora Release Engineering - 5.1.0-16 +* Thu Feb 08 2018 Fedora Release Engineering - 5.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Thu Aug 03 2017 Fedora Release Engineering - 5.1.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild +* Thu Aug 03 2017 Fedora Release Engineering - 5.1.0-16 +- Rebuilt for + https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild -* Wed Jul 26 2017 Fedora Release Engineering - 5.1.0-14 +* Wed Jul 26 2017 Fedora Release Engineering - 5.1.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -* Fri Feb 10 2017 Fedora Release Engineering - 5.1.0-13 +* Fri Feb 10 2017 Fedora Release Engineering - 5.1.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Mon Feb 15 2016 Antonio Trande - 5.1.0-12 +* Thu Feb 18 2016 sagitter - 5.1.0-13 - Build 64 integer version -* Thu Feb 04 2016 Fedora Release Engineering - 5.1.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Thu Feb 04 2016 Dennis Gilmore - 5.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Wed Jan 20 2016 Antonio Trande - 5.1.0-10 +* Wed Jan 20 2016 sagitter - 5.1.0-11 - Removed ExcludeArch -* Wed Jan 20 2016 Antonio Trande - 5.1.0-9 +* Wed Jan 20 2016 sagitter - 5.1.0-10 - Defined OpenMP support -- Some cleanups of the SPEC file -* Wed Dec 23 2015 Antonio Trande - 5.1.0-8 -- Used always 'cmake' command +* Wed Dec 23 2015 sagitter - 5.1.0-9 +- Used always 'cmake' compiler -* Thu Oct 29 2015 Antonio Trande - 5.1.0-7 +* Thu Oct 29 2015 sagitter - 5.1.0-8 - Rebuild for cmake 3.4.0 -- Hardened builds on - 5.1.0-6 +* Wed Jun 17 2015 Dennis Gilmore - 5.1.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Thu Jan 15 2015 Antonio Trande - 5.1.0-5 +* Fri Jan 16 2015 sagitter - 5.1.0-6 - Built on EPEL7 -- Used new macro %%license -* Sun Aug 17 2014 Fedora Release Engineering - 5.1.0-4 +* Sun Aug 17 2014 Peter Robinson - 5.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Sat Jun 07 2014 Fedora Release Engineering - 5.1.0-3 +* Sat Jun 07 2014 Dennis Gilmore - 5.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Sat Aug 03 2013 Fedora Release Engineering - 5.1.0-2 +* Sun Jan 19 2014 sagitter - 5.1.0-3 +- F21 rebuild + +* Sat Aug 03 2013 Dennis Gilmore - 5.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Sun Apr 14 2013 Antonio Trande - 5.1.0-1 -- Update to 5.1.0 - -* Sun Mar 31 2013 Antonio Trande - 5.0.3-10 -- Removed BR 'perl-Carp' (Bug 926996) -- Added LD_PRELOAD before help2man tasks to fix manpage shared_lib_error - -* Sun Mar 24 2013 Antonio Trande - 5.0.3-9 -- Added BR 'perl-Carp' for Fedora -- Excluded manpage creation for 'cmpfillin' and 'graphchk' commands - -* Wed Mar 20 2013 Antonio Trande - 5.0.3-8 -- Added BR cmake28 for EPEL6 building -- Set up of manpages creation in EPEL6 - -* Wed Mar 20 2013 Antonio Trande - 5.0.3-7 -- Removed explicit manpages compression -- License tag changed to 'ASL 2.0 and BSD and LGPLv2+' - -* Wed Mar 20 2013 Antonio Trande - 5.0.3-6 -- Modified %%check section to perform tests properly - -* Tue Mar 19 2013 Antonio Trande - 5.0.3-5 -- Added %%check section -- Removed GK*.h libraries installation - -* Sun Mar 17 2013 Antonio Trande - 5.0.3-4 -- Added patch to sets up GKREGEX, GKRAND, libsuffix options to the Makefiles -- Configured patch2 condition -- soname version of libmetis changed to 0 -- Added cmake options and flags to check openmp -- GKlib_includes destination changed to include/metis -- Added commands to generate binaries man-page -- Added BR openmpi-devel, pcre-devel, help2man - -* Fri Mar 15 2013 Antonio Trande - 5.0.3-3 -- Static sub-package removed -- TEMPORARY fix for files in "/usr/lib" removed -- Added patches for set up shared GKlib and soname libmetis -- Removed BR chrpath - -* Thu Mar 14 2013 Antonio Trande - 5.0.3-2 -- Initial release changed from 0 to 1 -- Removed chrpath command -- Added metis-width-datatype.patch only for 64bit systems -- Build commands completely changed to use %%cmake -- TEMPORARY fix for files in "/usr/lib" - -* Sat Mar 02 2013 Antonio Trande - 5.0.3-1 -- Initial package -- Removed chrpaths -- Added BR chrpath -- Removed exec permissions to silence spurious-executable-perm warning +* Sun Apr 14 2013 sagitter - 5.1.0-1 +- Update version + +* Sun Mar 31 2013 sagitter - 5.0.3-8 +- Initial import (#920518). + +* Sun Mar 24 2013 sagitter - 5.0.3-7 +- Initial import (#920518) + +* Sun Mar 24 2013 sagitter - 5.0.3-6 +- Initial import (#920518) + +* Sun Mar 24 2013 sagitter - 5.0.3-5 +- Initial import (#920518) + +* Sun Mar 24 2013 sagitter - 5.0.3-4 +- Initial import (#920518) + +* Sun Mar 24 2013 sagitter - 5.0.3-3 +- Initial import (#920518) + +* Sun Mar 24 2013 sagitter - 5.0.3-2 +- Initial import (#920518) + +* Thu Mar 21 2013 sagitter - 5.0.3-1 +- Initial import (#920518). \ No newline at end of file diff --git a/SPECS-EXTENDED/metis/metis_lib64.patch b/SPECS-EXTENDED/metis/metis_lib64.patch index 6c51a11fefc..57e9ba2e578 100644 --- a/SPECS-EXTENDED/metis/metis_lib64.patch +++ b/SPECS-EXTENDED/metis/metis_lib64.patch @@ -1,30 +1,43 @@ ---- libmetis/CMakeLists.orig.txt 2016-02-16 19:06:56.480139000 +0100 -+++ libmetis/CMakeLists.txt 2016-02-16 19:07:55.511134162 +0100 -@@ -3,14 +3,14 @@ +--- CMakeLists.orig.txt 2022-12-02 02:45:28.000000000 +0100 ++++ CMakeLists.txt 2023-07-16 19:59:20.618931313 +0200 +@@ -48,5 +48,5 @@ + add_subdirectory(src/libmetis) + add_subdirectory(src/programs) + +-add_test(NAME GraphCheck +-COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/src/tests/tiny_01.graph) ++add_test(NAME GraphCheck64 ++COMMAND $ ${CMAKE_CURRENT_SOURCE_DIR}/src/tests/tiny_01.graph) +--- src/libmetis/CMakeLists.orig.txt 2016-02-16 19:06:56.480139000 +0100 ++++ src/libmetis/CMakeLists.txt 2016-02-16 19:07:55.511134162 +0100 +@@ -1,16 +1,16 @@ # Find sources. file(GLOB metis_sources *.c) # Build libmetis. -add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) --set_target_properties(metis PROPERTIES SOVERSION 0) +-target_include_directories(metis PUBLIC +add_library(metis64 ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) ++target_include_directories(metis64 PUBLIC + $ + $ + PRIVATE ${PROJECT_SOURCE_DIR}/src/GKlib ${PROJECT_BINARY_DIR}/src/include + ) +-target_link_libraries(metis PRIVATE $<$:m>) +-set_target_properties(metis PROPERTIES SOVERSION 0) ++target_link_libraries(metis64 PRIVATE $<$:m>) +set_target_properties(metis64 PROPERTIES SOVERSION 0) - if(UNIX) -- target_link_libraries(metis m) -+ target_link_libraries(metis64 m) - endif() - if(METIS_INSTALL) -- install(TARGETS metis -+ install(TARGETS metis64 +-install(TARGETS metis ++install(TARGETS metis64 LIBRARY DESTINATION lib${LIB_SUFFIX} RUNTIME DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) ---- programs/CMakeLists.orig.txt 2013-03-30 17:24:45.000000000 +0100 -+++ programs/CMakeLists.txt 2016-02-16 22:42:18.625946692 +0100 -@@ -2,19 +2,19 @@ - include_directories(../libmetis) - link_directories(/home/karypis/local/lib) - # Build program. +--- src/programs/CMakeLists.orig.txt 2013-03-30 17:24:45.000000000 +0100 ++++ src/programs/CMakeLists.txt 2016-02-16 22:42:18.625946692 +0100 +@@ -11,14 +11,14 @@ + endif(Subversion_FOUND) + endif() + -add_executable(gpmetis gpmetis.c cmdline_gpmetis.c io.c stat.c) -add_executable(ndmetis ndmetis.c cmdline_ndmetis.c io.c smbfactor.c) -add_executable(mpmetis mpmetis.c cmdline_mpmetis.c io.c stat.c) @@ -32,7 +45,7 @@ -add_executable(graphchk graphchk.c io.c) -add_executable(cmpfillin cmpfillin.c io.c smbfactor.c) -foreach(prog gpmetis ndmetis mpmetis m2gmetis graphchk cmpfillin) -- target_link_libraries(${prog} metis) +- target_link_libraries(${prog} PRIVATE metis) +add_executable(gpmetis64 gpmetis.c cmdline_gpmetis.c io.c stat.c) +add_executable(ndmetis64 ndmetis.c cmdline_ndmetis.c io.c smbfactor.c) +add_executable(mpmetis64 mpmetis.c cmdline_mpmetis.c io.c stat.c) @@ -40,13 +53,14 @@ +add_executable(graphchk64 graphchk.c io.c) +add_executable(cmpfillin64 cmpfillin.c io.c smbfactor.c) +foreach(prog gpmetis64 ndmetis64 mpmetis64 m2gmetis64 graphchk64 cmpfillin64) -+ target_link_libraries(${prog} metis64) ++ target_link_libraries(${prog} PRIVATE metis64) + target_include_directories(${prog} PRIVATE + ${PROJECT_SOURCE_DIR}/src/GKlib + ${PROJECT_BINARY_DIR}/src/include +@@ -27,5 +27,5 @@ # target_link_libraries(${prog} metis profiler) endforeach(prog) - if(METIS_INSTALL) -- install(TARGETS gpmetis ndmetis mpmetis m2gmetis graphchk cmpfillin -+ install(TARGETS gpmetis64 ndmetis64 mpmetis64 m2gmetis64 graphchk64 cmpfillin64 +-install(TARGETS gpmetis ndmetis mpmetis m2gmetis graphchk cmpfillin ++install(TARGETS gpmetis64 ndmetis64 mpmetis64 m2gmetis64 graphchk64 cmpfillin64 RUNTIME DESTINATION bin) - endif() - diff --git a/cgmanifest.json b/cgmanifest.json index 0118e391adc..8c0d9f1b398 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -13041,8 +13041,8 @@ "type": "other", "other": { "name": "metis", - "version": "5.1.0", - "downloadUrl": "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz" + "version": "5.1.0.3", + "downloadUrl": "https://github.com/scivision/METIS/archive/refs/tags/v5.1.0.3/METIS-5.1.0.3.tar.gz" } } }, From 790df77f73fbdd644c4d361c9202b85fc7a18131 Mon Sep 17 00:00:00 2001 From: Aninda Date: Mon, 13 Jan 2025 20:23:24 +0000 Subject: [PATCH 2/2] Added newline at the ed of spec and signature file --- SPECS-EXTENDED/metis/metis.signatures.json | 2 +- SPECS-EXTENDED/metis/metis.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS-EXTENDED/metis/metis.signatures.json b/SPECS-EXTENDED/metis/metis.signatures.json index 1aee96cdbe2..101b7b10076 100644 --- a/SPECS-EXTENDED/metis/metis.signatures.json +++ b/SPECS-EXTENDED/metis/metis.signatures.json @@ -2,4 +2,4 @@ "Signatures": { "METIS-5.1.0.3.tar.gz": "c860b393f61ef017f288692b00fd26eec2d3fdbc7a2bb3bed8b0f01e836e53cf" } -} \ No newline at end of file +} diff --git a/SPECS-EXTENDED/metis/metis.spec b/SPECS-EXTENDED/metis/metis.spec index 124f6210a29..b423133ab05 100644 --- a/SPECS-EXTENDED/metis/metis.spec +++ b/SPECS-EXTENDED/metis/metis.spec @@ -444,4 +444,4 @@ cd ../ - Initial import (#920518) * Thu Mar 21 2013 sagitter - 5.0.3-1 -- Initial import (#920518). \ No newline at end of file +- Initial import (#920518).