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

cleanup

Browse Source
This commit is contained in:
Michael A. Peters 2023-05-20 09:50:09 -07:00
parent 97ba4606f9
commit a0096ae678
10 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPECS/autoconf.spec
View File

@ -1,7 +1,7 @@
%if 0%{!?__sed:1} == 1
%global __sed %{_bindir}/sed
%endif
%if %{!?insinfo:1}%{?insinfo:0}
%if 0%{?!insinfo:1} == 1
%global insinfo /sbin/install-info
%endif

2
SPECS/automake.spec
View File

@ -1,4 +1,4 @@
%if %{!?insinfo:1}%{?insinfo:0}
%if 0%{?!insinfo:1} == 1
%global insinfo /sbin/install-info
%endif

5
SPECS/bash.spec
View File

@ -2,10 +2,7 @@
%global bcompv 2.11
%global bcompdir %{_datadir}/bash-completion
# Many (most?) distributions put install-info in /{,usr/}sbin
# YJL defines this macro to /usr/bin/install-info
# so define it to be in /sbin/ if not defined.
%if %{!?insinfo:1}%{?insinfo:0}
%if 0%{?!insinfo:1} == 1
%global insinfo /sbin/install-info
%endif

6
SPECS/binutils.spec
View File

@ -1,13 +1,11 @@
# Many (most?) distributions put install-info in /{,usr/}sbin
# YJL defines this macro to /usr/bin/install-info
# so define it to be in /sbin/ if not defined.
%if %{!?insinfo:1}%{?insinfo:0}
%if 0%{?!insinfo:1} == 1
%global insinfo /sbin/install-info
%endif
%global triplet %(%{_bindir}/gcc -dumpmachine)
# no stripping
%define __strip /bin/true
Name: binutils
Version: 2.40
Release: %{?repo}0.rc5%{?dist}

2
SPECS/bison.spec
View File

@ -1,4 +1,4 @@
%if %{!?insinfo:1}%{?insinfo:0}
%if 0%{?!insinfo:1} == 1
%global insinfo /sbin/install-info
%endif

8
SPECS/git.spec
View File

@ -8,9 +8,6 @@
%global gitdocs %{_datadir}/git-documentation
%if 0%{?!__tar:1} == 1
%global __tar %{_bindir}/tar}
%endif
%if 0%{?!__sed:1} == 1
%global __sed %{_bindir}/sed}
%endif
@ -37,7 +34,6 @@ Source0: https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
Source1: https://www.kernel.org/pub/software/scm/git/git-manpages-%{version}.tar.xz
Source2: https://www.kernel.org/pub/software/scm/git/git-htmldocs-%{version}.tar.xz
BuildRequires: %{__tar}
BuildRequires: %{__sed}
BuildRequires: perl-devel
BuildRequires: python3-devel
@ -136,10 +132,10 @@ install -m644 -D contrib/completion/git-completion.bash \
%find_lang git
[ ! -d %{buildroot}%{_mandir} ] && mkdir -p %{buildroot}%{_mandir}
%{__tar} -xf %{SOURCE1} \
tar -xf %{SOURCE1} \
-C %{buildroot}%{_mandir} --no-same-owner --no-overwrite-dir
mkdir -p %{buildroot}%{gitdocs}
%{__tar} -xf %{SOURCE2} \
tar -xf %{SOURCE2} \
-C %{buildroot}%{gitdocs} --no-same-owner --no-overwrite-dir
find %{buildroot}%{gitdocs} -type d -exec chmod 755 {} \;
find %{buildroot}%{gitdocs} -type f -exec chmod 644 {} \;

10
SPECS/llvm.spec
View File

@ -2,9 +2,6 @@
%global specrel 0.dev3
%if 0%{?!__tar:1} == 1
%global __tar %{_bindir}/tar
%endif
%if 0%{?!__sed:1} == 1
%global __sed %{_bindir}/sed
%endif
@ -35,7 +32,6 @@ Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{versi
#Patch0: https://www.linuxfromscratch.org/patches/blfs/11.3/clang-15.0.7-enable_default_ssp-1.patch
Patch0: llvm-clang-15.0.7-enable.patch
BuildRequires: %{__tar}
BuildRequires: %{__sed}
BuildRequires: %{__ninja}
BuildRequires: cmake
@ -63,14 +59,14 @@ it is the full name of the project.
%prep
%setup -q -n %{name}-%{version}.src
%__tar -xf %{SOURCE1}
tar -xf %{SOURCE1}
%__sed -i '/LLVM_COMMON_CMAKE_UTILS/s@../cmake@cmake-%{version}.src@' \
-i CMakeLists.txt
%__tar -xf %{SOURCE2} -C tools
tar -xf %{SOURCE2} -C tools
mv tools/clang-%{version}.src tools/clang
%__tar -xf %{SOURCE3} -C projects
tar -xf %{SOURCE3} -C projects
mv projects/compiler-rt-%{version}.src projects/compiler-rt
grep -rl '#!.*python' | xargs sed -i '1s/python$/python3/'

2
SPECS/plocate.spec
View File

@ -74,7 +74,7 @@ cat > %{buildroot}%{_sysconfdir}/updatedb.conf << "EOF"
# %{_sysconfdir}/updatedb.conf
# see man 5 updatedb.conf
#
PRUNEPATHS = "/backup"
PRUNEPATHS = "/backup /opt/texlive"
EOF

6
SPECS/python3.spec
View File

@ -3,9 +3,6 @@
%if 0%{?!__sed:1} == 1
%global __sed %{_bindir}/sed
%endif
%if 0%{?!__tar:1} == 1
%global __tar %{_bindir}/tar
%endif
# Version definitions
%global python3_version 3.11
@ -38,7 +35,6 @@ Provides: %{python3_API}
Provides: %{python3_ABI}
BuildRequires: %{__sed}
BuildRequires: %{__tar}
# This is very incomplete
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(libffi)
@ -103,7 +99,7 @@ install -m644 %{SOURCE2} %{buildroot}/usr/lib/rpm/macros.d/macros.python3
ln -sf python%{python3_version} %{buildroot}%{_bindir}/python
install -v -m755 -d %{buildroot}%{_datadir}/doc/python-%{version}/html
%{__tar} --strip-components=1 \
tar --strip-components=1 \
--no-same-owner \
--no-same-permissions \
-C %{buildroot}%{_datadir}/doc/python-%{version}/html \