From 47579c59ecf94435131bcc4a096f8c5856cabcd6 Mon Sep 17 00:00:00 2001
From: Otto Urpelainen <oturpe@iki.fi>
Date: Aug 24 2021 23:32:56 +0000
Subject: Add default configuration for `resultsdir`


Rpkg added support for new configuration option `resultsdir` in [1].
Default configuration is set: `git_exclude` to exclude the new
`results` directory, and `resultsdir` option set of `root`, in order to
preserve the current behavior by default and make the new `subdir`
option opt-in.

[1]: https://pagure.io/rpkg/c/89bc57df4f2dcc22004c3e412df3013b62b70ffb?branch=master

Signed-off-by: Otto Urpelainen <oturpe@iki.fi>
Merges: https://pagure.io/fedpkg/pull-request/432

---

diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf
index bb1901c..eeae285 100644
--- a/conf/etc/rpkg/fedpkg-stage.conf
+++ b/conf/etc/rpkg/fedpkg-stage.conf
@@ -46,8 +46,10 @@ git_excludes =
   /*.src.rpm
   /build*.log
   /.build-*.log
+  results/
   results_*/
   clog
+results_dir=root
 
 [fedpkg-stage.bodhi]
 # Refer to fedpkg.conf
diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf
index aef75f4..f975f71 100644
--- a/conf/etc/rpkg/fedpkg.conf
+++ b/conf/etc/rpkg/fedpkg.conf
@@ -46,8 +46,10 @@ git_excludes =
   /*.src.rpm
   /build*.log
   /.build-*.log
+  results/
   results_*/
   clog
+results_dir=root
 
 [fedpkg.bodhi]
 # This is for the bodhi-client 2.x, that do not require an option to switch to