From ffca803a992cbe3c6e89a811072a242c239911e4 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 15 Jul 2023 06:50:57 -0700 Subject: [PATCH] Remove duplicated installed binaries --- .libomp.metadata | 4 ++++ libomp.spec | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .libomp.metadata diff --git a/.libomp.metadata b/.libomp.metadata new file mode 100644 index 0000000..4ba3ef9 --- /dev/null +++ b/.libomp.metadata @@ -0,0 +1,4 @@ +245926aec76c80db47bed9c1a0c046df3d43ccdf openmp-16.0.6.src.tar.xz +b70bc22476df13ca634d73bc20e783e7c0c19997 openmp-16.0.6.src.tar.xz.sig +0de534cfef38697e115c3ae80634765f05e78e5b cmake-16.0.6.src.tar.xz +2db5c88fe9277bb0fa85f49b58e946e49ff235c2 cmake-16.0.6.src.tar.xz.sig diff --git a/libomp.spec b/libomp.spec index c7ac625..e5e0fbb 100644 --- a/libomp.spec +++ b/libomp.spec @@ -19,7 +19,7 @@ Name: libomp Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: OpenMP runtime for clang License: NCSA @@ -129,10 +129,13 @@ cd %{_vpath_builddir} %global lit_cfg %{libomp_testdir}/%{_arch}.site.cfg.py %global lit_fedora_cfg %{_datadir}/libomp/lit.fedora.cfg.py +# Install test files +cd .. install -d %{buildroot}%{libomp_srcdir}/runtime cp -R runtime/test %{buildroot}%{libomp_srcdir}/runtime cp -R runtime/src %{buildroot}%{libomp_srcdir}/runtime +cd %{_vpath_builddir} # Generate lit config files. Strip off the last line that initiates the # test run, so we can customize the configuration. head -n -1 runtime/test/lit.site.cfg >> %{buildroot}%{lit_cfg} @@ -147,6 +150,7 @@ echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> %{buildroot}%{lit_ install -d %{buildroot}%{_libexecdir}/tests/libomp install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/libomp + %endif # Remove static libraries with equivalent shared libraries @@ -203,6 +207,9 @@ cd %{_vpath_builddir} %endif %changelog +* Sat Jul 15 2023 Tom Stellard - 16.0.6-3 +- Remove duplicated installed binaries + * Wed Jul 05 2023 Tom Stellard - 16.0.6-2 - Add explict libomp requres to libomp-devel