From c6c1337fe2c3917072a7399a11eee853862e0df0 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 4 Dec 2020 20:19:14 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/bash.git#99cafb7674b157f1649e1ee44f83ebfb8487970f
---
 .fmf/version    |  1 +
 bash.spec       |  6 +++++-
 dot-bashrc      |  9 +++++++++
 plans/shell.fmf | 11 +++++++++++
 tests/tests.yml | 29 -----------------------------
 5 files changed, 26 insertions(+), 30 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/shell.fmf
 delete mode 100644 tests/tests.yml

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/bash.spec b/bash.spec
index 0fb39cc..4527da7 100644
--- a/bash.spec
+++ b/bash.spec
@@ -6,7 +6,7 @@
 Version: %{baseversion}%{patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Url: https://www.gnu.org/software/bash
 Source0: https://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz
@@ -308,6 +308,10 @@ end
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Dec  4 14:44:06 CET 2020 Siteshwar Vashisht <svashisht@redhat.com> - 5.0.17-3
+- Enable sourcing files from ~/.bashrc.d
+  Resolves: #1726397
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/dot-bashrc b/dot-bashrc
index d81e0b5..ad4581e 100644
--- a/dot-bashrc
+++ b/dot-bashrc
@@ -16,3 +16,12 @@ export PATH
 # export SYSTEMD_PAGER=
 
 # User specific aliases and functions
+if [ -d ~/.bashrc.d ]; then
+	for rc in ~/.bashrc.d/*; do
+		if [ -f "$rc" ]; then
+			. "$rc"
+		fi
+	done
+fi
+
+unset rc
diff --git a/plans/shell.fmf b/plans/shell.fmf
new file mode 100644
index 0000000..75700e0
--- /dev/null
+++ b/plans/shell.fmf
@@ -0,0 +1,11 @@
+summary:
+    Run relevant tests from the shell tests repository
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/shell
+    filter: component:bash
+execute:
+    how: tmt
+environment:
+    PACKAGES: bash
+    SH_BIN: bash
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 2eaaa7a..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-
-# Tests that run in classic context
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/shell.git"
-      dest: "shell"
-      fmf_filter: "tier: 1, 2 & tags: classic"
-    required_packages:
-    - expect            # login requires expect
-    - which             # smoke requires which
-
-# Tests that run in container and atomic contexts
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - container
-    - atomic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/shell.git"
-      dest: "shell"
-      fmf_filter: "tier: 1, 2 & tags: container, atomic"
-    required_packages:
-    - which             # smoke requires which