linux-from-scratch/LFS-RPM
1
0
Fork 0
mirror of https://github.com/YellowJacketLinux/LFS.git synced 2025-01-23 14:32:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix CMake -> cmake

Browse Source
This commit is contained in:
Michael A. Peters 2023-05-18 07:04:05 -07:00
parent dbd0677b42
commit befab27f63
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
SPECS/cmake.spec
View File

@ -1,8 +1,8 @@
%global cmakev 3.26 %global cmakev 3.26
Name: CMake Name: cmake
Version: %{cmakev}.3 Version: %{cmakev}.3
Release: %{?repo}0.rc1%{?dist} Release: %{?repo}0.rc2%{?dist}
Summary: Tools to build and test software Summary: Tools to build and test software
Group: Development/Utilities Group: Development/Utilities
@ -10,29 +10,30 @@ License: BSD-3-Clause
URL: https://cmake.org/ URL: https://cmake.org/
Source0: https://github.com/Kitware/CMake/releases/download/v%{version}/cmake-%{version}.tar.gz Source0: https://github.com/Kitware/CMake/releases/download/v%{version}/cmake-%{version}.tar.gz
BuildRequires: expat-devel BuildRequires: pkgconfig(expat)
BuildRequires: gmp-devel BuildRequires: pkgconfig(gmp)
BuildRequires: libacl-devel BuildRequires: pkgconfig(gmpxx)
BuildRequires: libarchive-devel BuildRequires: pkgconfig(libacl)
BuildRequires: libattr-devel BuildRequires: pkgconfig(libarchive)
BuildRequires: pkgconfig(libattr)
BuildRequires: libbz2-devel BuildRequires: libbz2-devel
BuildRequires: libcurl-devel BuildRequires: pkgconfig(libcurl)
BuildRequires: libffi-devel BuildRequires: pkgconfig(libffi)
BuildRequires: libgnutls-devel BuildRequires: pkgconfig(gnutls)
BuildRequires: libhogweed-devel BuildRequires: pkgconfig(hogweed)
BuildRequires: liblzma-devel BuildRequires: pkgconfig(liblzma)
BuildRequires: libnettle-devel BuildRequires: pkgconfig(nettle)
BuildRequires: libp11-kit-devel BuildRequires: pkgconfig(p11-kit-1)
BuildRequires: libressl-devel BuildRequires: libressl-devel
BuildRequires: libstdc++-devel BuildRequires: libstdc++-devel
BuildRequires: libtasn1-devel BuildRequires: pkgconfig(libtasn1)
BuildRequires: libunistring-devel BuildRequires: libunistring-devel
BuildRequires: libuv-devel BuildRequires: pkgconfig(libuv)
BuildRequires: libxml2-devel BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: libzstd-devel BuildRequires: pkgconfig(libzstd)
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: nghttp2-devel BuildRequires: pkgconfig(libnghttp2)
BuildRequires: zlib-devel BuildRequires: pkgconfig(zlib)
#Requires: #Requires:
@ -85,5 +86,9 @@ cp -p Source/kwsys/Copyright.txt rpmdoc/cmsys/
%doc Copyright.txt rpmdoc/cmlibrhash rpmdoc/cmsys %doc Copyright.txt rpmdoc/cmlibrhash rpmdoc/cmsys
%changelog %changelog
Wed Apr 26 2023 Michael A. Peters <anymouseprophet@gmail.com> - 3.26.3-0.rc1 * Thu May 18 2023 Michael A. Peters <anymouseprophet@gmail.com> - 3.26.3-0.rc2
- Fix package name (CMake -> cmake)
- Fix (some) BuildRequires
* Wed Apr 26 2023 Michael A. Peters <anymouseprophet@gmail.com> - 3.26.3-0.rc1
- Initial spec file for YJL (RPM bootstrapping LFS/BLFS 11.3) - Initial spec file for YJL (RPM bootstrapping LFS/BLFS 11.3)

10
SPECS/llvm.spec
View File

@ -1,6 +1,6 @@
# TODO: docs/Packaging.rst # TODO: docs/Packaging.rst
%global specrel 0.dev2 %global specrel 0.dev3
%if 0%{?!__tar:1} == 1 %if 0%{?!__tar:1} == 1
%global __tar %{_bindir}/tar %global __tar %{_bindir}/tar
@ -13,7 +13,7 @@
%endif %endif
%if 0%{?repo:1} == 1 %if 0%{?repo:1} == 1
%if "%{repo}" == "1.core." %if "%{repo}" == "0.bldsys."
%global nodoxygen nodoxygen %global nodoxygen nodoxygen
%global novalgrind novalgrind %global novalgrind novalgrind
%endif %endif
@ -38,7 +38,7 @@ Patch0: llvm-clang-15.0.7-enable.patch
BuildRequires: %{__tar} BuildRequires: %{__tar}
BuildRequires: %{__sed} BuildRequires: %{__sed}
BuildRequires: %{__ninja} BuildRequires: %{__ninja}
BuildRequires: CMake BuildRequires: cmake
BuildRequires: git BuildRequires: git
BuildRequires: binutils-devel BuildRequires: binutils-devel
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
@ -176,6 +176,10 @@ install -m755 bin/FileCheck %{buildroot}%{_bindir}/
%changelog %changelog
* Thu May 18 2023 Michael A. Peters <anymouseprophet@gmail.com> - 15.0.7-0.dev3
- CMake -> cmake in BuildRequires
- Use 0.bldsys. for %%{repo}
* Mon May 15 2023 Michael A. Peters <anymouseprophet@gmail.com> - 15.0.7-0.dev2 * Mon May 15 2023 Michael A. Peters <anymouseprophet@gmail.com> - 15.0.7-0.dev2
- Install FileCheck needed by rustc build - Install FileCheck needed by rustc build