From 64fb22af70c444cf8ad493c97b9574e9ba63d7f2 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sat, 28 Mar 2020 19:23:27 -0500
Subject: [PATCH] Enable Fedora 32 beta and update configs to match
 mock-core-configs methods

---
 fdl-fedora-30-i386.cfg    |  2 +-
 fdl-fedora-30-x86_64.cfg  |  2 +-
 fdl-fedora-31-x86_64.cfg  |  5 +++--
 fdl-fedora-32-x86_64.cfg  | 29 +++++++++++++++++++++++++++++
 fdragon-mock-configs.spec | 16 ++++++++++++++--
 5 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 fdl-fedora-32-x86_64.cfg

diff --git a/fdl-fedora-30-i386.cfg b/fdl-fedora-30-i386.cfg
index f559c8b..a1dc9b1 100644
--- a/fdl-fedora-30-i386.cfg
+++ b/fdl-fedora-30-i386.cfg
@@ -1,4 +1,4 @@
-include('/etc/mock/templates/fedora-30.tpl')
+include('templates/fedora-30.tpl')
 
 config_opts['target_arch'] = 'i686'
 config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
diff --git a/fdl-fedora-30-x86_64.cfg b/fdl-fedora-30-x86_64.cfg
index e9caf14..0b9cbf9 100644
--- a/fdl-fedora-30-x86_64.cfg
+++ b/fdl-fedora-30-x86_64.cfg
@@ -1,4 +1,4 @@
-include('/etc/mock/templates/fedora-30.tpl')
+include('templates/fedora-30.tpl')
 
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
diff --git a/fdl-fedora-31-x86_64.cfg b/fdl-fedora-31-x86_64.cfg
index 727fedb..e5c15d0 100644
--- a/fdl-fedora-31-x86_64.cfg
+++ b/fdl-fedora-31-x86_64.cfg
@@ -1,8 +1,9 @@
-include('/etc/mock/templates/fedora-31.tpl')
-
+config_opts['releasever'] = '31'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
 
+include('templates/fedora-branched.tpl')
+
 config_opts['root'] = 'fdl-fedora-31-x86_64'
 config_opts['resultdir'] = '/var/www/html/packages/fedora/31/x86_64/'
 config_opts['createrepo_on_rpms'] = True
diff --git a/fdl-fedora-32-x86_64.cfg b/fdl-fedora-32-x86_64.cfg
new file mode 100644
index 0000000..e5c15d0
--- /dev/null
+++ b/fdl-fedora-32-x86_64.cfg
@@ -0,0 +1,29 @@
+config_opts['releasever'] = '31'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+
+include('templates/fedora-branched.tpl')
+
+config_opts['root'] = 'fdl-fedora-31-x86_64'
+config_opts['resultdir'] = '/var/www/html/packages/fedora/31/x86_64/'
+config_opts['createrepo_on_rpms'] = True
+config_opts['createrepo_command'] = '/usr/bin/createrepo_c -d -q -x *.src.rpm'
+
+config_opts['dnf.conf'] += """
+
+[fdl-fedora-local]
+name=Fire Dragon Linux packages for fedora $releasever - $basearch
+baseurl=http://localhost/packages/fedora/$releasever/$basearch/
+failovermethod=roundrobin
+enabled=1
+gpgcheck=0
+
+[fdl-fedora-remote]
+name=Fire Dragon Linux packages for fedora $releasever - $basearch
+baseurl=http://fdragon.org/packages/fedora/$releasever/$basearch/
+failovermethod=roundrobin
+enabled=1
+gpgcheck=0
+
+"""
+
diff --git a/fdragon-mock-configs.spec b/fdragon-mock-configs.spec
index 1f38e7e..389af4f 100644
--- a/fdragon-mock-configs.spec
+++ b/fdragon-mock-configs.spec
@@ -1,5 +1,5 @@
 Name:           fdragon-mock-configs
-Version:        2020.03.15
+Version:        2020.03.28
 Release:        1%{?dist}
 Summary:        fdragon mock configs
 
@@ -12,15 +12,17 @@ Source4:        fdl-epel-8-x86_64.cfg
 Source5:        fdl-fedora-30-i386.cfg
 Source6:        fdl-fedora-30-x86_64.cfg
 Source7:        fdl-fedora-31-x86_64.cfg
+Source8:        fdl-fedora-32-x86_64.cfg
 Source100:      makerepo
 
 # BuildRequires:  
 Requires:       httpd
 Requires:       mock
 Requires:       mock-scm
-Requires:       fedora-packager
 %if 0%{?fedora}
 Requires:       createrepo_c
+Requires:       fedora-packager
+Requires:       mock-core-configs
 %endif
 %if 0%{?rhel}
 Requires:       createrepo
@@ -47,6 +49,7 @@ rm -rf %{buildroot}
 %{__install} %{SOURCE5} %{buildroot}%{_sysconfdir}/mock/
 %{__install} %{SOURCE6} %{buildroot}%{_sysconfdir}/mock/
 %{__install} %{SOURCE7} %{buildroot}%{_sysconfdir}/mock/
+%{__install} %{SOURCE8} %{buildroot}%{_sysconfdir}/mock/
 %{__install} %{SOURCE100} %{buildroot}%{_sysconfdir}/cron.hourly/
 %{__mkdir_p} %{buildroot}/var/www/html/packages/epel/6/i386/repodata
 %{__mkdir_p} %{buildroot}/var/www/html/packages/epel/6/x86_64/repodata
@@ -55,6 +58,7 @@ rm -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/30/i386/repodata
 %{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/30/x86_64/repodata
 %{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/31/x86_64/repodata
+%{__mkdir_p} %{buildroot}/var/www/html/packages/fedora/32/x86_64/repodata
 
 
 %post
@@ -71,6 +75,7 @@ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/epel/8/x86_64/
 ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/30/i386/
 ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/30/x86_64/
 ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/31/x86_64/
+${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/32/x86_64/
 
 
 %files
@@ -102,9 +107,16 @@ ${CREATEREPO} -d -q -x *.src.rpm /var/www/html/packages/fedora/31/x86_64/
 %dir %attr(2775,root,mock) /var/www/html/packages/fedora/31
 %dir %attr(2775,root,mock) /var/www/html/packages/fedora/31/x86_64
 %dir %attr(2775,root,mock) /var/www/html/packages/fedora/31/x86_64/repodata
+%dir %attr(2775,root,mock) /var/www/html/packages/fedora/32
+%dir %attr(2775,root,mock) /var/www/html/packages/fedora/32/x86_64
+%dir %attr(2775,root,mock) /var/www/html/packages/fedora/32/x86_64/repodata
 
 
 %changelog
+* Sat Mar 28 2020 Jason Rothstein <fdragon@fdragon.org>
+- Add Fedora 32 beta support
+- depend on mock-core-configs
+
 * Sun Mar 15 2020 Jason Rothstein <fdragon@fdragon.org>
 - rebuild