remove mesa for now

2026-05-31 09:01:55 +00:00 · 2024-07-20 13:22:23 +07:00
96 changed files with 496 additions and 421 deletions
@@ -51,27 +51,15 @@ 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 mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl

      - name: Build with Andaman
-        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
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -106,7 +94,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success() && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
      - name: Notify Madoguchi (Failure)
        if: ( cancelled() || failure() ) && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
@@ -56,22 +56,18 @@ 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 mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+      - 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: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.pkg
+        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -104,7 +100,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
      - name: Notify Madoguchi (Failure)
        if: cancelled() || failure()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
@@ -22,22 +22,18 @@ 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 mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+      - 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: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.pkg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -71,7 +67,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
      - name: Notify Madoguchi (Failure)
        if: cancelled() || failure()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
@@ -2,7 +2,7 @@ set -x

 dirs=$2
 dirs=${dirs/\/pkg/}
-export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1,\"commit\":\"$7\"}"
+export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1,\"commit\":\"%6\"}"

 if [[ $1 == false ]]; then
 	d=${p/\%v/?}
@@ -17,5 +17,5 @@ for f in anda-build/rpm/rpms/*; do
 	r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@")
 	d=${p/\%v/$v}
 	d=${d/\%r/$r}
-	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
 done
@@ -48,6 +48,5 @@ jobs:
            }
            copy_over f39 || true
            copy_over f40 || true
-            copy_over f41 || true
            git push -u origin --all
          fi
@@ -25,7 +25,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: anda update -vv --filters nightly=0
+        run: anda update -vv
        env:
          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full
@@ -49,6 +49,5 @@ jobs:
            }
            copy_over f39 || true
            copy_over f40 || true
-            copy_over f41 || true
            git push -u origin --all
          fi
@@ -1,2 +1 @@
 anda-build/
-**/*.tar*
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.462
+Version:        0.0.454
 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-canary
-Version:        0.0.462
+Version:        0.0.454
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.61
+Version:        0.0.60
 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-ptb-openasar
-Version:        0.0.96
+Version:        0.0.95
 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-ptb
-Version:        0.0.96
+Version:        0.0.95
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

 Name:           envision
@@ -17,7 +17,6 @@ BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
 BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  openssl-devel-engine
-BuildRequires:  openxr-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
@@ -1,7 +1,7 @@
-%global commit 6107112b32e748c55dd2d344b8871ad60c0c504c
+%global commit e509ec0aaffce74e520702e16e3e21ea0f168940
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240727
-%global ver 0.38.0
+%global commit_date 20240720
+%global ver v0.38.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -1,11 +1,7 @@
 if filters.contains("nightly") {
 	rpm.global("commit", gh_commit("mpv-player/mpv"));
 	if rpm.changed() {
-		let v = gh("mpv-player/mpv");
-		if v.starts_with("v") {
-			v.crop(1);
-		}
-		rpm.global("ver", v);
+		rpm.global("ver", gh("mpv-player/mpv"));
 		rpm.global("commit_date", date());
 		rpm.release();
 	}
@@ -5,8 +5,8 @@

 Name:           elementary-calendar
 Summary:        Desktop calendar app designed for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/calendar
@@ -5,8 +5,8 @@

 Name:           elementary-code
 Summary:        Code editor from elementary
-Version:        7.3.0
-Release:        1%?dist
+Version:        7.2.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/%{srcname}
@@ -10,8 +10,8 @@ utilizes Granite for a consistent and slick UI.}

 Name:           elementary-music
 Summary:        Music player and library from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.1.0
+Release:        2%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -41,7 +41,6 @@ BuildRequires:  pkgconfig(libpeas-1.0)
 BuildRequires:  pkgconfig(libpeas-gtk-1.0)
 BuildRequires:  pkgconfig(taglib_c)
 BuildRequires:  pkgconfig(zeitgeist-2.0)
-BuildRequires:  pkgconfig(libadwaita-1)

 Requires:       hicolor-icon-theme

