mock-core-configs.spec

@@ -1,9 +1,9 @@
 Name:       mock-core-configs
-Version:    37.8
-Release:    1.0.riscv64%{?dist}
+Version:    33.3
+Release:    1%{?dist}
 Summary:    Mock core config files basic chroots
 
-License:    GPL-2.0-or-later
+License:    GPLv2+
 URL:        https://github.com/rpm-software-management/mock/
 # Source is created by
 # git clone https://github.com/rpm-software-management/mock.git
@@ -13,39 +13,62 @@ URL:        https://github.com/rpm-software-management/mock/
 Source:     https://github.com/rpm-software-management/mock/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.gz
 BuildArch:  noarch
 
-Patch10:    mock-riscv64-configs.patch
-
 # The mock.rpm requires this.  Other packages may provide this if they tend to
 # replace the mock-core-configs.rpm functionality.
 Provides: mock-configs
 
 # distribution-gpg-keys contains GPG keys used by mock configs
-Requires:   distribution-gpg-keys >= 1.77
+Requires:   distribution-gpg-keys >= 1.41
 # specify minimal compatible version of mock
 Requires:   mock >= 2.5
 Requires:   mock-filesystem
 
 Requires(post): coreutils
+%if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7
 # to detect correct default.cfg
 Requires(post): python3-dnf
 Requires(post): python3-hawkey
 Requires(post): system-release
 Requires(post): python3
 Requires(post): sed
+%endif
+Requires(pre):  shadow-utils
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# to detect correct default.cfg
+Requires(post): python
+Requires(post): yum
+Requires(post): /etc/os-release
+%endif
 
 %description
-Mock configuration files which allow you to create chroots for Alma Linux,
-Amazon Linux, CentOS, CentOS Stream, EuroLinux, Fedora, Fedora EPEL, Mageia,
-Navy Linux, OpenMandriva Lx, openSUSE, Oracle Linux, Red Hat Enterprise Linux,
-Rocky Linux and various other specific or combined chroots.
-
+Config files which allow you to create chroots for:
+ * Fedora
+ * Epel
+ * Mageia
+ * Custom chroot
+ * OpenSuse Tumbleweed and Leap
 
 %prep
 %setup -q
 
-%patch10 -p1 -b .riscv64
 
 %build
+cd etc/host-overrides
+HOST=none
+%if 0%{?fedora}
+HOST="fedora-%{fedora}"
+%endif
+%if 0%{?rhel}
+HOST="rhel-%{rhel}"
+%endif
+
+if [ -d "$HOST" ]; then
+  pushd "$HOST"
+  for i in *.cfg; do
+    cat "$i" >> "../../mock/$i"
+  done
+  popd
+fi
 
 
 %install
