From e284508bacd3f2f0cf2a27c166972b0c66f1a2c1 Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Mar 03 2020 09:53:18 +0000
Subject: Remove deprecated clone_config


Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf
index 0179fb4..e81a1d6 100644
--- a/conf/etc/rpkg/fedpkg-stage.conf
+++ b/conf/etc/rpkg/fedpkg-stage.conf
@@ -7,12 +7,24 @@ anongiturl = https://src.stg.fedoraproject.org/%(repo)s.git
 branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$
 kojiprofile = stg
 build_client = koji
-clone_config =
+clone_config_rpms =
   bz.default-tracker partner-bugzilla.redhat.com
   bz.default-product Fedora
   bz.default-version rawhide
   bz.default-component %(repo)s
   sendemail.to %(repo)s-owner@fedoraproject.org
+clone_config_modules =
+  bz.default-tracker partner-bugzilla.redhat.com
+  bz.default-product Fedora Modules
+  bz.default-version rawhide
+  bz.default-component %(repo)s
+  sendemail.to module-%(repo)s-owner@fedoraproject.org
+clone_config_container =
+  bz.default-tracker partner-bugzilla.redhat.com
+  bz.default-product Fedora Container Images
+  bz.default-version rawhide
+  bz.default-component %(repo)s
+  sendemail.to container-%(repo)s-owner@fedoraproject.org
 distgit_namespaced = True
 distgit_namespaces = rpms container modules flatpaks
 lookaside_namespaced = True
diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf
index 21ba960..0809aef 100644
--- a/conf/etc/rpkg/fedpkg.conf
+++ b/conf/etc/rpkg/fedpkg.conf
@@ -7,12 +7,6 @@ anongiturl = https://src.fedoraproject.org/%(repo)s.git
 branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$
 kojiprofile = koji
 build_client = koji
-clone_config =
-  bz.default-tracker bugzilla.redhat.com
-  bz.default-product Fedora
-  bz.default-version rawhide
-  bz.default-component %(repo)s
-  sendemail.to %(repo)s-owner@fedoraproject.org
 clone_config_rpms =
   bz.default-tracker bugzilla.redhat.com
   bz.default-product Fedora