@@ -100,6 +99,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
 %{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/locale/*/LC_MESSAGES/%{appname}.mo

 %files devel

@@ -3,8 +3,8 @@


 Name:           elementary-notifications
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.1
+Release:        1%{?dist}
 Summary:        GTK Notification server for Pantheon

 License:        GPL-3.0
@@ -54,6 +54,7 @@ appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/%appname.meta
 %{_bindir}/%{appname}.demo
 %{_datadir}/applications/%{appname}.demo.desktop

+%config %{_sysconfdir}/xdg/autostart/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_metainfodir}/%{appname}.metainfo.xml

@@ -3,8 +3,8 @@

 Name:           elementary-screenshot-tool
 Summary:        Screenshot tool designed for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.0.4
+Release:        2%{?dist}
 License:        LGPL-3.0

 URL:            https://github.com/elementary/screenshot
@@ -3,8 +3,8 @@
 %global iface   io.elementary.SettingsDaemon.AccountsService

 Name:           elementary-settings-daemon
-Version:        8.0.0
-Release:        1%?dist
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Settings Daemon and Portal for Pantheon
 License:        GPL-3.0-or-later

@@ -26,8 +26,6 @@ BuildRequires:  pkgconfig(granite) >= 5.3.0
 BuildRequires:  pkgconfig(libgeoclue-2.0)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(fwupd)
-BuildRequires:  pkgconfig(gexiv2)
-BuildRequires:  pkgconfig(packagekit-glib2)

 Requires:       xdg-desktop-portal

@@ -47,8 +45,6 @@ Requires:       xdg-desktop-portal
 %install
 %meson_install

-%find_lang %appname
-

 %check
 desktop-file-validate \
@@ -68,7 +64,7 @@ appstream-util validate-relax --nonet \
 %systemd_preun %{appname}.check-for-firmware-updates.timer


-%files -f %appname.lang
+%files
 %license LICENSE
 %doc README.md

@@ -91,6 +87,8 @@ appstream-util validate-relax --nonet \

 %{_sysconfdir}/xdg/autostart/%appname.desktop

+%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
+

 %changelog
 %autochangelog
@@ -3,8 +3,8 @@

 Name:           elementary-videos
 Summary:        Video player and library app from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        3.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -22,14 +22,13 @@ BuildRequires:  pkgconfig(clutter-gtk-1.0)
 BuildRequires:  pkgconfig(gdk-x11-3.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gstreamer-tag-1.0)
 BuildRequires:  pkgconfig(gstreamer-video-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22
 BuildRequires:  pkgconfig(libhandy-1)
-BuildRequires:  pkgconfig(libadwaita-1)

 Requires:       hicolor-icon-theme

@@ -3,8 +3,8 @@

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

 # License breakdown is available in debian/copyright
 License:        CC-BY-SA-4.0 AND CC0-1.0 AND Unlicense
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-about
 Summary:        Switchboard System Information plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.2.0
+Release:        3%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-about
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-applications
 Summary:        Switchboard Applications plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.1
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-applications
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-datetime
 Summary:        Switchboard Date & Time Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.2.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-datetime
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-keyboard
 Summary:        Switchboard Keyboard plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        3.2.1
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-keyboard
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-locale
 Summary:        Switchboard Locale Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.5.9
+Release:        2%?dist
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/%name
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-mouse-touchpad
 Summary:        Switchboard Mouse and Touchpad plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-mouse-touchpad
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-networking
 Summary:        Switchboard Networking plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.5.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-network
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-notifications
 Summary:        Switchboard Notifications plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.2.0
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-notifications
@@ -1,13 +1,13 @@
 %global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$

 %global plug_type network
-%global plug_name onlineaccounts
-%global plug_rdnn io.elementary.settings.onlineaccounts
+%global plug_name online-accounts
+%global plug_rdnn io.elementary.switchboard.onlineaccounts

 Name:           switchboard-plug-onlineaccounts
 Summary:        Switchboard Online Accounts plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.5.3
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-onlineaccounts
@@ -20,13 +20,13 @@ BuildRequires:  vala
 BuildRequires:  fdupes

 BuildRequires:  pkgconfig(camel-1.2)
-#BuildRequires:  pkgconfig(glib-2.0)
-#BuildRequires:  pkgconfig(gobject-2.0)
-#BuildRequires:  pkgconfig(granite) >= 6.0.0
-#BuildRequires:  pkgconfig(gtk+-3.0)
-#BuildRequires:  evolution-data-server-devel 
-#BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  evolution-data-server-devel 
+BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
+BuildRequires:  pkgconfig(switchboard-2.0)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -50,7 +50,7 @@ Manage online accounts and connected applications.
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
 sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
@@ -61,12 +61,12 @@ appstream-util validate-relax --nonet \
    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


-%files -f %{plug_rdnn}.lang
+%files -f %{plug_name}-plug.lang
 %license LICENSE
 %doc README.md
-%{_iconsdir}/hicolor/*/apps/%{plug_rdnn}.svg
+
 %{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
-%{_libdir}/switchboard-3/%{plug_type}/lib%{plug_name}.so
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so


 %changelog
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-parental-controls
 Summary:        Switchboard Screen Time & Limits Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.0.1
+Release:        2%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%name
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-power
 Summary:        Switchboard Power Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.7.0
+Release:        2%?dist
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/%name
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-printers
 Summary:        Switchboard Printers Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.2.1
+Release:        2%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-printers
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-sharing
 Summary:        Switchboard Sharing Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.1.6
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/switchboard-plug-sharing
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-sound
 Summary:        Switchboard Sound Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.3.3
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-sound
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-useraccounts
 Summary:        Switchboard User Accounts Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.4.3
+Release:        2%?dist
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/%name
@@ -1,8 +1,8 @@
 %define debug_package %{nil}

 Name:			xdg-desktop-portal-pantheon
-Version:		7.2.0
-Release:		1%?dist
+Version:		7.1.1
+Release:		1%{?dist}
 Summary:		Pantheon XDG Desktop Portals
 License:		GPL-3.0
 URL:			https://github.com/elementary/portals
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 0f9ce94e628a245cb3a7e97a7a169cb94e04c9ea
+%global commit 1530c1fcfd8b8b7eec3a30e2db20cfc9946fa34a
 %forgemeta

 Name:       lomiri-system-settings
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit 0b85fddd0123c86fe6b3464143df86a6d0ad6bb9
+%global commit a083a14fe65105fc1996ceb1b92165ca3b0cb94e
 %forgemeta

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

 License:       GPLv3 AND LGPLv3
@@ -1,6 +1,6 @@
-%global commit fb1d91585f8b7e72bc5776085a36205652a0adec
+%global commit 787bf3c6585701ec718c740ccb424794c39a2b43
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240724
+%global commit_date 20240714

 Name:           flow-control-nightly
 Version:        %commit_date.%shortcommit
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "tracy.spec"
-    }
-}
@@ -1,77 +0,0 @@
-%global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.
-
-Name:			tracy
-Version:		0.11.0
-Release:		1%?dist
-Summary:		A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.
-License:		BSD-3-Clause
-URL:			https://github.com/wolfpld/tracy
-Source0:		https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz
-BuildRequires:  pkgconfig(egl) pkgconfig(glfw3) pkgconfig(freetype2) pkgconfig(dbus-1) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) pkgconfig(wayland-client) pkgconfig(wayland-protocols) pkgconfig(xkbcommon) pkgconfig(capstone)
-BuildRequires:  cmake gcc gcc-c++ meson
-
-%description
-%_desc
-
-%package devel
-Summary: Development files for the tracy package
-
-%description devel
-%_desc
-This package contains the development files for the tracy package.
-
-%prep
-%autosetup -p1
-
-%build
-%meson
-%meson_build
-
-for project in capture csvexport import-chrome import-fuchsia update profiler
-do
-    pushd $project
-    %cmake -DDOWNLOAD_CAPSTONE=0
-    %cmake_build
-    popd
-done
-
-%install
-%meson_install
-
-# NOTE: the subprojects don't have install targets so we do it manually
-install -Dm755 capture/%__cmake_builddir/tracy-capture %buildroot%_bindir/tracy-capture
-install -Dm755 csvexport/%__cmake_builddir/tracy-csvexport %buildroot%_bindir/tracy-csvexport
-install -Dm755 import-chrome/%__cmake_builddir/tracy-import-chrome %buildroot%_bindir/tracy-import-chrome
-install -Dm755 import-fuchsia/%__cmake_builddir/tracy-import-fuchsia %buildroot%_bindir/tracy-import-fuchsia
-install -Dm755 update/%__cmake_builddir/tracy-update %buildroot%_bindir/tracy-update
-install -Dm755 profiler/%__cmake_builddir/tracy-profiler %buildroot%_bindir/tracy
-
-install -Dm644 extra/desktop/tracy.desktop %buildroot%_datadir/applications/tracy.desktop
-install -Dm644 icon/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/tracy.svg
-install -Dm644 extra/desktop/application-tracy.xml %buildroot%_datadir/mime/packages/application-tracy.xml
-install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/apps/application-tracy.svg
-
-%files
-%license LICENSE
-%doc README.*
-%_bindir/tracy
-%_bindir/tracy-capture
-%_bindir/tracy-csvexport
-%_bindir/tracy-import-chrome
-%_bindir/tracy-import-fuchsia
-%_bindir/tracy-update
-%_libdir/libtracy.so
-%_datadir/applications/tracy.desktop
-%_datadir/mime/packages/application-tracy.xml
-%_iconsdir/hicolor/scalable/apps/tracy.svg
-%_iconsdir/hicolor/scalable/apps/application-tracy.svg
-
-%files devel
-%_libdir/pkgconfig/tracy.pc
-%_includedir/common
-%_includedir/tracy
-%_includedir/client
-
-%changelog
-* Wed Jul 24 2024 Owen Zimmerman <owen@fyralabs.com> - 0.11-1
- Initial package.
@@ -1 +0,0 @@
-rpm.version(gh("wolfpld/tracy"));
@@ -1,14 +1,12 @@
-%global commit e9d0768e3c081d9c328f9c1811f783007e8bb489
+%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240727
-%global ver 0.147.0
+%global commit_date 20240619
+%global ver 0.142.0

 %bcond_without check

 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-# Use Mold as the linker
