From 82eb8f726ba4c777877024d9e0e1c6ff6a57b72a Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Jan 20 2009 13:36:13 +0000
Subject: make uidgid file better parseable, reserve gids for groups cdrom (:11),

    tape (:33) and dialout (:87) in uidgid file (#480762)

---

diff --git a/.cvsignore b/.cvsignore
index d9bf5b4..7ae1bbd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-setup-2.7.5.tar.bz2
+setup-2.7.6.tar.bz2
diff --git a/setup-2.7.5.patch b/setup-2.7.5.patch
deleted file mode 100644
index 6c4c4cc..0000000
--- a/setup-2.7.5.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -urNp setup-2.7.5-orig/csh.login setup-2.7.5/csh.login
---- setup-2.7.5-orig/csh.login	2008-11-27 13:03:16.000000000 +0100
-+++ setup-2.7.5/csh.login	2008-12-10 17:00:21.000000000 +0100
-@@ -17,10 +17,6 @@ endif
- setenv HOSTNAME `/bin/hostname`
- set history=1000
- 
--if ( ! -f $HOME/.inputrc ) then
--	setenv INPUTRC /etc/inputrc
--endif
--
- if ( -d /etc/profile.d ) then
-         set nonomatch
-         foreach i ( /etc/profile.d/*.csh )
-diff -urNp setup-2.7.5-orig/profile setup-2.7.5/profile
---- setup-2.7.5-orig/profile	2008-11-27 13:03:16.000000000 +0100
-+++ setup-2.7.5/profile	2008-12-10 17:00:02.000000000 +0100
-@@ -42,11 +42,7 @@ fi
- HOSTNAME=`/bin/hostname 2>/dev/null`
- HISTSIZE=1000
- 
--if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ]; then
--    INPUTRC=/etc/inputrc
--fi
--
--export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE INPUTRC
-+export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE
- 
- for i in /etc/profile.d/*.sh ; do
-     if [ -r "$i" ]; then
-@@ -58,7 +54,5 @@ for i in /etc/profile.d/*.sh ; do
-     fi
- done
- 
--export PATH
--
- unset i
- unset pathmunge
-diff -urNp setup-2.7.5-orig/uidgid setup-2.7.5/uidgid
---- setup-2.7.5-orig/uidgid	2008-11-27 13:03:16.000000000 +0100
-+++ setup-2.7.5/uidgid	2008-12-18 12:41:22.000000000 +0100
-@@ -21,6 +21,7 @@ games		12	(100)	/usr/games		/sbin/nologi
- gopher		13	30	/usr/lib/gopher-data	/sbin/nologin	setup
- ftp		14	50	/var/ftp		/sbin/nologin	setup
- man		-	15	-			-		setup
-+pkiuser		17	17	/usr/share/pki	/sbin/nologin	pki-ca,rhpki-ca
- floppy		-	19	-			-		dev,MAKEDEV
- games		-	20	-			-		setup
- slocate		-	21	-			-		slocate
diff --git a/setup.spec b/setup.spec
index 56ea714..bc263fd 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,12 +1,11 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.7.5
-Release: 4%{?dist}
+Version: 2.7.6
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source: setup-%{version}.tar.bz2
-Patch1: setup-2.7.5.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -19,7 +18,6 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -89,6 +87,12 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Tue Jan 20 2009 Ondrej Vasik <ovasik@redhat.com> 2.7.6-1
+- make uidgid file better parseable (synchronize tabs)
+- reserve gid 11 for group cdrom (udev,MAKEDEV)
+- reserve gid 33 for group tape (udev,MAKEDEV)
+- reserve gid 87 for group dialout (udev,MAKEDEV)
+
 * Tue Jan 06 2009 Ondrej Vasik <ovasik@redhat.com> 2.7.5-4
 - use lua language in post to prevent additional
   dependencies
diff --git a/sources b/sources
index 5e3c455..14d8a00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86d0e073194683d55595e4516f967cf0  setup-2.7.5.tar.bz2
+c59aafd91d123db95f2260edeca679ee  setup-2.7.6.tar.bz2