remove --no-frozen-lockfile?

Signed-off-by: madomado <madonuko@outlook.com>
maybe use system pnpm
2026-05-31 09:01:55 +00:00 · 2024-07-23 22:56:38 +08:00 · 2024-07-23 22:46:01 +08:00 · 2024-07-23 22:37:41 +08:00 · 2024-07-23 22:29:06 +08:00 · 2024-07-23 14:14:54 +00:00
37 changed files with 95 additions and 1235 deletions
@@ -51,15 +51,27 @@ jobs:
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
+
+      - name: Checkout latest Mock configs
+        uses: actions/checkout@v4
+        with:
+          repository: terrapkg/mock-configs
+          path: mock-configs
+
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Include custom build template instead of package default
        run: |
-          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+
+      - name: Build with Andaman (alternate arch)
+        if: |
+          matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib']
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-i386.cfg

      - name: Generating artifact name
        id: art
@@ -56,18 +56,22 @@ jobs:
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
+
+      - name: Checkout latest Mock configs
+        uses: actions/checkout@v4
+        with:
+          repository: terrapkg/mock-configs
+          path: mock-configs
+
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: Cache buildroot
-        id: br-cache
-        uses: actions/cache@v4
-        with:
-          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
+      - name: Include custom build template instead of package default
+        run: |
+          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl

      - name: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
+        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.pkg

      - name: Generating artifact name
        id: art
@@ -22,18 +22,22 @@ jobs:
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
+
+      - name: Checkout latest Mock configs
+        uses: actions/checkout@v4
+        with:
+          repository: terrapkg/mock-configs
+          path: mock-configs
+
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: Cache buildroot
-        id: br-cache
-        uses: actions/cache@v4
-        with:
-          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+      - name: Include custom build template instead of package default
+        run: |
+          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.pkg

      - name: Generating artifact name
        id: art
@@ -25,7 +25,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: anda update -vv
+        run: anda update -vv --filters nightly=0
        env:
          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.60
+Version:        0.0.61
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.60
+Version:		0.0.61
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,5 +1,5 @@
-%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
-%global commit_date 20240703
+%global commit 2addb6ae636b0c2f5bb4313436cb42973d397760
+%global commit_date 20240722
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision
@@ -15,7 +15,7 @@ Group:		Applications/Internet
 #Source1:	launch.sh
 Source0:    https://github.com/Vencord/Vesktop/archive/refs/tags/v%{version}.tar.gz
 Requires:   xdg-utils
-BuildRequires:	nodejs-npm git
+BuildRequires:	pnpm git
 # Conflicts:	vesktop-bin

 %description
@@ -45,8 +45,8 @@ EOF


 %build
-npx pnpm@8 install --no-frozen-lockfile
-npx pnpm@8 package:dir
+pnpm install
+pnpm package:dir


 %install