-%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold

 %global crate zed
 %global app_id dev.zed.Zed-Nightly
@@ -35,7 +33,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel-engine
+BuildRequires:  openssl-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd
@@ -1,10 +1,6 @@
 %bcond_without check
-
-%global ver 0.146.1
-# Exclude input files from mangling
-%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-# Use Mold as the linker
-%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold
+%global debug_package %{nil}
+%global ver 0.145.1

 %global crate zed
 %global app_id dev.zed.Zed-Preview
@@ -2,14 +2,12 @@

 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-# Use Mold as the linker
-%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold

 %global crate zed
 %global app_id dev.zed.Zed

 Name:           zed
-Version:        0.145.1
+Version:        0.144.4
 Release:        1%?dist
 Summary:        Zed is a high-performance, multiplayer code editor

@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:           moby-buildx
-Version:        0.16.2
+Version:        0.16.1
 Release:        1%?dist
 Summary:        Docker CLI plugin for extended build capabilities with BuildKit

@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name:           moby-compose
-Version:        2.29.1
+Version:        2.29.0
 Release:        1%?dist
 Summary:        Define and run multi-container applications with Docker

@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	1.0.16
+Version:	1.0.15
 Release:	1%?dist
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/Sarasa-TTC-%version.7z
@@ -1,8 +1,8 @@
 %define debug_package %nil

