Mark fixes accepted by upstream

This commit is contained in:
Petr Písař 2011-01-12 10:02:56 +01:00
parent 5a6fb1cc1e
commit 37e82d9f93

View File

@ -18,12 +18,18 @@ BuildRequires: openldap-devel openssl-devel dbus-devel libnl-devel
Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}-pre1.tar.gz
Source1: quota_nld.init
Source2: quota_nld.sysconfig
# Part (LDAP comments) accepted into quota-4.00_pre2
# (378a64006bb1e818e84a1c77808563b802b028fa)
Patch0: quota-3.06-warnquota.patch
# 4.00_pre2 provides --enable-strip-binaries configure option defulting to yes
# TODO: Use the option instead of the patch
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
# Included in upstream 4.00_pre2
Patch5: quota-3.16-helpoption.patch
# Included in upstream 4.00_pre2
Patch6: quota-3.16-quotaoffhelp.patch
Patch8: quota-3.17-ftbfs.patch
# Bug #528581, remove in upstream 4.00
@ -32,6 +38,7 @@ Patch9: quota-4.00_pre1-quotactl_null_corruption.patch
Patch10: quota-4.00_pre1-add-gfs2-support.patch
# In upstream 4.00_pre2
Patch11: quota-4.00_pre1-Add-always-resolve-to-quota.1-manpage.patch
# In upstream 4.00_pre2
Patch12: quota-4.00_pre1-Document-always-resolve-at-edquota-and-setquota.patch
# Bug #667757
Patch13: quota-4.00_pre1-Make-RPC-block-factor-dynamic.patch
@ -142,6 +149,7 @@ for F in Changelog; do
mv "$F"{.utf8,}
done
# Accepted by upstream in quota-4.00_pre2
# Comment example /etc/quotatab to silent warnquota
sed -i -e '/^ *[^#]\{1,\}$/ s/^/#/' quotatab