Sync with upstream branch
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
commit
c45c3157af
GPG Key ID:
7A5F42FAF91FACC3
89
cmake.spec
89
cmake.spec
@ -68,14 +68,14 @@
|
||||
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
|
||||
|
||||
%global major_version 3
|
||||
%global minor_version 27
|
||||
%global patch_version 7
|
||||
%global minor_version 28
|
||||
%global patch_version 3
|
||||
|
||||
# For handling bump release by rpmdev-bumpspec and mass rebuild
|
||||
%global baserelease 1
|
||||
%global baserelease 5
|
||||
|
||||
# Set to RC version if building RC, else comment out.
|
||||
#global rcsuf rc1
|
||||
#%%global rcsuf rc3
|
||||
|
||||
%if 0%{?rcsuf:1}
|
||||
%global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf}
|
||||
@ -91,7 +91,7 @@
|
||||
|
||||
Name: %{orig_name}%{?name_suffix}
|
||||
Version: %{pkg_version}
|
||||
Release: %{baserelease}.1.riscv64%{?dist}
|
||||
Release: %{baserelease}%{?dist}
|
||||
Summary: Cross-platform make system
|
||||
|
||||
# most sources are BSD
|
||||
@ -288,6 +288,17 @@ BuildArch: noarch
|
||||
This package contains common RPM macros for %{name}.
|
||||
|
||||
|
||||
%package -n python3-cmake
|
||||
Summary: Python metadata for packages depending on %{name}
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n python3-cmake
|
||||
Package provides metadata for Python packages depending on cmake.
|
||||
This is to make automatic dependency resolution work. The package is NOT
|
||||
using anything from the PyPI package called cmake.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{orig_name}-%{tar_version} -p 1
|
||||
|
||||
@ -339,6 +350,21 @@ $SRCDIR/bootstrap --prefix=%{_prefix} \
|
||||
popd
|
||||
%make_build -C %{_vpath_builddir}
|
||||
|
||||
# Provide Python metadata
|
||||
%global cmake_distinfo cmake-%{major_version}.%{minor_version}.%{patch_version}%{?rcsuf}.dist-info
|
||||
mkdir %{cmake_distinfo}
|
||||
cat > %{cmake_distinfo}/METADATA << EOF
|
||||
Metadata-Version: 2.1
|
||||
Name: cmake
|
||||
Version: %{major_version}.%{minor_version}.%{patch_version}%{?rcsuf}
|
||||
Summary: %{summary}
|
||||
Description-Content-Type: text/plain
|
||||
|
||||
Metadata only package for automatic dependency resolution in the RPM
|
||||
ecosystem. This package is separate from the PyPI package called cmake.
|
||||
EOF
|
||||
echo rpm > %{cmake_distinfo}/INSTALLER
|
||||
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{_pkgdocdir}
|
||||
@ -453,6 +479,10 @@ find %{buildroot}%{_libdir}/%{orig_name} -type f | \
|
||||
find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
|
||||
sed -e '/.*-gui$/d' -e '/^$/d' -e 's!^%{buildroot}!"!g' -e 's!$!"!g' >> lib_files.mf
|
||||
|
||||
# Install Python metadata
|
||||
mkdir -p %{buildroot}%{python3_sitelib}
|
||||
cp -a %{cmake_distinfo} %{buildroot}%{python3_sitelib}
|
||||
|
||||
|
||||
%if %{with test}
|
||||
%check
|
||||
@ -548,12 +578,51 @@ popd
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 15 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.27.7-1.1.riscv64
|
||||
- Enable tests again
|
||||
%files -n python3-cmake
|
||||
%{python3_sitelib}/%{cmake_distinfo}
|
||||
|
||||
* Wed Nov 15 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.27.7-1.0.riscv64
|
||||
- Disable tests on riscv64 for now
|
||||
|
||||
%changelog
|
||||
* Wed May 15 2024 Sandro <devel@penguinpee.nl> - 3.28.3-5
|
||||
- Add python3-cmake sub package providing metadata for Python packages
|
||||
depending on CMake to facilitate automatic dependency resolution.
|
||||
|
||||
* Tue Apr 23 2024 Orion Poplawski <orion@nwra.com> - 3.28.3-4
|
||||
- Build with gui again
|
||||
|
||||
* Tue Apr 23 2024 Orion Poplawski <orion@nwra.com> - 3.28.3-3
|
||||
- Rebuild for rhash 1.4.4 soname bump
|
||||
- Build without gui to avoid circular dep on self
|
||||
|
||||
* Wed Mar 06 2024 David Abdurachmanov <davidlt@rivosinc.com> - 3.28.3-2
|
||||
- Disable another timeout test on riscv64
|
||||
|
||||
* Tue Feb 27 2024 Orion Poplawski <orion@nwra.com> - 3.28.3-1
|
||||
- Update to 3.28.3 (should fix bz#2261013)
|
||||
|
||||
* Thu Feb 01 2024 Frantisek Zatloukal <fzatlouk@redhat.com> - 3.28.2-1
|
||||
- cmake-3.28.2 (fixes RHBZ#2261037 and RHBZ#2243343)
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0~rc3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0~rc3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Nov 23 2023 Florian Weimer <fweimer@redhat.com> - 3.28.0~rc3-2
|
||||
- Improve C compatibility of LoadCommand tests
|
||||
|
||||
* Tue Oct 24 2023 Björn Esser <besser82@fedoraproject.org> - 3.28.0~rc3-1
|
||||
- cmake-3.28.0-rc3
|
||||
Fixes rhbz#2243343
|
||||
|
||||
* Thu Oct 19 2023 Björn Esser <besser82@fedoraproject.org> - 3.28.0~rc2-1
|
||||
- cmake-3.28.0-rc2
|
||||
Fixes rhbz#2243343
|
||||
|
||||
* Thu Oct 12 2023 Björn Esser <besser82@fedoraproject.org> - 3.28.0~rc1-1
|
||||
- cmake-3.28.0-rc1
|
||||
Fixes rhbz#2243343
|
||||
|
||||
* Sat Oct 07 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.7-1
|
||||
- cmake-3.27.7
|
||||
|
||||
@ -44,7 +44,13 @@
|
||||
DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
|
||||
|
||||
%ctest(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \
|
||||
%__ctest --test-dir "%{__cmake_builddir}" --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**}
|
||||
%__ctest --test-dir "%{__cmake_builddir}" \\\
|
||||
--output-on-failure \\\
|
||||
--force-new-ctest-process \\\
|
||||
%ifarch riscv64 \
|
||||
--timeout 6000 \\\
|
||||
%endif \
|
||||
%{?_smp_mflags} %{**}
|
||||
|
||||
|
||||
%cmake@@CMAKE_MAJOR_VERSION@@ %cmake
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cmake-3.27.7.tar.gz) = 2e9b83dee8f8c012be4219ab74ebaa8b8438ea55d5204237a1c9feba94c732afe7baceddb9c681672903112b1e40f7b1a86b284cfceed15f46ce8f90143dbb86
|
||||
SHA512 (cmake-3.28.3.tar.gz) = 66e923925b764e1fe3d150c69dab3e0abd9e0c90d8e30cab63c3a1f70c3e37df0a5e3ff12b378eeae3bdc6608495f41399e6f81602e26b513b19fa19ff6c48fc
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user