diff --git a/bash.spec b/bash.spec index 4b7ffc1..9420f78 100644 --- a/bash.spec +++ b/bash.spec @@ -7,7 +7,7 @@ Version: %{baseversion}%{patchleveltag} Name: bash Summary: The GNU Bourne Again shell -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/bash Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz @@ -129,7 +129,7 @@ autoconf # Recycles pids is neccessary. When bash's last fork's pid was X # and new fork's pid is also X, bash has to wait for this same pid. # Without Recycles pids bash will not wait. -make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DSYS_BASHRC='\"/etc/bashrc\"' -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" %{?_smp_mflags} +make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" %{?_smp_mflags} %install if [ -e autoconf ]; then @@ -304,6 +304,9 @@ end %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Mon Oct 30 2017 Siteshwar Vashisht - 4.4.12-12 +- Revert change to always source from /etc/bashrc + * Tue Aug 29 2017 Siteshwar Vashisht - 4.4.12-11 - Always source from /etc/bashrc Resolves: #1193590 diff --git a/dot-bashrc b/dot-bashrc index 11090b7..1130779 100644 --- a/dot-bashrc +++ b/dot-bashrc @@ -1,5 +1,10 @@ # .bashrc +# Source global definitions +if [ -f /etc/bashrc ]; then + . /etc/bashrc +fi + # Uncomment the following line if you don't like systemctl's auto-paging feature: # export SYSTEMD_PAGER=