From aa88b6e86b3fc20569c24eafdee2cd511126a1f3 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Thu, 15 Feb 2007 22:42:06 +0000
Subject: [PATCH] Upgraded to version 3.14 (bz# 213641)

---
 .cvsignore                 |  1 +
 quota-3.06-warnquota.patch | 21 ++++++++++++---------
 quota.spec                 |  9 +++++----
 sources                    |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index be1184d..801bada 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 quota-3.10.tar.gz
 quota-3.12.tar.gz
 quota-3.13.tar.gz
+quota-3.14.tar.gz
diff --git a/quota-3.06-warnquota.patch b/quota-3.06-warnquota.patch
index a6d14fe..1c4e1ae 100644
--- a/quota-3.06-warnquota.patch
+++ b/quota-3.06-warnquota.patch
@@ -1,6 +1,6 @@
---- quota-tools/warnquota.conf.orig	2004-03-12 13:15:40.000000000 -0500
-+++ quota-tools/warnquota.conf	2004-09-13 15:03:30.000000000 -0400
-@@ -4,25 +4,25 @@
+--- quota-tools/warnquota.conf.orig	2005-07-19 11:51:07.000000000 -0400
++++ quota-tools/warnquota.conf	2007-02-15 14:58:38.000000000 -0500
+@@ -4,16 +4,16 @@
  # and even blank lines
  
  # values can be quoted:
@@ -22,15 +22,18 @@
  PHONE 		= "(123) 456-1111 or (222) 333-4444"
  # Text in the beginning of the mail (if not specified, default text is used)
  # This way text can be split to more lines
- # Line breaks are done by '|' character
--MESSAGE         = Hello, I've noticed you use too much space\
-- on my disk|Delete your files on following filesystems:|
+@@ -21,11 +21,11 @@ PHONE 		= "(123) 456-1111 or (222) 333-4
+ # The expressions %i, %h, %d, and %% are substituted for user/group name,
+ # host name, domain name, and '%' respectively. For backward compatibility
+ # %s behaves as %i but is deprecated.
+-MESSAGE         = Hello user %i, I've noticed you use too much space\
+- on my disk in %h.%d.|Delete your files on the following filesystems:|
 +MESSAGE         = Your disk usage has exceeded the agreed limits\
 + on this server|Please delete any unnecessary files on following filesystems:|
  # Text in the end of the mail (if not specified, default text using SUPPORT and PHONE
  # is created)
--SIGNATURE	= See you!|			Your admin|
+-SIGNATURE	= See you!|			Your admin of %h|
 +SIGNATURE	= root@localhost
  # Following text is used for mails about group exceeding quotas
- # It should contain string %s exactly once - it will be substituted for a group name
- GROUP_MESSAGE	= Hello, a group '%s' you're member of use too much space.|\
+ GROUP_MESSAGE	= Hello, a group '%i' you're member of use too much space at %h.|\
+ I chose you to do the cleanup.|Delete group files on the following filesystems:|
diff --git a/quota.spec b/quota.spec
index cbef272..df520ab 100644
--- a/quota.spec
+++ b/quota.spec
@@ -1,8 +1,8 @@
 Name: quota
 Summary: System administration tools for monitoring users' disk usage.
 Epoch: 1
-Version: 3.13
-Release: 1.3%{?dist}
+Version: 3.14
+Release: 1%{?dist}
 License: BSD
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -16,7 +16,6 @@ Patch1: quota-3.06-no-stripping.patch
 Patch2: quota-3.06-man-page.patch
 Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
-Patch5: quota-3.13-junk-err-fix.patch
 
 
 %description
@@ -33,7 +32,6 @@ and limiting user and or group disk usage per filesystem.
 %patch3 -p1
 %endif
 %patch4 -p1
-%patch5 -p1
 
 
 %build
@@ -82,6 +80,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 15 2007  Steve Dickson <SteveD@RedHat.com> 3.14-1
+- Upgraded to version 3.14 (bz# 213641)
+
 * Mon Dec  4 2006 Thomas Woerner <twoerner@redhat.com> 1:3.13-1.3
 - tcp_wrappers has a new devel and libs sub package, therefore changing build
   requirement for tcp_wrappers to tcp_wrappers-devel
diff --git a/sources b/sources
index ac2450e..91d4620 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a91c4bc342dca2ddf9f620af24fc5e7  quota-3.13.tar.gz
+e6ae17d4bf26012e820c3582ec7af487  quota-3.14.tar.gz