[setup/f21] spec file changes for services and bashrc fix

[Ondrej Vasik]

commit 412ca8adf97eefbe58e4bee8f7dd5dd1ce1d664f
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Mon Feb 23 15:50:38 2015 +0100

    spec file changes for services and bashrc fix

 setup.spec | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/setup.spec b/setup.spec
index cd94f96..b79cd97 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.9.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
@@ -14,6 +14,8 @@ Conflicts: filesystem < 3
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21
 
 Patch1: setup-tapewronggroup.patch
+Patch2: setup-services.patch
+Patch3: setup-bashsyntax.patch
 
 %description
 The setup package contains a set of important system configuration and
@@ -22,6 +24,8 @@ setup files, such as passwd, group, and profile.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 ./shadowconvert.sh
 
 %build
@@ -97,7 +101,12 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
-* Wed Jan 07 2015 Ondrej Vasik <ovasik at redhat.com> 2.8.71-3
+* Mon Feb 23 2015 Ondrej Vasik <ovasik at redhat.com> 2.9.0-4
+- update services to match latest IANA
+- bashrc: reflect new bash-4.3 behaviour to retain matching
+  output (#1180283)
+
+* Wed Jan 07 2015 Ondrej Vasik <ovasik at redhat.com> 2.9.0-3
 - Make a note about accidental usage of gid 30 by tape group(#1179585)
 
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.0-2