[quota/f17] Make group warning message more official

[Petr Pisar]

commit 5796c686f4c1214a457af021c532100d505e3472
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Sep 25 15:31:16 2012 +0200

    Make group warning message more official

 ...-Make-group-warning-message-more-official.patch |   29 ++++++++++++++++++++
 quota.spec                                         |    8 +++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/quota-4.01-Make-group-warning-message-more-official.patch b/quota-4.01-Make-group-warning-message-more-official.patch
new file mode 100644
index 0000000..6060467
--- /dev/null
+++ b/quota-4.01-Make-group-warning-message-more-official.patch
@@ -0,0 +1,29 @@
+From cc9476d5bf016375dc02453be424ac1ea9b01247 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 25 Sep 2012 15:27:44 +0200
+Subject: [PATCH] Make group warning message more official
+
+Port to 4.01-1.
+---
+ warnquota.conf | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/warnquota.conf b/warnquota.conf
+index 77f6a75..6d26bed 100644
+--- a/warnquota.conf
++++ b/warnquota.conf
+@@ -27,8 +27,9 @@ MESSAGE         = Your disk usage has exceeded the agreed limits\
+ # is created)
+ SIGNATURE	= root at example.com
+ # Following text is used for mails about group exceeding quotas
+-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:|
++GROUP_MESSAGE  = Hello,|\
++your group %i is using too much disk space at %h.|\
++I suggest you to clean up group files on the following filesystems:|
+ # Text in the end of the mail to the group (if not specified, default text using SUPPORT
+ # and PHONE is created).
+ GROUP_SIGNATURE	= See you!|			Your admin|
+-- 
+1.7.11.4
+
diff --git a/quota.spec b/quota.spec
index 2592ef1..5b346c2 100644
--- a/quota.spec
+++ b/quota.spec
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 4.00
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -38,6 +38,8 @@ Patch8: quota-4.00-edquota-Fix-editting-of-more-users.patch
 Patch9: quota-4.00-repquota-Fix-reporting-for-XFS.patch
 # In upstream 4.01 (SF#3544564)
 Patch10: quota-4.01-quota-Fix-reporting-of-NFS-mountpoints.patch
+# Submitted to upstream, SF#3571486
+Patch11: quota-4.01-Make-group-warning-message-more-official.patch
 
 
 %description
@@ -120,6 +122,7 @@ Linux/UNIX environment.
 %patch8 -p1 -b .edquota_more_users
 %patch9 -p1 -b .repqouta_xfs
 %patch10 -p1 -b .nfs3_pathname
+%patch11 -p1 -b .group_warning
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -245,6 +248,9 @@ echo '  systemd-sysv-convert --apply quota_nld'
 
 
 %changelog
+* Tue Feb 05 2013 Petr Pisar <ppisar at redhat.com> - 1:4.00-6
+- Make group warning message more official
+
 * Fri Sep 07 2012 Petr Pisar <ppisar at redhat.com> - 1:4.00-5
 - Fix reporting for NFSv3 mount points