From 18bc59f362624616171ef95702a9d4ae8eb8a34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik@redhat.com>
Date: Sun, 12 Feb 2012 12:07:24 +0100
Subject: [PATCH] remove /bin and /sbin from /etc/profile(#789616), require
 usrmove, add sbin paths in csh.login consistently with bash(#773268)

---
 .gitignore |  1 +
 setup.spec | 10 +++++++++-
 sources    |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0fab327..f5e7b28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ setup-2.8.25.tar.bz2
 /setup-2.8.45.tar.bz2
 /setup-2.8.46.tar.bz2
 /setup-2.8.47.tar.bz2
+/setup-2.8.48.tar.bz2
diff --git a/setup.spec b/setup.spec
index f12a7e3..d900c2e 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.8.47
+Version: 2.8.48
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -8,6 +8,9 @@ URL: https://fedorahosted.org/setup/
 Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
 BuildArch: noarch
 BuildRequires: bash tcsh perl
+# RPM runtime check in the buildroot; this ensures we can not install the
+# incompatible setup.rpm on unconverted systems
+Requires: rpmlib(X-CheckUnifiedSystemdir)
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21
 
 %description
@@ -89,6 +92,11 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
+* Sun Feb 12 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.48-1
+- remove /bin and /sbin from /etc/profile(#789616)
+- require usrmove
+- add sbin paths in csh.login consistently with bash(#773268)
+
 * Tue Jan 10 2012 Ondrej Vasik <ovasik@redhat.com> 2.8.47-1
 - reserve 181:181 uidgid pair for wallaby (#772747)
 
diff --git a/sources b/sources
index eb922fe..e32041e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c16422ba0bbe9346e08fe15449f58f4c  setup-2.8.47.tar.bz2
+c79941d322eb09000ffe8044eebc0441  setup-2.8.48.tar.bz2