@@ -61,10 +84,7 @@ cp -a etc/mock/eol/templates/*.tpl %{buildroot}%{_sysconfdir}/mock/eol/templates
 # generate files section with config - there is many of them
 echo "%defattr(0644, root, mock)" > %{name}.cfgs
 find %{buildroot}%{_sysconfdir}/mock -name "*.cfg" -o -name '*.tpl' \
-    | grep -v chroot-aliases \
     | sed -e "s|^%{buildroot}|%%config(noreplace) |" >> %{name}.cfgs
-echo "%%config %{_sysconfdir}/mock/chroot-aliases.cfg" >> %{name}.cfgs
-
 # just for %%ghosting purposes
 ln -s fedora-rawhide-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/default.cfg
 # bash-completion
@@ -98,35 +118,16 @@ else
     # something obsure, use buildtime version
     ver=%{?rhel}%{?fedora}%{?mageia}
 fi
+%if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7
 if [ -s /etc/mageia-release ]; then
     mock_arch=$(sed -n '/^$/!{$ s/.* \(\w*\)$/\1/p}' /etc/mageia-release)
 else
     mock_arch=$(python3 -c "import dnf.rpm; import hawkey; print(dnf.rpm.basearch(hawkey.detect_arch()))")
 fi
-
-cfg=unknown-distro
-%if 0%{?fedora}
-cfg=fedora-$ver-$mock_arch.cfg
+%else
+mock_arch=$(python -c "import rpmUtils.arch; baseArch = rpmUtils.arch.getBaseArch(); print baseArch")
 %endif
-%if 0%{?rhel}
-# Being installed on RHEL, or a RHEL fork.  Detect it.
-distro_id=$(. /etc/os-release; echo $ID)
-case $distro_id in
-centos)
-  # This package is EL8+, and there's only CentOS Stream now.
-  distro_id=centos-stream
-  ;;
-almalinux)
-  # AlmaLinux configs look like 'alma+epel'
-  distro_id=alma
-  ;;
-esac
-cfg=$distro_id+epel-$ver-$mock_arch.cfg
-%endif
-%if 0%{?mageia}
-cfg=mageia-$ver-$mock_arch.cfg
-%endif
-
+cfg=%{?fedora:fedora}%{?rhel:epel}%{?mageia:mageia}-$ver-${mock_arch}.cfg
 if [ -e %{_sysconfdir}/mock/$cfg ]; then
     if [ "$(readlink %{_sysconfdir}/mock/default.cfg)" != "$cfg" ]; then
         ln -s $cfg %{_sysconfdir}/mock/default.cfg 2>/dev/null || ln -s -f $cfg %{_sysconfdir}/mock/default.cfg.rpmnew
@@ -143,177 +144,6 @@ fi
 %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg
 
 %changelog
-* Wed Nov 23 2022 David Abdurachmanov <davidlt@rivosinc.com> 37.8-1.0.riscv64
-- Add configs for riscv64
-
-* Tue Sep 27 2022 Pavel Raiskup <praiskup@redhat.com> 37.8-1
-- openEuler 22.03 configs added (yikunkero@gmail.com)
-- openEuler 20.03 configs added (yikunkero@gmail.com)
-- Oracle Linux 9 configs added (a.samets@gmail.com)
-- change license to spdx (msuchy@redhat.com)
-- Update to AlmaLinux Quay.io repo (srbala@gmail.com)
-- EPEL Koji repo not exposed when we are on EPEL Next (miro@hroncok.cz)
-
-* Wed Aug 10 2022 Pavel Raiskup <praiskup@redhat.com> 37.7-1
-- depend on distribution-gpg-keys 1.76 (F38 key)
-
-* Wed Aug 10 2022 Pavel Raiskup <praiskup@redhat.com> 37.6-1
-- Branch Fedora 37 configs (miro@hroncok.cz)
-- Add anolis-release for Anolis OS 7 and Anolis OS 8 templates (wb-
-  zh951434@alibaba-inc.com)
-
-* Fri Jul 22 2022 Pavel Raiskup <praiskup@redhat.com> 37.5-1
-- configs: add ELN local Koji repo
-- config: sync epel-8 and epel-9 templates
-- Add Rocky Linux 9 Configuration and Mod RL8 (label@rockylinux.org)
-- Update Fedora ELN repo template (sgallagh@redhat.com)
-- EuroLinux 9 chroot configs added (git@istiak.com)
-- Fedora 34 is EOL
-- circlelinux+epel-8 as epel-8 alternative
-- Fix dist value for openSUSE Leap 15.4 (ngompa@opensuse.org)
-- Add CircleLinux 8 configs (bella@cclinux.org)
-- Add openSUSE Leap 15.4 configs (ngompa@opensuse.org)
-- Move openSUSE Leap 15.2 to EOL directory (ngompa@opensuse.org)
-- Use MirrorCache for openSUSE repositories instead of MirrorBrain (ngompa@opensuse.org)
-- Add Anolis OS 7 and Anolis OS 8 templates and configs (wb-zh951434@alibaba-inc.com)
-
-* Thu May 19 2022 Pavel Raiskup <praiskup@redhat.com> 37.4-1
-- Add AlmaLinux 9 and AlmaLinux 9 + EPEL configs (neal@gompa.dev)
-- Update the AlmaLinux 8 GPG key path (neal@gompa.dev)
-- Fix description typo on AlmaLinux 8 for x86_64 (neal@gompa.dev)
-- Add RHEL9 templates and configs (carl@george.computer)
-
-* Wed Apr 06 2022 Pavel Raiskup <praiskup@redhat.com> 37.3-1
-- updated %%description field
-- provide 'epel-9' symlinks for 'fedpkg mockbuild'
-- allow n-2 gpg key for Fedora ELN (msuchy@redhat.com)
-- added config "description" fields for --list-chroots (msuchy@redhat.com)
-
-* Thu Mar 03 2022 Pavel Raiskup <praiskup@redhat.com> 37.2-1
-- Update CentOS Stream 9 Extras repo to use correct key (ngompa@centosproject.org)
-- Add AlmaLinux+EPEL 8 for POWER (ppc64le) (ngompa13@gmail.com)
-- Add AlmaLinux 8 for POWER (ppc64le) (ngompa13@gmail.com)
-- Delete Fedora 37/Rawhide armhfp configs (miro@hroncok.cz)
-
-* Fri Feb 04 2022 Pavel Raiskup <praiskup@redhat.com> 37.1-1
-- drop EL7 related %%build hack
-- link default.cfg file to the right EL N config file
-- Add centos-stream+epel-8 configs
-
-* Wed Feb 02 2022 Pavel Raiskup <praiskup@redhat.com> 37-1
-- move CentOS/EPEL 8 configs to eol/
-- Fedora 36 branching, Rawhide == Fedora 37 now
-- depend on distribution-gpg-keys 1.64
-- drop failovermethod=priority from EL8 configs
-- Add Extras repo for CentOS Stream 9 (ngompa13@gmail.com)
-- remove el7 specific parts from the spec file (msuchy@redhat.com)
-
-* Thu Dec 16 2021 Pavel Raiskup <praiskup@redhat.com> 36.4-1
-- add CentOS Stream 9 + EPEL Next 9 (ngompa13@gmail.com)
-- add compatibility symlinks for EPEL 7 to centos+epel-7-* (ngompa13@gmail.com)
-- EPEL 7 for AArch64 and PPC64 are EOL (ngompa13@gmail.com)
-- resolve the multiple "local" repo collision (from multiple templates)
-- configure the alternative help for missing 'epel-8-*' configs
-- Fedora 33 is EOL
-- rhelepel moved to rhel+epel
-- EOL the EPEL Playground configs (ngompa13@gmail.com)
-- Add rocky+epel confs + Disable devel-debug (tucklesepk@gmail.com)
-- Rename epel to centos+epel (ngompa13@gmail.com)
-- fix the root name and remove Next from the EPEL 9 configs (ngompa13@gmail.com)
-- rename 'epel-next' to 'centos-stream+epel-next' (ngompa13@gmail.com)
-- add epel9 repos to epel9 template (carl@george.computer)
-- rhbz#2026571 - expand dnf_vars (msuchy@redhat.com)
-- oraclelinux+epel configs (carl@george.computer)
-- Add AlmaLinux+EPEL configs (ngompa13@gmail.com)
-- add navy-8-x86_64 (adil@linux.com)
-- use quay.io Almalinux image (gotmax@e.email)
-- use fully qualified bootstrap_image name (gotmax@e.email)
-- update almalinux-8.tpl bootstrap_image (gotmax@e.email)
-- add Koji local repos to CentOS Stream configs (ngompa13@gmail.com)
-- reduce packages installed in epel chroots (carl@george.computer)
-
-* Fri Oct 29 2021 Pavel Raiskup <praiskup@redhat.com> 36.3-1
-- add EuroLinux 8 aarch64 (alex@euro-linux.com)
-- add HA and RS configs to EuroLinux configs (alex@euro-linux.com)
-- Add epel9-next configs (carl@george.computer)
-
-* Tue Oct 26 2021 Pavel Raiskup <praiskup@redhat.com> 36.2-1
-- bump eln to F36 (praiskup@redhat.com)
-
-* Fri Oct 08 2021 Pavel Raiskup <praiskup@redhat.com> 36.1-1
-- Finalize CentOS Stream 9 configuration (ngompa13@gmail.com)
-- Update Oraclelinux 7/8 configs and add Oraclelinux EPEL 7/8 configs (darren.archibald@oracle.com)
-
-* Thu Sep 16 2021 Miroslav Suchý <msuchy@redhat.com> 36-1
-- config: Align CentOS Stream 9 with the production configuration
-  (ngompa13@gmail.com)
-- config: Disable installing weak dependencies on RHEL rebuilds
-  (ngompa13@gmail.com)
-- config: Disable installing weak dependencies on CentOS Stream
-  (ngompa13@gmail.com)
-- config: Validate GPG signatures for CentOS Stream 9 (ngompa13@gmail.com)
-- Add eurolinux-8 x86_64 and i686 buildroots (alex@euro-linux.com)
-
-* Mon Aug 16 2021 Pavel Raiskup <praiskup@redhat.com> 35-1
-- config: add Fedora 35 configs
-
-* Mon Jul 19 2021 Pavel Raiskup <praiskup@redhat.com> 34.6-1
-- Disable Rocky Linux "Devel" repo by default (ngompa13@gmail.com)
-- Fix URL for Rocky Linux repos in commented out "baseurl" lines
-  (ngompa13@gmail.com)
-
-* Mon Jul 19 2021 Pavel Raiskup <praiskup@redhat.com> 34.5-1
-- Add CentOS Stream 9 "preview" files
-- Add rocky support to mock (tucklesepk@gmail.com)
-- Add AlmaLinux 8 AArch64 target (ngompa13@gmail.com)
-- Add AlmaLinux Devel repo as an optional repo for AlmaLinux 8 (ngompa13@gmail.com)
-- Fix GPG key path for SLE updates in openSUSE Leap 15.3 (ngompa13@gmail.com)
-- Move Requires of shadow-utils from mock-core-configs to mock-filesystem (msuchy@redhat.com)
-- Switch CentOS templates to use quay.io images for bootstrap (carl@george.computer)
-- Add epel-next-8 configs (carl@george.computer)
-
-* Tue Jun 08 2021 Pavel Raiskup <praiskup@redhat.com> 34.4-1
-- Add GPG keys and RPM repositories for openSUSE Leap 15.3 (ngompa13@gmail.com)
-- EOL Fedora 32 (msuchy@redhat.com)
-- sync centos-stream-8 with centos-stream-repos (msuchy@redhat.com)
-
-* Tue Apr 27 2021 Pavel Raiskup <praiskup@redhat.com> 34.3-1
-- Add Oracle Linux 8 (ngompa13@gmail.com)
-- Add Oracle Linux 7 (ngompa13@gmail.com)
-- Add openSUSE Leap 15.3 (ngompa13@gmail.com)
-- openSUSE Leap 15.1 is EOL (ngompa13@gmail.com)
-- Add openSUSE Tumbleweed s390x config (ngompa13@gmail.com)
-- Add AlmaLinux 8 configs (ngompa13@gmail.com)
-- Remove make from default ELN buildroot (miro@hroncok.cz)
-
-* Mon Feb 22 2021 Pavel Raiskup <praiskup@redhat.com> 34.2-1
-- configs: use Fedora N-1 gpg keys for ELN (praiskup@redhat.com)
-
-* Thu Feb 11 2021 Pavel Raiskup <praiskup@redhat.com> 34.1-1
-- fix rawhide config after branching
-
-* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> 34-1
-- add fedora 34 configs (msuchy@redhat.com)
-- require distribution-gpg-keys with F35 keys (msuchy@redhat.com)
-- make F35 symlink to rawhide (msuchy@redhat.com)
-- Rename centos-stream centos-stream-8 (orion@nwra.com)
-
-* Tue Feb 02 2021 Pavel Raiskup <praiskup@redhat.com> 33.6-1
-- Add Mageia 8 stable release configs (ngompa13@gmail.com)
-- Update Mageia Cauldron configuration for Mageia 9 (ngompa13@gmail.com)
-- add RHEL 6 x86_64 configuration
-
-* Mon Jan 18 2021 Pavel Raiskup <praiskup@redhat.com> 33.5-1
-- fix typo in host-specific config generater
-
-* Mon Jan 18 2021 Pavel Raiskup <praiskup@redhat.com> 33.4-1
-- fix bootstrapping of newer Fedora on EL7
-- efine a bootstrap image for openSUSE Tumbleweed (ngompa13@gmail.com)
-- use fully qualified paths for Fedora/CentOS/RHEL images (ngompa13@gmail.com)
-- rename repoid for centos8 (msuchy@redhat.com)
-- EOL CentOS 6 (msuchy@redhat.com)
-- EOL Fedora 31 (msuchy@redhat.com)
-
 * Fri Nov 20 2020 Pavel Raiskup <praiskup@redhat.com> 33.3-1
 - ELN should use for build Everything repository (jkonecny@redhat.com)
 

mock-riscv64-configs.patch

@@ -1,42 +0,0 @@
-diff --git a/etc/mock/fedora-37-riscv64.cfg b/etc/mock/fedora-37-riscv64.cfg
-new file mode 100644
-index 0000000..7374dec
---- /dev/null
-+++ b/etc/mock/fedora-37-riscv64.cfg
-@@ -0,0 +1,5 @@
-+config_opts['releasever'] = '37'
-+config_opts['target_arch'] = 'riscv64'
-+config_opts['legal_host_arches'] = ('riscv64',)
-+
-+include('templates/fedora-branched.tpl')
-diff --git a/etc/mock/fedora-38-riscv64.cfg b/etc/mock/fedora-38-riscv64.cfg
-new file mode 100644
-index 0000000..65beeab
---- /dev/null
-+++ b/etc/mock/fedora-38-riscv64.cfg
-@@ -0,0 +1,4 @@
-+config_opts['target_arch'] = 'riscv64'
-+config_opts['legal_host_arches'] = ('riscv64',)
-+
-+include('templates/fedora-rawhide.tpl')
-diff --git a/etc/mock/fedora-eln-riscv64.cfg b/etc/mock/fedora-eln-riscv64.cfg
-new file mode 100644
-index 0000000..3cf209c
---- /dev/null
-+++ b/etc/mock/fedora-eln-riscv64.cfg
-@@ -0,0 +1,5 @@
-+config_opts['target_arch'] = 'riscv64'
-+config_opts['legal_host_arches'] = ('riscv64',)
-+
-+include('templates/fedora-eln.tpl')
-+config_opts['description'] = 'Fedora ELN'
-diff --git a/etc/mock/fedora-rawhide-riscv64.cfg b/etc/mock/fedora-rawhide-riscv64.cfg
-new file mode 100644
-index 0000000..65beeab
---- /dev/null
-+++ b/etc/mock/fedora-rawhide-riscv64.cfg
-@@ -0,0 +1,4 @@
-+config_opts['target_arch'] = 'riscv64'
-+config_opts['legal_host_arches'] = ('riscv64',)
-+
-+include('templates/fedora-rawhide.tpl')

sources

@@ -1 +1 @@
-SHA512 (mock-core-configs-37.8.tar.gz) = c838a7a6a6f63fade1ffe66eeb76438941d83ab4443fa03fc217e203015a6ee3d4d045fb7551fa4b6b130cf553c88e64aa76f5286e0872290f7088e958bbd10c
+SHA512 (mock-core-configs-33.3.tar.gz) = ba783cf834fc1066977448287b11b545008de4b72804cf965a6cb76e1f439e99688a2c653068ec6c302845c80b067ffb12c0d77477026207cca28766eba9774e