@@ -54,18 +54,22 @@ npx pnpm@8 package:dir
 mkdir -p %buildroot/usr/share/vesktop
 cp -r dist/*-unpacked/. %buildroot/usr/share/vesktop/.

-install -Dm755 dist/*-unpacked/vencorddesktop %buildroot/usr/bin/vencorddesktop
-ln -sf /usr/share/vesktop/vencorddesktop %buildroot/usr/bin/vencorddesktop
-install -Dm644 vesktop.desktop %buildroot/usr/share/applications/vesktop.desktop
-install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/vesktop.png
+ls -alh dist/*
+
+install -Dm755 dist/*-unpacked/vesktop %buildroot%_bindir/vencorddesktop
+ln -sf /usr/share/vesktop/vesktop %buildroot%_bindir/vencorddesktop
+ln -sf /usr/share/vesktop/vesktop %buildroot%_bindir/vesktop
+install -Dm644 vesktop.desktop %buildroot%_datadir/applications/vesktop.desktop
+install -Dm644 build/icon.png %buildroot%_datadir/pixmaps/vesktop.png

 %files
 %doc README.md
 %license LICENSE
-/usr/bin/vencorddesktop
-/usr/share/applications/vesktop.desktop
-/usr/share/pixmaps/vesktop.png
-/usr/share/vesktop/*
+%_bindir/vencorddesktop
+%_bindir/vesktop
+%_datadir/applications/vesktop.desktop
+%_datadir/pixmaps/vesktop.png
+%_datadir/vesktop/*

 %changelog
 * Tue Nov 07 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 0.4.3-1
@@ -3,8 +3,8 @@

 Name:           elementary-wallpapers
 Summary:        Collection of wallpapers from the elementary project
-Version:        7.0.0
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist

 # License breakdown is available in debian/copyright
 License:        CC-BY-SA-4.0 AND CC0-1.0 AND Unlicense
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit a083a14fe65105fc1996ceb1b92165ca3b0cb94e
+%global commit 0b85fddd0123c86fe6b3464143df86a6d0ad6bb9
 %forgemeta

 Name:          lomiri
-Version:       0.2.1
-Release:       1%{?dist}
+Version:       0.3.0
+Release:       1%?dist
 Summary:       A convergent desktop environment by Ubports

 License:       GPLv3 AND LGPLv3
@@ -2,4 +2,7 @@ project pkg {
    rpm {
        spec = "terra-gamescope.spec"
    }
+    labels {
+        multilib = 1
+    }
 }
@@ -89,8 +89,10 @@ BuildRequires:  git
 # libliftoff hasn't bumped soname, but API/ABI has changed for 0.2.0 release
 Requires:       libliftoff%{?_isa} >= %{libliftoff_minver}
 Requires:       xorg-x11-server-Xwayland
-Requires:       gamescope-libs = %{version}-%{release}
-Requires:       gamescope-libs(x86-32) = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
+%ifarch %{ix86}
+Requires:       %{name}-libs(x86-32) = %{version}-%{release}
+%endif
 Recommends:     mesa-dri-drivers
 Recommends:     mesa-vulkan-drivers

@@ -3,7 +3,7 @@
 %define __strip /bin/true

 Name:			osu-lazer
-Version:		2024.718.0
+Version:		2024.718.1
 Release:		1%?dist
 Summary:		The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
 ExclusiveArch:	x86_64
@@ -1,11 +1,11 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit 0041d2a126ae6f35ce1ca2bb5c793ec5853c4343
+%global commit 6352362907149d297684473f3d606b08ce1b93f5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f

-%global commit_date 20240720
+%global commit_date 20240721
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 97f54745459b8651b7a38c174b3a8135224ebd09
+%global commit 881fbb8f81599c6f633158618f05fa05439816ca
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.9
-%global commit_date 20240720
+%global commit_date 20240723
 %global debug_package %nil

 Name:			nim-nightly
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name:			python3-ruff
-Version:		0.5.3
+Version:		0.5.4
 Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
@@ -4,7 +4,7 @@
 %global crate gping

 Name:           rust-gping
-Version:        1.16.1
+Version:        1.17.3
 Release:        1%?dist
 Summary:        Ping, but with a graph

@@ -1,117 +0,0 @@
-
-Subject: RE: Question about Mesa MLAA license
-From: Jorge Jimenez <iryoku@gmail.com>
-Date: 01/08/2013 12:50 PM
-To: Tom Callaway <tcallawa@redhat.com>
-CC: "jorge@iryoku.com" <jorge@iryoku.com>
-
-Yes to both questions.
- 
-Thanks,
-Jorge
- 
-From: Tom Callaway <tcallawa@redhat.com>
-Sent: January 8, 2013 6:49 PM
-To: Jorge Jimenez <iryoku@gmail.com>
-CC: jorge@iryoku.com
-Subject: Re: Question about Mesa MLAA license
- 
-On 01/08/2013 12:39 PM, Jorge Jimenez wrote:
-> Hi Tom,
->
-> What we meant with that is that we made an exception for clause 2.
-> Instead of clause 2, in the case of the Mesa project, you have to name
-> the technique Jimenez's MLAA in the config options of Mesa. We did that
-> just to allow them to solve license issues. This exception should be for
-> the Mesa project, and any project using Mesa, like Fedora.
->
-> We want to widespread usage of our MLAA, so we want to avoid any kind of
-> license complications. Hope current one is good for Fedora, if not
-> please tell, and we'll see what we can do!
-
-Okay, a few more questions:
-
-* If Fedora decides to simply reproduce the quoted statement:
-"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
-Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
-
-Specifically, if this is done as part of documentation included with
-Mesa, is that sufficient to meet clause 2 even if the Mesa config option
-is not set as described in your exception?
-
-* Currently, the Mesa config option for MLAA says: "Morphological
-anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default
-quality". Is this in compliance with your exception?
-
-Thanks again,
-
-~tom
-
-==
-Fedora Project
-
-Subject: RE: Question about Mesa MLAA license
-From: Jorge Jimenez <iryoku@gmail.com>
-Date: 01/08/2013 12:39 PM
-To: "jorge@iryoku.com" <jorge@iryoku.com>, Tom Callaway <tcallawa@redhat.com>
-
-Hi Tom,
- 
-What we meant with that is that we made an exception for clause 2. 
-Instead of clause 2, in the case of the Mesa project, you have to name 
-the technique Jimenez's MLAA in the config options of Mesa. We did that 
-just to allow them to solve license issues. This exception should be for 
-the Mesa project, and any project using Mesa, like Fedora.
- 
-We want to widespread usage of our MLAA, so we want to avoid any kind of 
-license complications. Hope current one is good for Fedora, if not 
-please tell, and we'll see what we can do!
- 
-Cheers,
-Jorge
- 
-From: Tom Callaway <tcallawa@redhat.com>
-Sent: January 8, 2013 6:30 PM
-To: jorge@iryoku.com
-Subject: Question about Mesa MLAA license
- 
-Jorge,
-
-Thanks for all of your fantastic graphics work! I have been auditing
-Fedora (a popular distribution of Linux) for license compliance and I
-came across your MLAA code in Mesa.
-
-The license says:
-
- *    2. Redistributions in binary form must reproduce the following
-statement:
- *
- *       "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
- *        Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
- *
- *       Only for use in the Mesa project, this point 2 is filled by naming the
- *       technique Jimenez's MLAA in the Mesa config options.
-
-That wording is unclear. When you say "Only for use in the Mesa
-project...", it seems like you could either be saying:
-
- This code may only be used as part of Mesa.
-
-OR
-
- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's
-MLAA" in the Mesa config options.
-
-*****
-
-If the first item is true, then we may have to remove the MLAA code from
-Fedora's copy of Mesa. However, looking at the license on your SMAA
-code, I do not believe it to be the case. Please let me know either way!
-
-Thanks in advance,
-
-Tom Callaway
-Fedora Legal
-
-==
-Fedora Project
@@ -1,8 +0,0 @@
-project pkg {
-	rpm {
-		spec = "terra-mesa.spec"
-	}
-    labels {
-        multilib = 1
-    }
-}
@@ -1,784 +0,0 @@
-%global srcname mesa
-
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.3)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 2;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
-
-%ifnarch s390x
-%global with_hardware 1
-%global with_radeonsi 1
-%global with_vmware 1
-%global with_vulkan_hw 1
-%global with_vdpau 1
-%global with_va 1
-%if !0%{?rhel}
-%global with_r300 1
-%global with_r600 1
-%global with_nine 1
-%global with_nvk %{with vulkan_hw}
-%global with_omx 1
-%global with_opencl 1
-%endif
-%global base_vulkan ,amd
-%endif
-
-%ifnarch %{ix86}
-%if !0%{?rhel}
-%global with_teflon 1
-%endif
-%endif
-
-%ifarch %{ix86} x86_64
-%global with_crocus 1
-%global with_i915   1
-%global with_iris   1
-%global with_xa     1
-%global with_intel_clc 1
-%global intel_platform_vulkan ,intel,intel_hasvk
-%endif
-%ifarch x86_64
-%global with_intel_vk_rt 1
-%endif
-
-%ifarch aarch64 x86_64 %{ix86}
-%if !0%{?rhel}
-%global with_lima      1
-%global with_vc4       1
-%endif
-%global with_etnaviv   1
-%global with_freedreno 1
-%global with_kmsro     1
-%global with_panfrost  1
-%global with_tegra     1
-%global with_v3d       1
-%global with_xa        1
-%global extra_platform_vulkan ,broadcom,freedreno,panfrost,imagination-experimental
-%endif
-
-%if !0%{?rhel}
-%global with_libunwind 1
-%global with_lmsensors 1
-%endif
-
-%ifarch %{valgrind_arches}
-%bcond_without valgrind
-%else
-%bcond_with valgrind
-%endif
-
-%global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau}
-Name:           terra-%{srcname}
-Summary:        Mesa graphics libraries
-%global ver 24.2.0-rc1
-Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        %autorelease
-License:        MIT AND BSD-3-Clause AND SGI-B-2.0
-URL:            http://www.mesa3d.org
-
-# define macro for providing srcname and ver
-# %replace_pkg subpackage
-%define replace_pkg() \
-Provides:       %{srcname}-%1 =  %{?epoch:%{epoch}:}%{version}-%{release} \
-Provides:       %{srcname}-%1%{?_isa} =  %{?epoch:%{epoch}:}%{version}-%{release} \
-Conflicts:      %{srcname}-%1 <  %{?epoch:%{epoch}:}%{version}-%{release} \
-Conflicts:      %{srcname}-%1%{?_isa} <  %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-
-Source0:        https://archive.mesa3d.org/%{srcname}-%{ver}.tar.xz
-# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
-# Source1 contains email correspondence clarifying the license terms.
-# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
-Source1:        Mesa-MLAA-License-Clarification-Email.txt
-
-#Patch10:        https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/gnome-shell-glthread-disable.patch
-# Patch11:        https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/0001-llvmpipe-Init-eglQueryDmaBufModifiersEXT-num_modifie.patch
-#Patch12:        https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/0001-Revert-ac-radeonsi-remove-has_syncobj-has_fence_to_h.patch
-# s390x: fix build
-# Patch100:       https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/fix-egl-on-s390x.patch
-
-BuildRequires:  meson >= 1.3.0
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  gettext
-%if 0%{?with_hardware}
-BuildRequires:  kernel-headers
-%endif
-# We only check for the minimum version of pkgconfig(libdrm) needed so that the
-# SRPMs for each arch still have the same build dependencies. See:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1859515
-BuildRequires:  pkgconfig(libdrm) >= 2.4.97
-%if 0%{?with_libunwind}
-BuildRequires:  pkgconfig(libunwind)
-%endif
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(zlib) >= 1.2.3
-BuildRequires:  pkgconfig(libzstd)
-BuildRequires:  pkgconfig(libselinux)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-protocols) >= 1.8
-BuildRequires:  pkgconfig(wayland-client) >= 1.11
-BuildRequires:  pkgconfig(wayland-server) >= 1.11
-BuildRequires:  pkgconfig(wayland-egl-backend) >= 3
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xdamage) >= 1.1
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(xcb-glx) >= 1.8.1
-BuildRequires:  pkgconfig(xxf86vm)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(x11-xcb)
-BuildRequires:  pkgconfig(xcb-dri2) >= 1.8
-BuildRequires:  pkgconfig(xcb-dri3)
-BuildRequires:  pkgconfig(xcb-present)
-BuildRequires:  pkgconfig(xcb-sync)
-BuildRequires:  pkgconfig(xshmfence) >= 1.1
-BuildRequires:  pkgconfig(dri2proto) >= 2.8
-BuildRequires:  pkgconfig(glproto) >= 1.4.14
-BuildRequires:  pkgconfig(xcb-xfixes)
-BuildRequires:  pkgconfig(xcb-randr)
-BuildRequires:  pkgconfig(xrandr) >= 1.3
-BuildRequires:  bison
-BuildRequires:  flex
-%if 0%{?with_lmsensors}
-BuildRequires:  lm_sensors-devel
-%endif
-%if 0%{?with_vdpau}
-BuildRequires:  pkgconfig(vdpau) >= 1.1
-%endif
-%if 0%{?with_va}
-BuildRequires:  pkgconfig(libva) >= 0.38.0
-%endif
-%if 0%{?with_omx}
-BuildRequires:  pkgconfig(libomxil-bellagio)
-%endif
-BuildRequires:  pkgconfig(libelf)
-BuildRequires:  pkgconfig(libglvnd) >= 1.3.2
-BuildRequires:  llvm-devel >= 7.0.0
-%if 0%{?with_teflon}
-BuildRequires:  flatbuffers-devel
-BuildRequires:  flatbuffers-compiler
-BuildRequires:  xtensor-devel
-%endif
-%if 0%{?with_opencl} || 0%{?with_nvk} || 0%{?with_intel_clc}
-BuildRequires:  clang-devel
-BuildRequires:  bindgen
-BuildRequires:  rust-packaging
-BuildRequires:  pkgconfig(libclc)
-BuildRequires:  pkgconfig(SPIRV-Tools)
-BuildRequires:  pkgconfig(LLVMSPIRVLib)
-%endif
-%if 0%{?with_opencl} || 0%{?with_nvk}
-BuildRequires:  cbindgen
-BuildRequires:  (crate(paste) >= 1.0.14 with crate(paste) < 2)
-BuildRequires:  (crate(proc-macro2) >= 1.0.56 with crate(proc-macro2) < 2)
-BuildRequires:  (crate(quote) >= 1.0.25 with crate(quote) < 2)
-BuildRequires:  (crate(syn/clone-impls) >= 2.0.15 with crate(syn/clone-impls) < 3)
-BuildRequires:  (crate(unicode-ident) >= 1.0.6 with crate(unicode-ident) < 2)
-%endif
-%if %{with valgrind}
-BuildRequires:  pkgconfig(valgrind)
-%endif
-BuildRequires:  python3-devel
-BuildRequires:  python3-mako
-%if 0%{?with_intel_clc}
-BuildRequires:  python3-ply
-%endif
-BuildRequires:  python3-pycparser
-BuildRequires:  vulkan-headers
-BuildRequires:  glslang
-%if 0%{?with_vulkan_hw}
-BuildRequires:  pkgconfig(vulkan)
-%endif
-
-%description
-%{summary}.
-
-%package filesystem
-%replace_pkg filesystem
-Summary:        Mesa driver filesystem
-Provides:       mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description filesystem
-%{summary}.
-
-%package libGL
-%replace_pkg libGL
-Summary:        Mesa libGL runtime libraries
-Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       libglvnd-glx%{?_isa} >= 1:1.3.2
-Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libGL
-%{summary}.
-
-%package libGL-devel
-%replace_pkg libGL-devel
-Summary:        Mesa libGL development package
-Requires:       %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       libglvnd-devel%{?_isa} >= 1:1.3.2
-Provides:       libGL-devel
-Provides:       libGL-devel%{?_isa}
-Recommends:     gl-manpages
-
-%description libGL-devel
-%{summary}.
-
-%package libEGL
-%replace_pkg libEGL
-Summary:        Mesa libEGL runtime libraries
-Requires:       libglvnd-egl%{?_isa} >= 1:1.3.2
-Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-%description libEGL
-%{summary}.
-
-%package libEGL-devel
-%replace_pkg libEGL-devel
-Summary:        Mesa libEGL development package
-Requires:       %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       libglvnd-devel%{?_isa} >= 1:1.3.2
-Requires:       %{srcname}-khr-devel%{?_isa}
-Provides:       libEGL-devel
-Provides:       libEGL-devel%{?_isa}
-
-%description libEGL-devel
-%{summary}.
-
-%package dri-drivers
-%replace_pkg dri-drivers
-Summary:        Mesa-based DRI drivers
-Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?with_va}
-Recommends:     %{name}-va-drivers%{?_isa}
-%endif
-
-%description dri-drivers
-%{summary}.
-
-%if 0%{?with_omx}
-%package omx-drivers
-%replace_pkg omx-drivers
-Summary:        Mesa-based OMX drivers
-Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description omx-drivers
-%{summary}.
-%endif
-
-%if 0%{?with_va}
-%package        va-drivers
-%replace_pkg va-drivers
-Provides:       %{srcname}-va-drivers = %{?epoch:%{epoch}:}%{version}-%{release}
-Summary:        Mesa-based VA-API video acceleration drivers
-Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      %{name}-vaapi-drivers < 22.2.0-5
-
-%description va-drivers
-%{summary}.
-%endif
-
-%if 0%{?with_vdpau}
-%package        vdpau-drivers
-%replace_pkg vdpau-drivers
-Summary:        Mesa-based VDPAU drivers
-Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description vdpau-drivers
-%{summary}.
-%endif
-
-%package libOSMesa
-%replace_pkg libOSMesa
-Summary:        Mesa offscreen rendering libraries
-Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       libOSMesa
-Provides:       libOSMesa%{?_isa}
-
-%description libOSMesa
-%{summary}.
-
-%package libOSMesa-devel
-%replace_pkg libOSMesa-devel
-Summary:        Mesa offscreen rendering development package
-Requires:       %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libOSMesa-devel
-%{summary}.
-
-%package libgbm
-%replace_pkg libgbm
-Summary:        Mesa gbm runtime library
-Provides:       libgbm
-Provides:       libgbm%{?_isa}
-Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-# If mesa-dri-drivers are installed, they must match in version. This is here to prevent using
-# older mesa-dri-drivers together with a newer mesa-libgbm and its dependants.
-# See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 .
-Requires:       (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa})
-
-%description libgbm
-%{summary}.
-
-%package libgbm-devel
-%replace_pkg libgbm-devel
-Summary:        Mesa libgbm development package
-Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       libgbm-devel
-Provides:       libgbm-devel%{?_isa}
-
-%description libgbm-devel
-%{summary}.
-
-%if 0%{?with_xa}
-%package libxatracker
-%replace_pkg libxatracker
-Summary:        Mesa XA state tracker
-Provides:       libxatracker
-Provides:       libxatracker%{?_isa}
-
-%description libxatracker
-%{summary}.
-
-%package libxatracker-devel
-%replace_pkg libxatracker-devel
-Summary:        Mesa XA state tracker development package
-Requires:       %{name}-libxatracker%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       libxatracker-devel
-Provides:       libxatracker-devel%{?_isa}
-
-%description libxatracker-devel
-%{summary}.
-%endif
-
-%package libglapi
-%replace_pkg libglapi
-Summary:        Mesa shared glapi
-Provides:       libglapi
-Provides:       libglapi%{?_isa}
-# If mesa-dri-drivers are installed, they must match in version. This is here to prevent using
-# older mesa-dri-drivers together with a newer mesa-libglapi or its dependants.
-# See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 .
-Requires:       (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa})
-
-%description libglapi
-%{summary}.
-
-%if 0%{?with_opencl}
-%package libOpenCL
-%replace_pkg libOpenCL
-Summary:        Mesa OpenCL runtime library
-Requires:       ocl-icd%{?_isa}
-Requires:       libclc%{?_isa}
-Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       opencl-filesystem
-
-%description libOpenCL
-%{summary}.
-
-%package libOpenCL-devel
-%replace_pkg libOpenCL-devel
-Summary:        Mesa OpenCL development package
-Requires:       %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libOpenCL-devel
-%{summary}.
-%endif
-
-%if 0%{?with_teflon}
-%package libTeflon
-%replace_pkg libTeflon
-Summary:        Mesa TensorFlow Lite delegate
-
-
-%description libTeflon
-%{summary}.
-%endif
-
-%if 0%{?with_nine}
-%package libd3d
-%replace_pkg libd3d
-Summary:        Mesa Direct3D9 state tracker
-
-%description libd3d
-%{summary}.
-
-%package libd3d-devel
-%replace_pkg libd3d-devel
-Summary:        Mesa Direct3D9 state tracker development package
-Requires:       %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libd3d-devel
-%{summary}.
-%endif
-
-%package vulkan-drivers
-%replace_pkg vulkan-drivers
-Summary:        Mesa Vulkan drivers
-Requires:       vulkan%{_isa}
-Obsoletes:      mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description vulkan-drivers
-The drivers with support for the Vulkan API.
-
-%prep
-%autosetup -n %{srcname}-%{ver} -p1
-cp %{SOURCE1} docs/
-
-%build
-# ensure standard Rust compiler flags are set
-export RUSTFLAGS="%build_rustflags"
-
-%if 0%{?with_nvk}
-export MESON_PACKAGE_CACHE_DIR="%{cargo_registry}/"
-# So... Meson can't actually find them without tweaks
-%define inst_crate_nameversion() %(basename %{cargo_registry}/%{1}-*)
-%define rewrite_wrap_file() sed -e "/source.*/d" -e "s/%{1}-.*/%{inst_crate_nameversion %{1}}/" -i subprojects/%{1}.wrap
-
-%rewrite_wrap_file proc-macro2
-%rewrite_wrap_file quote
-%rewrite_wrap_file syn
-%rewrite_wrap_file unicode-ident
-%rewrite_wrap_file paste
-%endif
-
-# We've gotten a report that enabling LTO for mesa breaks some games. See
-# https://bugzilla.redhat.com/show_bug.cgi?id=1862771 for details.
-# Disable LTO for now
-%define _lto_cflags %{nil}
-
-%meson \
-  -Dplatforms=x11,wayland \
-  -Ddri3=enabled \
-  -Dosmesa=true \
-%if 0%{?with_hardware}
-  -Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \
-%else
-  -Dgallium-drivers=swrast,virgl \
-%endif
-  -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \
-  -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
-  -Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \
-  -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \
-  -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
-  -Dteflon=%{?with_teflon:true}%{!?with_teflon:false} \
-  -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
-%if 0%{?with_opencl}
-  -Dgallium-rusticl=true \
-%endif
-  -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec \
-  -Dvulkan-drivers=%{?vulkan_drivers} \
-  -Dvulkan-layers=device-select \
-  -Dshared-glapi=enabled \
-  -Dgles1=enabled \
-  -Dgles2=enabled \
-  -Dopengl=true \
-  -Dgbm=enabled \
-  -Dglx=dri \
-  -Degl=enabled \
-  -Dglvnd=enabled \
-%if 0%{?with_intel_clc}
-  -Dintel-clc=enabled \
-%endif
-  -Dintel-rt=%{?with_intel_vk_rt:enabled}%{!?with_intel_vk_rt:disabled} \
-  -Dmicrosoft-clc=disabled \
-  -Dllvm=enabled \
-  -Dshared-llvm=enabled \
-  -Dvalgrind=%{?with_valgrind:enabled}%{!?with_valgrind:disabled} \
-  -Dbuild-tests=false \
-  -Dselinux=true \
-%if !0%{?with_libunwind}
-  -Dlibunwind=disabled \
-%endif
-%if !0%{?with_lmsensors}
-  -Dlmsensors=disabled \
-%endif
-  -Dandroid-libbacktrace=disabled \
-%ifarch %{ix86}
-  -Dglx-read-only-text=true \
-%endif
-  %{nil}
-%meson_build
-
-
-%install
-%meson_install
-
-# libvdpau opens the versioned name, don't bother including the unversioned
-rm -vf %{buildroot}%{_libdir}/vdpau/*.so
-# likewise glvnd
-rm -vf %{buildroot}%{_libdir}/libGLX_mesa.so
-rm -vf %{buildroot}%{_libdir}/libEGL_mesa.so
-# XXX can we just not build this
-rm -vf %{buildroot}%{_libdir}/libGLES*
-
-# glvnd needs a default provider for indirect rendering where it cannot
-# determine the vendor
-ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0
-
-# this keeps breaking, check it early.  note that the exit from eu-ftr is odd.
-pushd %{buildroot}%{_libdir}
-for i in libOSMesa*.so libGL.so ; do
-    eu-findtextrel $i && exit 1
-done
-popd
-
-%files filesystem
-%doc docs/Mesa-MLAA-License-Clarification-Email.txt
-%dir %{_libdir}/dri
-%if 0%{?with_hardware}
-%if 0%{?with_vdpau}
-%dir %{_libdir}/vdpau
-%endif
-%endif
-
-%files libGL
-%{_libdir}/libGLX_mesa.so.0*
-%{_libdir}/libGLX_system.so.0*
-%files libGL-devel
-%dir %{_includedir}/GL/internal
-%{_includedir}/GL/internal/dri_interface.h
-%{_libdir}/pkgconfig/dri.pc
-%{_libdir}/libglapi.so
-
-%files libEGL
-%{_datadir}/glvnd/egl_vendor.d/50_mesa.json
-%{_libdir}/libEGL_mesa.so.0*
-%files libEGL-devel
-%dir %{_includedir}/EGL
-%{_includedir}/EGL/eglext_angle.h
-%{_includedir}/EGL/eglmesaext.h
-
-%files libglapi
-%{_libdir}/libglapi.so.0
-%{_libdir}/libglapi.so.0.*
-
-%files libOSMesa
-%{_libdir}/libOSMesa.so.8*
-%files libOSMesa-devel
-%dir %{_includedir}/GL
-%{_includedir}/GL/osmesa.h
-%{_libdir}/libOSMesa.so
-%{_libdir}/pkgconfig/osmesa.pc
-
-%files libgbm
-%{_libdir}/libgbm.so.1
-%{_libdir}/libgbm.so.1.*
-%files libgbm-devel
-%{_libdir}/libgbm.so
-%{_includedir}/gbm.h
-%{_libdir}/pkgconfig/gbm.pc
-
-%if 0%{?with_xa}
-%files libxatracker
-%if 0%{?with_hardware}
-%{_libdir}/libxatracker.so.2
-%{_libdir}/libxatracker.so.2.*
-%endif
-
-%files libxatracker-devel
-%if 0%{?with_hardware}
-%{_libdir}/libxatracker.so
-%{_includedir}/xa_tracker.h
-%{_includedir}/xa_composite.h
-%{_includedir}/xa_context.h
-%{_libdir}/pkgconfig/xatracker.pc
-%endif
-%endif
-
-%if 0%{?with_teflon}
-%files libTeflon
-%{_libdir}/libteflon.so
-%endif
-
-%if 0%{?with_opencl}
-%files libOpenCL
-%{_libdir}/libMesaOpenCL.so.*
-%{_libdir}/libRusticlOpenCL.so.*
-%{_sysconfdir}/OpenCL/vendors/mesa.icd
-%{_sysconfdir}/OpenCL/vendors/rusticl.icd
-
-%files libOpenCL-devel
-%{_libdir}/libMesaOpenCL.so
-%{_libdir}/libRusticlOpenCL.so
-%endif
-
-%if 0%{?with_nine}
-%files libd3d
-%dir %{_libdir}/d3d/
-%{_libdir}/d3d/*.so.*
-
-%files libd3d-devel
-%{_libdir}/pkgconfig/d3d.pc
-%{_includedir}/d3dadapter/
-%{_libdir}/d3d/*.so
-%endif
-
-%files dri-drivers
-%dir %{_datadir}/drirc.d
-%{_datadir}/drirc.d/00-mesa-defaults.conf
-%{_libdir}/dri/kms_swrast_dri.so
-%{_libdir}/dri/swrast_dri.so
-%{_libdir}/dri/virtio_gpu_dri.so
-
-%if 0%{?with_hardware}
-%if 0%{?with_r300}
-%{_libdir}/dri/r300_dri.so
-%endif
-%if 0%{?with_radeonsi}
-%if 0%{?with_r600}
-%{_libdir}/dri/r600_dri.so
-%endif
-%{_libdir}/dri/radeonsi_dri.so
-%endif
-%ifarch %{ix86} x86_64
-%{_libdir}/dri/crocus_dri.so
-%{_libdir}/dri/i915_dri.so
-%{_libdir}/dri/iris_dri.so
-%endif
-%ifarch aarch64 x86_64 %{ix86}
-%{_libdir}/dri/ingenic-drm_dri.so
-%{_libdir}/dri/imx-drm_dri.so
-%{_libdir}/dri/imx-lcdif_dri.so
-%{_libdir}/dri/kirin_dri.so
-%{_libdir}/dri/komeda_dri.so
-%{_libdir}/dri/mali-dp_dri.so
-%{_libdir}/dri/mcde_dri.so
-%{_libdir}/dri/mxsfb-drm_dri.so
-%{_libdir}/dri/rcar-du_dri.so
-%{_libdir}/dri/stm_dri.so
-%endif
-%if 0%{?with_vc4}
-%{_libdir}/dri/vc4_dri.so
-%endif
-%if 0%{?with_v3d}
-%{_libdir}/dri/v3d_dri.so
-%endif
-%if 0%{?with_freedreno}
-%{_libdir}/dri/kgsl_dri.so
-%{_libdir}/dri/msm_dri.so
-%endif
-%if 0%{?with_etnaviv}
-%{_libdir}/dri/etnaviv_dri.so
-%endif
-%if 0%{?with_tegra}
-%{_libdir}/dri/tegra_dri.so
-%endif
-%if 0%{?with_lima}
-%{_libdir}/dri/lima_dri.so
-%endif
-%if 0%{?with_panfrost}
-%{_libdir}/dri/panfrost_dri.so
-%{_libdir}/dri/panthor_dri.so
-%endif
-%{_libdir}/dri/nouveau_dri.so
-%if 0%{?with_vmware}
-%{_libdir}/dri/vmwgfx_dri.so
-%endif
-%endif
-%if 0%{?with_opencl}
-%dir %{_libdir}/gallium-pipe
-%{_libdir}/gallium-pipe/*.so
-%endif
-%if 0%{?with_kmsro}
-%{_libdir}/dri/armada-drm_dri.so
-%{_libdir}/dri/exynos_dri.so
-%{_libdir}/dri/gm12u320_dri.so
-%{_libdir}/dri/hdlcd_dri.so
-%{_libdir}/dri/hx8357d_dri.so
-%{_libdir}/dri/ili9163_dri.so
-%{_libdir}/dri/ili9225_dri.so
-%{_libdir}/dri/ili9341_dri.so
-%{_libdir}/dri/ili9486_dri.so
-%{_libdir}/dri/imx-dcss_dri.so
-%{_libdir}/dri/mediatek_dri.so
-%{_libdir}/dri/meson_dri.so
-%{_libdir}/dri/mi0283qt_dri.so
-%{_libdir}/dri/panel-mipi-dbi_dri.so
-%{_libdir}/dri/pl111_dri.so
-%{_libdir}/dri/repaper_dri.so
-%{_libdir}/dri/rockchip_dri.so
-%{_libdir}/dri/rzg2l-du_dri.so
-%{_libdir}/dri/ssd130x_dri.so
-%{_libdir}/dri/st7586_dri.so
-%{_libdir}/dri/st7735r_dri.so
-%{_libdir}/dri/sti_dri.so
-%{_libdir}/dri/sun4i-drm_dri.so
-%{_libdir}/dri/udl_dri.so
-%{_libdir}/dri/zynqmp-dpsub_dri.so
-%endif
-%if 0%{?with_vulkan_hw}
-%{_libdir}/dri/zink_dri.so
-%endif
-
-%if 0%{?with_omx}
-%files omx-drivers
-%{_libdir}/bellagio/libomx_mesa.so
-%endif
-
-%if 0%{?with_va}
-%files va-drivers
-%{_libdir}/dri/nouveau_drv_video.so
-%if 0%{?with_r600}
-%{_libdir}/dri/r600_drv_video.so
-%endif
-%if 0%{?with_radeonsi}
-%{_libdir}/dri/radeonsi_drv_video.so
-%endif
-%{_libdir}/dri/virtio_gpu_drv_video.so
-%endif
-
-%if 0%{?with_vdpau}
-%files vdpau-drivers
-%{_libdir}/vdpau/libvdpau_nouveau.so.1*
-%if 0%{?with_r600}
-%{_libdir}/vdpau/libvdpau_r600.so.1*
-%endif
-%if 0%{?with_radeonsi}
-%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
-%endif
-%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
-%endif
-
-%files vulkan-drivers
-%{_libdir}/libvulkan_lvp.so
-%{_datadir}/vulkan/icd.d/lvp_icd.*.json
-%{_libdir}/libVkLayer_MESA_device_select.so
-%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
-%if 0%{?with_vulkan_hw}
-%{_libdir}/libvulkan_radeon.so
-%{_datadir}/drirc.d/00-radv-defaults.conf
-%{_datadir}/vulkan/icd.d/radeon_icd.*.json
-%if 0%{?with_nvk}
-%{_libdir}/libvulkan_nouveau.so
-%{_datadir}/vulkan/icd.d/nouveau_icd.*.json
-%endif
-%ifarch %{ix86} x86_64
-%{_libdir}/libvulkan_intel.so
-%{_datadir}/vulkan/icd.d/intel_icd.*.json
-%{_libdir}/libvulkan_intel_hasvk.so
-%{_datadir}/vulkan/icd.d/intel_hasvk_icd.*.json
-%endif
-%ifarch aarch64 x86_64 %{ix86}
-%{_libdir}/libvulkan_broadcom.so
-%{_datadir}/vulkan/icd.d/broadcom_icd.*.json
-%{_libdir}/libvulkan_freedreno.so
-%{_datadir}/vulkan/icd.d/freedreno_icd.*.json
-%{_libdir}/libvulkan_panfrost.so
-%{_datadir}/vulkan/icd.d/panfrost_icd.*.json
-%{_libdir}/libpowervr_rogue.so
-%{_libdir}/libvulkan_powervr_mesa.so
-%{_datadir}/vulkan/icd.d/powervr_mesa_icd.*.json
-%endif
-%endif
-
-%changelog
-%autochangelog
@@ -1,3 +0,0 @@
-let v = gitlab_tag("gitlab.freedesktop.org", "176");
-v.crop(5);
-rpm.global("ver", v);
@@ -1,5 +1,5 @@
 Name:		limine
-Version:	7.11.0
+Version:	7.12.0
 Release:	1%?dist
 Summary:	Modern, advanced, portable, multiprotocol bootloader
 License:	BSD-2-Clause
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '39'
-config_opts['target_arch'] = 'aarch64'
-config_opts['legal_host_arches'] = ('aarch64',)
-
-include('templates/terra.tpl')
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '39'
-config_opts['target_arch'] = 'i686'
-config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
-
-include('templates/terra.tpl')
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '39'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-
-include('templates/terra.tpl')
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '40'
-config_opts['target_arch'] = 'aarch64'
-config_opts['legal_host_arches'] = ('aarch64',)
-
-include('templates/terra.tpl')
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '40'
-config_opts['target_arch'] = 'i686'
-config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
-
-include('templates/terra.tpl')
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '40'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-
-include('templates/terra.tpl')
@@ -1,51 +1,34 @@
 Name:           terra-mock-configs
-Version:        11
+Version:        1.0.0
 Release:        1%{?dist}
+Epoch:          1
 Summary:        Mock configs for Terra repos

 License:        MIT
-URL:            https://terra.fyralabs.com
-Source0:        terra.tpl
-Source3:        terra-39-x86_64.cfg
-Source4:        terra-39-aarch64.cfg
-Source5:        terra-40-x86_64.cfg
-Source6:        terra-40-aarch64.cfg
-Source7:        terra-40-i386.cfg
-Source8:        terra-39-i386.cfg
-Source9:        terra-rawhide-x86_64.cfg
-Source10:       terra-rawhide-aarch64.cfg
-Source11:       terra-rawhide-i386.cfg
+URL:            https://github.com/terrapkg/mock-configs
+Source0:        %url/archive/refs/tags/v%version.tar.gz

 BuildRequires:  mock-core-configs
 Requires:       mock-core-configs
 BuildArch:      noarch

-Provides: anda-mock-configs = %{version}-%{release}
+Provides: anda-mock-configs = %{epoch}:%{version}-%{release}
 Obsoletes: anda-mock-configs < 3-2%{?dist}

 %description
 %{summary}

 %prep
+%autosetup -n mock-configs-%version

 %build

-
 %install
 mkdir -p %{buildroot}%{_sysusersdir}
 mkdir -p %{buildroot}%{_sysconfdir}/mock/templates

-cp -v %{SOURCE0} %{buildroot}%{_sysconfdir}/mock/templates/
-cp -v %{SOURCE3} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE4} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE5} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE6} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE7} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE8} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE9} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE10} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE11} %{buildroot}%{_sysconfdir}/mock/
-
+cp -v terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/
+cp -v *.cfg %{buildroot}%{_sysconfdir}/mock/

 %files
 %config %{_sysconfdir}/mock/templates/terra.tpl
@@ -53,8 +36,10 @@ cp -v %{SOURCE11} %{buildroot}%{_sysconfdir}/mock/
 %config %{_sysconfdir}/mock/terra-*-aarch64.cfg
 %config %{_sysconfdir}/mock/terra-*-i386.cfg

-
 %changelog
+* Mon Jul 22 2024 Lleyton Gray <lleyton@fyralabs.com> - 1:1.0.0-1
+- Migrate to pulling configs from an external repository
+
 * Thu Jul 18 2024 Cappy Ishihara <cappy@fyralabs.com> - 11-1
 - Include multilib mock files for x86-based systems (backwards compatibility)

@@ -1,5 +0,0 @@
-config_opts['releasever'] = 'rawhide'
-config_opts['target_arch'] = 'aarch64'
-config_opts['legal_host_arches'] = ('aarch64',)
-
-include('templates/terra.tpl')
@@ -1,5 +0,0 @@
-config_opts['releasever'] = 'rawhide'
-config_opts['target_arch'] = 'i686'
-config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
-
-include('templates/terra.tpl')
@@ -1,5 +0,0 @@
-config_opts['releasever'] = 'rawhide'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-
-include('templates/terra.tpl')
@@ -1,202 +0,0 @@
-config_opts['root'] = 'terra-{{ releasever }}-{{ target_arch }}'
-config_opts['dist'] = 'fc{{ releasever }}'  # only useful for --resultdir variable subst
-config_opts['macros']['%dist'] = '.fc{{ releasever }}'
-config_opts['package_manager'] = 'dnf5'
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:{{ releasever }}'
-config_opts['mirrored'] = config_opts['target_arch'] != 'i686'
-config_opts['chroot_setup_cmd'] = 'install @{% if mirrored %}buildsys-{% endif %}build'
-config_opts['plugin_conf']['root_cache_enable'] = True
-config_opts['plugin_conf']['yum_cache_enable'] = True
-config_opts['plugin_conf']['ccache_enable'] = True
-config_opts['plugin_conf']['ccache_opts']['compress'] = 'on'
-config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '10G'
-# repos
-dnf_conf = """
-
-[main]
-keepcache=1
-debuglevel=2a
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-install_weak_deps=0
-metadata_expire=0
-best=1
-module_platform_id=platform:fc{{ releasever }}
-protected_packages=
-
-[terra]
-name=Terra $releasever
-baseurl=https://repos.fyralabs.com/terra$releasever
-type=rpm
-skip_if_unavailable=True
-gpgcheck=1
-repo_gpgcheck=1
-gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
-enabled=1
-enabled_metadata=1
-metadata_expire=4h
-
-# Only used for multilib builds, pulls straight from fedora koji
-# Use /rawhide/latest instead of /f{{ releasever }}-build/latest for rawhide
-[local-f{{ releasever }}-build]
-name=local
-baseurl=https://kojipkgs.fedoraproject.org/repos/f{{ releasever }}-build/latest/$basearch/
-cost=2000
-# enabled only if not mirrored, and not rawhide
-enabled={% if not mirrored and releasever != 'rawhide' %}1{% else %}0{% endif %}
-skip_if_unavailable=False
-
-[local-rawhide-build]
-name=local-rawhide
-baseurl=https://kojipkgs.fedoraproject.org/repos/rawhide/latest/$basearch/
-cost=2000
-# enabled only if not mirrored, and rawhide
-enabled={% if not mirrored and releasever == 'rawhide' %}1{% else %}0{% endif %}
-skip_if_unavailable=False
-
-
-
-
-{% if mirrored %}
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ releasever }}-primary
-gpgcheck=1
-skip_if_unavailable=False
-exclude=fedora-release*
-
-[updates]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ releasever }}-primary
-gpgcheck=1
-skip_if_unavailable=False
-
-[updates-testing]
-name=updates-testing
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ releasever }}-primary
-gpgcheck=1
-skip_if_unavailable=False
-
-[fedora-debuginfo]
-name=fedora-debuginfo
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ releasever }}-primary
-gpgcheck=1
-skip_if_unavailable=False
-
-[updates-debuginfo]
-name=updates-debuginfo
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ releasever }}-primary
-gpgcheck=1
-skip_if_unavailable=False
-
-[updates-testing-debuginfo]
-name=updates-testing-debuginfo
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ releasever }}-primary
-gpgcheck=1
-skip_if_unavailable=False
-
-[fedora-source]
-name=fedora-source
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ releasever }}-primary
-gpgcheck=1
-enabled=0
-skip_if_unavailable=False
-
-[updates-source]
-name=updates-source
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ releasever }}-primary
-gpgcheck=1
-enabled=0
-skip_if_unavailable=False
-
-# modular
-
-[fedora-modular]
-name=Fedora Modular $releasever - $basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
-# if you want to enable it, you should set best=0
-# see https://bugzilla.redhat.com/show_bug.cgi?id=1673851
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-skip_if_unavailable=False
-
-[fedora-modular-debuginfo]
-name=Fedora Modular $releasever - $basearch - Debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-skip_if_unavailable=False
-
-[fedora-modular-source]
-name=Fedora Modular $releasever - Source
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-skip_if_unavailable=False
-
-[updates-modular]
-name=Fedora Modular $releasever - $basearch - Updates
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-modular-debuginfo]
-name=Fedora Modular $releasever - $basearch - Updates - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-modular-source]
-name=Fedora Modular $releasever - Updates Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-{% endif %}
-"""
-
-
-config_opts['dnf.conf'] = dnf_conf
-config_opts['dnf5.conf'] = dnf_conf
@@ -0,0 +1 @@
+rpm.version(gh("terrapkg/mock-configs"));
@@ -1,6 +1,6 @@
 Name:           terra-release
-Version:        40
-Release:        3
+Version:        41
+Release:        2
 Summary:        Release package for Terra

 License:        MIT
@@ -24,6 +24,9 @@ install -D -p -m 0644 -t %{buildroot}%{_sysconfdir}/yum.repos.d %{SOURCE0}
 %config(noreplace) %{_sysconfdir}/yum.repos.d/terra.repo

 %changelog
+* Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 41-1
+- Update for Terra 41 (in this case rawhide)
+
 * Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 40-1
 - Update for Terra 40 (in this case rawhide)

@@ -9,6 +9,7 @@ gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
 repo_gpgcheck=1
 enabled=1
 enabled_metadata=1
+countme=1

 [terra-source]
 name=Terra $releasever - Source
@@ -5,7 +5,7 @@
 %global crate anda

 Name:           rust-anda
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%?dist
 Summary:        Andaman Build toolchain
Author	SHA1	Message	Date
madomado	fc9532e096	remove --no-frozen-lockfile? Signed-off-by: madomado <madonuko@outlook.com>	2024-07-23 22:56:38 +08:00
madomado	e44b7abb17	maybe use system pnpm Signed-off-by: madomado <madonuko@outlook.com>	2024-07-23 22:46:01 +08:00
madomado	734c2785bf	Update vencord-desktop.spec Signed-off-by: madomado <madonuko@outlook.com>	2024-07-23 22:37:41 +08:00
madomado	92058bb718	fix: vencord-desktop Signed-off-by: madomado <madonuko@outlook.com>	2024-07-23 22:29:06 +08:00
Raboneko	caa4db15ee	bump: vencord-desktop	2024-07-23 14:14:54 +00:00
Raboneko	fff5b6b8c6	bump: vencord-desktop	2024-07-23 13:55:58 +00:00
Raboneko	722acd8ca2	bump: vencord-desktop	2024-07-23 13:45:45 +00:00
Raboneko	1e5950f741	bump: vencord-desktop	2024-07-23 13:36:21 +00:00
Raboneko	fd2cb67b90	bump: vencord-desktop	2024-07-23 13:23:36 +00:00
Raboneko	176393c950	bump: anda	2024-07-23 11:18:09 +00:00
lea	f3e82f8b01	feat: enable counting (#1603 )	2024-07-23 13:57:01 +08:00
lea	f3fc94ec24	fix: bump rawhide release ver to 41 (#1602 )	2024-07-23 13:48:44 +08:00
madomado	730400aa95	fix(ci/update): better filter (#1576 ) * fix(ci/update): better filter This requires anda 0.2.2 Signed-off-by: madomado <madonuko@outlook.com> * bump: discord-canary-openasar discord-canary envision preview stable osu-lazer libhelium terra-mesa tau-helium anda * Revert "bump: discord-canary-openasar discord-canary envision preview stable osu-lazer libhelium terra-mesa tau-helium anda" This reverts commit `69e3695090`. --------- Signed-off-by: madomado <madonuko@outlook.com> Co-authored-by: Raboneko <raboneko@fyralabs.com>	2024-07-22 22:10:45 -07:00
lea	da92fc7546	feat: seperate mock configs (#1599 ) * feat: seperate mock configs * i am not cappy * ci: clone main from mock-configs	2024-07-23 13:01:55 +08:00
Raboneko	1ddcd3612c	bump(nightly): nim-nightly	2024-07-23 01:18:29 +00:00
Raboneko	c092c78531	bump: discord-openasar discord	2024-07-22 19:17:55 +00:00
Raboneko	29e3eabc59	bump: elementary-wallpapers	2024-07-22 17:45:36 +00:00
Raboneko	63bc6f791f	bump: envision	2024-07-22 11:25:36 +00:00
Raboneko	bd667caf37	bump: envision	2024-07-22 08:26:28 +00:00
Raboneko	8414d5b1d1	bump: gping	2024-07-21 23:38:18 +00:00
Raboneko	71186687fe	bump: gping	2024-07-21 23:21:03 +00:00
Raboneko	e5d0485afd	bump: envision	2024-07-21 19:14:18 +00:00
Raboneko	3718c1d063	bump: limine	2024-07-21 12:53:20 +00:00
Raboneko	ce063e4851	bump: envision	2024-07-21 07:13:00 +00:00
Raboneko	a13a326135	bump: envision	2024-07-21 06:40:25 +00:00
Raboneko	578fe4d548	bump(nightly): prismlauncher-nightly nim-nightly	2024-07-21 01:23:43 +00:00
Raboneko	e9780682ef	bump: ruff	2024-07-20 18:28:01 +00:00
Raboneko	abb75e89df	bump: lomiri	2024-07-20 15:45:27 +00:00
Cappy Ishihara	675951d4e7	fix: gamescope package (#1593 ) * fix: gamescope package * remove mesa from stash * fix spec again	2024-07-20 21:22:30 +08:00
madomado	ab55e71494	feat(ci): multilib (#1594 ) See #1549	2024-07-20 19:51:31 +07:00
Raboneko	5a35b7161c	bump: envision	2024-07-20 10:22:59 +00:00
Raboneko	08e00d250d	bump: osu-lazer	2024-07-20 09:59:16 +00:00
Raboneko	dfe871a99b	bump: envision	2024-07-20 09:27:41 +00:00
madomado	42b47fae0b	rm: terra-mesa (#1587 ) This is temporary and prevents potential conflicts with Fedora. Signed-off-by: madomado <madonuko@outlook.com>	2024-07-19 23:25:03 -07:00