-%global commit c9a2b14de1831edf45207610289a439a50c55485
+%global commit 4aa204e6ef332457d277488ffa61959f2dcde470
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240724
+%global commit_date 20240719

 Name:           gamescope-session
 Version:        %commit_date.%shortcommit
@@ -2,7 +2,4 @@ project pkg {
    rpm {
        spec = "terra-gamescope.spec"
    }
-    labels {
-        multilib = 1
-    }
 }
@@ -89,10 +89,8 @@ 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:       %{name}-libs = %{version}-%{release}
-%ifarch %{ix86}
-Requires:       %{name}-libs(x86-32) = %{version}-%{release}
-%endif
+Requires:       gamescope-libs = %{version}-%{release}
+Requires:       gamescope-libs(x86-32) = %{version}-%{release}
 Recommends:     mesa-dri-drivers
 Recommends:     mesa-vulkan-drivers

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

 Name:			osu-lazer
-Version:		2024.727.0
+Version:		2024.718.0
 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 6352362907149d297684473f3d606b08ce1b93f5
+%global commit 0041d2a126ae6f35ce1ca2bb5c793ec5853c4343
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f

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

 %bcond_without qt6
@@ -1,6 +1,6 @@
 %define debug_package %nil
-%global commit cee36c6db378c380900fc7b901e2f7d0ea596cc0
-%global commit_date 20240724
+%global commit 688ca6ae29de89174794a48be61ecd0fb1111c96
+%global commit_date 20240430
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           albius
@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 39629a1adcbcc822508acc3983f444328f90dd85
+%global commit 97f54745459b8651b7a38c174b3a8135224ebd09
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.9
-%global commit_date 20240727
+%global commit_date 20240720
 %global debug_package %nil

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

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

 Name:           rust-gitoxide
