Configurations for mock-2.0

rpmfusion-infra · Feb 25, 2020 · 6707030 · 6707030
1 parent 026887d
commit 6707030
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+* Sun Feb 23 2020 Sérgio Basto <[email protected]> - 32.1-1
+- Configurations for Mock-2.0
+
 * Tue Feb 18 2020 Sérgio Basto <[email protected]> - 32.0-1
 - F32 Branch and the forgotten F31 GA
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 32.0
+VERSION = 32.1
 
 default: update release-free release-nonfree release-kwizart
 

diff --git a/el-round.sh b/el-round.sh
@@ -26,7 +26,11 @@ for arch in $ARCHES ; do
   if [ "$arch" == "aarch64" -a "${fver}" -lt "8" ] ; then
     continue
   fi
-  cp template_init epel-${fver}-${arch}-${repo}.cfg
+  if [ "${fver}" -lt "8" ]; then
+      cp template_yum_init epel-${fver}-${arch}-${repo}.cfg
+  else
+      cp template_init epel-${fver}-${arch}-${repo}.cfg
+  fi
   sed -i -e "s|configuration_name|epel-${fver}-${arch}.cfg|g" epel-${fver}-${arch}-${repo}.cfg
   cat rpmfusion_free-$flavour-template >> epel-${fver}-${arch}-${repo}.cfg
   if [ ! "$repo" = rpmfusion_free ] ; then

diff --git a/mock-rpmfusion-free.spec.in b/mock-rpmfusion-free.spec.in
@@ -9,7 +9,7 @@ Source0:        https://github.com/rpmfusion-infra/mock-rpmfusion/releases/downl
 Source1:        https://admin.rpmfusion.org/accounts/rpmfusion-server-ca.cert
 
 BuildArch:      noarch
-Requires:       mock-core-configs >= 31.4
+Requires:       mock >= 2.0
 
 %description
 Mock config files for the RPM Fusion Free Repository

diff --git a/template_init b/template_init
@@ -1,3 +1,3 @@
 include('/etc/mock/configuration_name')
 
-config_opts['yum.conf'] += """
+config_opts['dnf.conf'] += """
diff --git a/template_yum_init b/template_yum_init
@@ -0,0 +1,3 @@
+include('/etc/mock/configuration_name')
+
+config_opts['yum.conf'] += """