From 6f002e8e5f39824305d2bd67bcc57edda8d00928 Mon Sep 17 00:00:00 2001
From: Lukas Czerner <lczerner@redhat.com>
Date: Tue, 20 Sep 2022 12:24:54 +0200
Subject: [PATCH] New upstream release 4.08

Previous release 4.07 was missing some crucial files in the tarball and
so the maintainer released fixed version right after that.

Unfortunately the new release has a bug where it would duplicate manual
pages on make install so we have to carry a custom patch to fix that
ATM.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 .gitignore                                    |  1 +
 ...Don-t-duplicate-manpages-in-man_MANS.patch | 49 +++++++++++++++++++
 quota.spec                                    |  7 ++-
 sources                                       |  2 +-
 4 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 quota-4.08-quota-Don-t-duplicate-manpages-in-man_MANS.patch

diff --git a/.gitignore b/.gitignore
index 1f09625..1df027a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ quota-3.17.tar.gz
 /quota-4.05.tar.gz
 /quota-4.06.tar.gz
 /quota-4.07.tar.gz
+/quota-4.08.tar.gz
diff --git a/quota-4.08-quota-Don-t-duplicate-manpages-in-man_MANS.patch b/quota-4.08-quota-Don-t-duplicate-manpages-in-man_MANS.patch
new file mode 100644
index 0000000..0ac3cb3
--- /dev/null
+++ b/quota-4.08-quota-Don-t-duplicate-manpages-in-man_MANS.patch
@@ -0,0 +1,49 @@
+From dce5443cee649370eff4058b10c53afaadd5ffbd Mon Sep 17 00:00:00 2001
+From: Lukas Czerner <lczerner@redhat.com>
+Date: Tue, 20 Sep 2022 12:52:00 +0200
+Subject: [PATCH] quota: Don't duplicate manpages in man_MANS
+Content-Type: text/plain
+
+Commit 118c541 ("Include unconfigured manpages into distribution")
+changes the way we create lists of manual pages for installation
+(man_MANS and dist_MANS). Unfortunately it results in some being
+duplicated in certain configurations (WITH_RPC and WITH_NETLINK).
+
+Fixes: 118c541 ("Include unconfigured manpages into distribution")
+Signed-off-by: Lukas Czerner <lczerner@redhat.com>
+---
+ Makefile.am | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f9c66cc..97f29f5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -31,18 +31,20 @@ dist_MANS = \
+ 
+ man_MANS = $(dist_MANS)
+ 
+-dist_MANS += quota_nld.8
+ if WITH_NETLINK
+ man_MANS += quota_nld.8
++else
++dist_MANS += quota_nld.8
+ endif
+ 
+-dist_MANS += \
+-	rpc.rquotad.8 \
+-	rquota.3
+ if WITH_RPC
+ man_MANS += \
+ 	rpc.rquotad.8 \
+ 	rquota.3
++else
++dist_MANS += \
++	rpc.rquotad.8 \
++	rquota.3
+ endif
+ 
+ SUBDIRS = po
+-- 
+2.37.3
+
diff --git a/quota.spec b/quota.spec
index 4f429bd..98b9d6d 100644
--- a/quota.spec
+++ b/quota.spec
@@ -12,7 +12,7 @@
 
 Name:       quota
 Epoch:      1
-Version:    4.07
+Version:    4.08
 Release:    1%{?dist}
 Summary:    System administration tools for monitoring users' disk usage
 # quota_nld.c, quotaio_xfs.h:       GPLv2
@@ -59,6 +59,7 @@ Source4:    rpc-rquotad.sysconfig
 Patch0:     quota-4.06-warnquota-configuration-tunes.patch
 # Fix parsing a TCP port number
 Patch1:     quota-4.03-Validate-upper-bound-of-RPC-port.patch
+Patch2:     quota-4.08-quota-Don-t-duplicate-manpages-in-man_MANS.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -182,6 +183,7 @@ Linux/UNIX environment.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Regenerate build scripts
 autoreconf -f -i
@@ -332,6 +334,9 @@ make check
 
 
 %changelog
+* Wed Sep 21 2022 Lukas Czerner <lczerner@redhat.com> - 1:4.08-1
+- New upstream release 4.08
+
 * Tue Sep 20 2022 Lukas Czerner <lczerner@redhat.com> - 1:4.07-1
 - New upstream release 4.07
 
diff --git a/sources b/sources
index 28b73d4..25d666a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (quota-4.07.tar.gz) = c31ab803979899fc5cd074c595f775ff94430bb190606016be47962b3764855f0bd131e1c4eef6e35b37067a80d7519d652720f919f1fd8937344f9cc5d8b33d
+SHA512 (quota-4.08.tar.gz) = 22a13ef54e7502d21140a0dffe0171d2ea0fb0948b45bcc645356f2eabefc74dbc8b21ae29907149919830a1f5c279ad4657ea5b47319cebed71944fe1f76c03