-Version:        0.37.0
+Version:        0.36.0
 Release:        1%?dist
 Summary:        Command-line application for interacting with git repositories

@@ -13,7 +13,7 @@ License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/gitoxide
 Source:         %{crates_source}

-BuildRequires:  openssl-devel-engine cmake anda-srpm-macros rust-packaging >= 21
+BuildRequires:  openssl-devel cmake anda-srpm-macros rust-packaging >= 21

 %global _description %{expand:
 A command-line application for interacting with git repositories.}
@@ -4,7 +4,7 @@
 %global crate gping

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

@@ -1,5 +1,5 @@
 Name:			nushell
-Version:		0.96.0
+Version:		0.95.0
 Release:		1%?dist
 Summary:		A new type of shell
 License:		MIT
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "rust-onefetch.spec"
-    }
-}
@@ -1,11 +0,0 @@
--- onefetch-2.21.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ onefetch-2.21.0/Cargo.toml	2024-07-23T17:12:11.234589+00:00
-@@ -164,8 +164,3 @@
- [features]
- fail-on-deprecated = []
- 
-[target."cfg(windows)".dependencies.enable-ansi-support]
-version = "0.2.1"
-
-[target."cfg(windows)".build-dependencies.winres]
-version = "0.1"
@@ -1,103 +0,0 @@
-# Generated by rust2rpm 26
-%bcond_without check
-
-%global crate onefetch
-
-Name:           rust-onefetch
-Version:        2.21.0
-Release:        %autorelease
-Summary:        Command-line Git information tool
-
-License:        MIT
-URL:            https://crates.io/crates/onefetch
-Source:         %{crates_source}
-# Automatically generated patch to strip dependencies and normalize metadata
-Patch:          onefetch-fix-metadata-auto.diff
-
-BuildRequires:  anda-srpm-macros cargo-rpm-macros >= 24
-BuildRequires:  cmake
-
-%global _description %{expand:
-Command-line Git information tool.}
-
-%description %{_description}
-
-%package     -n %{crate}
-Summary:        %{summary}
-License:        (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT)
-
-%description -n %{crate} %{_description}
-
-%files       -n %{crate}
-%license LICENSE.md
-%license resources/license.cache.zstd
-%license src/info/license.rs
-%license LICENSE.dependencies
-%doc CHANGELOG.md
-%doc CONTRIBUTING.md
-%doc README.md
-%{_bindir}/onefetch
-
-%package        devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description    devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files          devel
-%license %{crate_instdir}/LICENSE.md
-%license %{crate_instdir}/resources/license.cache.zstd
-%license %{crate_instdir}/src/info/license.rs
-%doc %{crate_instdir}/CHANGELOG.md
-%doc %{crate_instdir}/CONTRIBUTING.md
-%doc %{crate_instdir}/README.md
-%{crate_instdir}/
-
-%package     -n %{name}+default-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files       -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+fail-on-deprecated-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+fail-on-deprecated-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "fail-on-deprecated" feature of the "%{crate}" crate.
-
-%files       -n %{name}+fail-on-deprecated-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version} -p1
-%cargo_prep_online
-
-%build
-cat<<EOF > license.sh
-%{cargo_license} > LICENSE.dependencies
-EOF
-sed -i "s/--offline//g" license.sh
-bash license.sh
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(crates("onefetch"));
@@ -1,14 +1,12 @@
-%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold
-
 Name:           rnote
