开源软件构建与测试

Changes of Revision 9

_service:tar_scm:bash.spec Changed

@@ -1,14 +1,6 @@
-%if %{?openEuler:1}0
-%global ENABLE_RELOC 1
-%endif
-
-%if %{ENABLE_RELOC}
-%global ldflags_options -Wl,--emit-relocs,-pie
-%endif
-
 Name:     bash
 Version:  5.2.15
-Release:  6
+Release:  7
 Summary:  It is the Bourne Again Shell
 License:  GPLv3
 URL:      https://www.gnu.org/software/bash
@@ -59,16 +51,6 @@
 %description devel
 This package contains development files for %{name}.
 
-%if %{?ENABLE_RELOC}
-%package relocation
-Summary: Relocation for %{name}
-Requires: %{name} = %{version}-%{release}
-BuildRequires: native-turbo-tools
-
-%description relocation
-This package contains relocations for %{name}.
-%endif
-
 %package        help
 Summary:        Documents for %{name}
 Buildarch:      noarch
@@ -90,20 +72,6 @@
 make "$MFLAGS" -C builtins
 %make_build "$MFLAGS"
 
-%if %{?ENABLE_RELOC}
-mkdir relocation
-pushd relocation
-ln -s ../configure .
-%configure --with-bash-malloc=no --with-afs LDFLAGS="%{?ldflags_options}"
-MFLAGS="CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`"
-%make_build "$MFLAGS"
-objreloc bash
-strip bash
-mv -f bash ../
-popd
-
-%endif
-
 %install
 %make_install install-headers
 
@@ -145,10 +113,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
-%if %{?ENABLE_RELOC}
-mkdir -p ${RPM_BUILD_ROOT}/usr/lib/relocation%{_bindir}
-install -pD $RPM_BUILD_DIR/%{name}-%{version}/relocation/bash.relocation ${RPM_BUILD_ROOT}/usr/lib/relocation%{_bindir}
-%endif
 
 # 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
@@ -173,12 +137,6 @@
 %{_bindir}/{hash,getopts,jobs,read,type,ulimit,umask,unalias}
 %config(noreplace) %{_sysconfdir}/profile.d/alias.sh
 
-%if %{?ENABLE_RELOC}
-%files relocation
-%defattr(400,root,root,-)
-%attr(400, root, root) /usr/lib/relocation%{_bindir}/bash.relocation
-%endif
-
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}
@@ -197,6 +155,9 @@
 %exclude %{_infodir}/dir
 
 %changelog
+* Mon Apr 22 2024 wangyuhang <wangyuhang27@huawei.com> -5.2.15-7
+- relocations are no longer required.
+
 * Wed Apr 10 2024 yueyuankun <yueyuankun@kylinos.cn> -5.2.15-6
 - add manpages