diff --git a/bash.spec b/bash.spec index 2fcedcbfab1cb35c74dfe5a4a606a01278426e82..6213ffe2bb50c7441f00c9e34830166bad33ade8 100644 --- a/bash.spec +++ b/bash.spec @@ -1,6 +1,6 @@ Name: bash Version: 5.1.8 -Release: 8 +Release: 7 Summary: It is the Bourne Again Shell License: GPLv3 URL: https://www.gnu.org/software/bash @@ -56,14 +56,6 @@ Requires: pkgconf-pkg-config %description devel This package contains development files for %{name}. -%package reloc -Summary: Relocations for %{name} -Requires: %{name} = %{version}-%{release} -BuildRequires: sysboost-devel - -%description reloc -This package contains relocations for %{name}. - %package help Summary: Documents for %{name} Buildarch: noarch @@ -79,14 +71,12 @@ Man pages and other related documents for %{name}. %build autoconf -%configure --with-bash-malloc=no --with-afs LDFLAGS="-Wl,--emit-relocs" +%configure --with-bash-malloc=no --with-afs MFLAGS="CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" make "$MFLAGS" version.h make "$MFLAGS" -C builtins %make_build "$MFLAGS" -objreloc $RPM_BUILD_DIR/%{name}-%{version}/bash - %install %make_install install-headers ln -sf bash %{buildroot}%{_bindir}/sh @@ -95,8 +85,6 @@ install -pDm 644 %SOURCE2 %{buildroot}/etc/skel/.bash_profile install -pDm 644 %SOURCE3 %{buildroot}/etc/skel/.bash_logout install -pDm 644 ./configs/alias.sh %{buildroot}%{_sysconfdir}/profile.d/alias.sh -install -pDm 750 $RPM_BUILD_DIR/%{name}-%{version}/bash.relocation %{buildroot}%{_bindir}/bash.relocation - # bug #820192, need to add execable alternatives for regular built-ins for ea in alias bg cd command fc fg getopts hash jobs read type ulimit umask unalias wait do @@ -120,10 +108,6 @@ make check %{_bindir}/{hash,getopts,jobs,read,type,ulimit,umask,unalias} %config(noreplace) %{_sysconfdir}/profile.d/alias.sh -%files reloc -%defattr(744,root,root) -%{_bindir}/bash.relocation - %files devel %defattr(-,root,root) %{_includedir}/%{name} @@ -141,12 +125,6 @@ make check %exclude %{_infodir}/dir %changelog -* Sat May 6 2023 liutie -5.1.8-8 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC: Generate available relocations for sysboost - * Mon Jan 16 2023 wangyuhang -5.1.8-7 - Type:bugfix - ID:NA @@ -312,4 +290,4 @@ make check - DESC:1000 Forbidden non root user to clear history * Mon Oct 08 2018 licunlong - 4.4.23-5 -- Package Initialization \ No newline at end of file +- Package Initialization