-Version:        0.11.0
+Version:        0.10.2
 Release:        1%?dist
 Summary:        Sketch and take handwritten notes.
 License:        GPL-3.0
 URL:            https://github.com/flxzt/rnote
 Source0:        %{url}/archive/refs/tags/v%version.tar.gz
 Requires:       gtk4
-BuildRequires:  cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils mold
+BuildRequires:  cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gtk4) >= 4.7
 BuildRequires:  pkgconfig(libadwaita-1) >= 1.2
@@ -4,8 +4,8 @@
 %global crate starship

 Name:           rust-starship
-Version:        1.20.1
-Release:        1%?dist
+Version:        1.19.0
+Release:        %autorelease
 Summary:        Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️

 License:        ISC
@@ -3,8 +3,8 @@
 %bcond_with tests

 Name:           apparmor
-Version:        4.0.2
-Release:        1%?dist
+Version:        4.0.1
+Release:        2%{?dist}
 Summary:        AppArmor userspace components

 %define baseversion %(echo %{version} | cut -d. -f-2)
@@ -1,4 +1,4 @@
-%global ver 1.8.12-11
+%global ver 1.8.12-10
 %global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g')
 Summary:        The Application Framework for tauOS apps
 Name:           libhelium
@@ -1,4 +1,4 @@
-%global commit 97ded01095246a3a693bc85bef4bca5d1af177dd
+%global commit cb164927417f22811c74cd8678ed4a5ab7cb80ba
 %global ver 1.8.33
 %global commit_date 20240219
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -0,0 +1,5 @@
+project "pkg" {
+    rpm {
+        spec = "opentabletdriver.spec"
+    }
+}
@@ -0,0 +1,63 @@
+# saves time so we don't have to download the thing manually
+#undefine _disable_source_fetch
+# We don't have debug symbols, because .NET
+%define debug_package %{nil}
+# We aren't using Mono but RPM expected Mono
+%global __requires_exclude_from ^/usr/lib/opentabletdriver/.*$
+%global __os_install_post %{nil}
+
+Name: opentabletdriver
+Version: 0.6.4.0
+Release: 1%{?dist}
+Summary: A cross-platform open source tablet driver
+License: LGPLv3
+URL: https://github.com/OpenTabletDriver/OpenTabletDriver
+%define otddir OpenTabletDriver-%{version}
+
+BuildRequires: dotnet-sdk-6.0 git jq
+
+Requires: dotnet-runtime-6.0
+Requires: libevdev.so.2()(64bit)
+Requires: gtk3
+Requires: gtk3
+Requires: udev
+Requires(post): grep
+Suggests: libX11
+Suggests: libXrandr
+
+%description
+OpenTabletDriver is an open source, cross platform, user mode tablet driver. The goal of OpenTabletDriver is to be cross platform as possible with the highest compatibility in an easily configurable graphical user interface.
+
+%prep
+git clone -b v%version %url .
+
+%build
+./eng/linux/package.sh --output bin
+
+%install
+export DONT_STRIP=1
+PREFIX="%{_prefix}" ./eng/linux/package.sh --package Generic --build false
+mkdir -p "%{buildroot}"
+mv ./dist/files/* "%{buildroot}"/
+rm -rf ./dist
+mkdir -p "%{buildroot}/%{_prefix}/lib/"
+cp -r bin "%{buildroot}/%{_prefix}/lib/opentabletdriver"
+
+
+%files
+%defattr(-,root,root)
+%dir %{_prefix}/lib/opentabletdriver
+%dir %{_prefix}/share/doc/opentabletdriver
+%{_bindir}/otd
+%{_bindir}/otd-daemon
+%{_bindir}/otd-gui
+%{_prefix}/lib/modprobe.d/99-opentabletdriver.conf
+%{_prefix}/lib/modules-load.d/opentabletdriver.conf
+%{_prefix}/lib/opentabletdriver/*
+%{_prefix}/lib/systemd/user/opentabletdriver.service
+%{_prefix}/lib/udev/rules.d/70-opentabletdriver.rules
+%{_prefix}/share/applications/opentabletdriver.desktop
+%{_prefix}/share/man/man8/opentabletdriver.8.gz
+%{_prefix}/share/doc/opentabletdriver/LICENSE
+%{_prefix}/share/pixmaps/otd.ico
+%{_prefix}/share/pixmaps/otd.png
@@ -0,0 +1 @@
+rpm.version(gh("OpenTabletDriver/OpenTabletDriver"));
@@ -1,5 +1,5 @@
 Name:		limine
-Version:	7.12.1
+Version:	7.11.0
 Release:	1%?dist
 Summary:	Modern, advanced, portable, multiprotocol bootloader
 License:	BSD-2-Clause
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '39'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+
+include('templates/terra.tpl')
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '39'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+
+include('templates/terra.tpl')
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '39'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+
+include('templates/terra.tpl')
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '40'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+
+include('templates/terra.tpl')
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '40'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+
+include('templates/terra.tpl')
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '40'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+
+include('templates/terra.tpl')
@@ -1,34 +1,51 @@
 Name:           terra-mock-configs
-Version:        1.1.0
-Release:        1%?dist
-Epoch:          1
+Version:        11
+Release:        1%{?dist}
 Summary:        Mock configs for Terra repos

 License:        MIT
-URL:            https://github.com/terrapkg/mock-configs
-Source0:        %url/archive/refs/tags/v%version.tar.gz
+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

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

-Provides: anda-mock-configs = %{epoch}:%{version}-%{release}
+Provides: anda-mock-configs = %{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 terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/
-cp -v *.cfg %{buildroot}%{_sysconfdir}/mock/
+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/
+

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

+
 %changelog
-* Fri Jul 26 2024 madonuko <mado@fyralabs.com> - 1:1.1.0-1
- Include mock files for Terra 41
-
-* 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)

@@ -0,0 +1,5 @@
+config_opts['releasever'] = 'rawhide'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+
+include('templates/terra.tpl')
@@ -0,0 +1,5 @@
+config_opts['releasever'] = 'rawhide'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+
+include('templates/terra.tpl')
@@ -0,0 +1,5 @@
+config_opts['releasever'] = 'rawhide'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+
+include('templates/terra.tpl')
@@ -0,0 +1,202 @@
+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
@@ -1 +0,0 @@
-rpm.version(gh("terrapkg/mock-configs"));
@@ -1,6 +1,6 @@
 Name:           terra-release
-Version:        41
-Release:        2
+Version:        40
+Release:        3
 Summary:        Release package for Terra

 License:        MIT
@@ -24,9 +24,6 @@ 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,7 +9,6 @@ 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
@@ -1,4 +1,4 @@
-%global ver 1.8.12-11
+%global ver 1.8.12-10

 Summary:        tauOS GTK/GNOME Shell Themes
 Name:           tau-helium
@@ -5,7 +5,7 @@
 %global crate anda

 Name:           rust-anda
-Version:        0.2.3
+Version:        0.2.2
 Release:        1%?dist
 Summary:        Andaman Build toolchain

@@ -12,7 +12,7 @@
 %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so

 Name:			electron
-Version:		31.3.0
+Version:		31.2.1
 Release:		1%?dist
 Summary:		Build cross platform desktop apps with web technologies
 License:		MIT
@@ -1,8 +1,8 @@
 #bcond_without tests
-%global commit 28d485714fef88937c82635438afba5db81f9089
+%global commit a3bab4752a2b3d56e5a59b4e0411bb8f695c010b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240726
-%global ver 2024.07.25
+%global commit_date 20240719
+%global ver 2024.07.16

 Name:           yt-dlp-nightly
 Version:        %ver^%commit_date.%shortcommit
				`@@ -0,0 +1 @@`
				`rpm.version(gh("OpenTabletDriver/OpenTabletDriver"));`