fix restore keys

bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly tdlib nim-nightly
bump: osu-lazer
2026-05-31 09:01:55 +00:00 · 2023-10-14 19:38:40 +07:00 · 2023-10-14 01:05:59 +00:00 · 2023-10-13 17:35:23 +00:00 · 2023-10-13 12:56:35 +00:00 · 2023-10-13 06:33:29 +00:00
69 changed files with 213 additions and 278 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f39
+      - f38
  pull_request:
    branches:
-      - f39
+      - f38
  merge_group:
    branches:
-      - f39
+      - f38
  workflow_dispatch:
  workflow_call:

@@ -23,7 +23,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,11 +40,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["39"]
+        version: ["38"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -59,7 +59,12 @@ jobs:
        uses: actions/cache@v3
        with:
          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
+          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+          restore-keys: |
+            ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+            ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
+            ${{ runner.os }}-br-${{ matrix.version }}
+            ${{ runner.os }}-br

      - name: Include custom build template instead of package default
        run: |
@@ -7,43 +7,67 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["39"]
+        version: ["38"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
+      image: fedora:38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
-      - name: Install repositories
-        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs
+      - uses: actions/setup-go@v3
+        with:
+          go-version: "^1.19"

+      - name: Install repositories
+        run: |
+          sudo dnf install -y dnf-plugins-core
+          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+          sudo dnf install -y mock createrepo_c rpm-build gcc curl wget git-core openssl-devel
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
      - name: Install Anda
-        run: cargo install anda
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: anda
+

      - uses: actions/checkout@v3
        with:
-          ref: f${{ matrix.version }}
+          ref: f${{ matrix.version} }}
          fetch-depth: 1
      - name: Build terra-mock-configs
        run: |
-          echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
-          export PATH=$PATH:/github/home/.cargo/bin
          git config --global --add safe.directory "$GITHUB_WORKSPACE"
          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/mock-configs/pkg -p rpm
      - name: Install terra-mock-configs
-        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
-
-      - name: Build anda-srpm-macros
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/srpm-macros/pkg
+        run: sudo dnf install -y anda-build/rpm/rpms/terra-mock-configs*.rpm

+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/subatomic
+          set-safe-directory: true
+          fetch-depth: 1
+      
      - name: Build Subatomic
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/subatomic/pkg
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
      - name: Install Subatomic
-        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+        run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+
+
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/anda
+          fetch-depth: 1

      - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/anda/pkg
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm
+

      - name: Upload to Subatomic
        run: |
@@ -21,12 +21,12 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["39"]
+        version: ["38"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -66,8 +66,8 @@ jobs:
            terra${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Notify Madoguchi (Success)
-        if: success()
+        if: success() && github.event_name == 'push'
        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
-        if: cancelled() || failure()
+        if: ( cancelled() || failure() ) && github.event_name == 'push'
        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -11,11 +11,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["39"]
+        version: ["38"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -55,8 +55,8 @@ jobs:
            terra${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Notify Madoguchi (Success)
-        if: 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}}
      - name: Notify Madoguchi (Failure)
-        if: cancelled() || 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}}
@@ -3,18 +3,18 @@ name: Lint
 on:
  push:
    branches:
-      - f39
+      - f38
  pull_request:
    branches:
-      - f39
+      - f38
  merge_group:
    branches:
-      - f39
+      - f38
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
    steps:
      - name: Checkout repository
        uses: actions/checkout@v3
@@ -3,7 +3,6 @@ name: Push comps updates
 on:
  push:
    branches:
-      - f39
      - f38
      - f37
    paths:
@@ -14,7 +13,7 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
    steps:
      - uses: actions/checkout@v3
      - name: Push to subatomic
@@ -38,13 +38,15 @@ jobs:
            git config user.signingkey "${{ runner.temp }}/signing_key"
            msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
            git commit -S -a -m "$msg"
-            f37 () {
+            copy_over () {
              git format-patch HEAD^
-              git checkout f37
+              git checkout $1
              git apply *.patch || true
+              rm *.patch
              git add *
              git commit -S -a -m "$msg"
            }
-            f37 || true
+            copy_over f37 || true
+            copy_over f39 || true
            git push -u origin --all
          fi
@@ -1,7 +1,7 @@
 name: Update
 on:
  schedule:
-    - cron: "*/30 * * * *"
+    - cron: "*/10 * * * *"
  workflow_dispatch:

 jobs:
@@ -26,7 +26,7 @@ jobs:
      - name: Run Update
        run: anda update -vv
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full

      - name: Save
@@ -39,13 +39,15 @@ jobs:
            git config user.signingkey "${{ runner.temp }}/signing_key"
            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
            git commit -S -a -m "$msg"
-            # f37 () {
-            #   git format-patch HEAD^
-            #   git checkout f37
-            #   git apply *.patch || true
-            #   git add *
-            #   git commit -S -a -m "$msg"
-            # }
-            # f37 || true
+            copy_over () {
+              git format-patch HEAD^
+              git checkout $1
+              git apply *.patch || true
+              rm *.patch
+              git add *
+              git commit -S -a -m "$msg"
+            }
+            copy_over f37 || true
+            copy_over f39 || true
            git push -u origin --all
          fi
@@ -1,7 +1,7 @@
 # Terra Sources

+[![Repository status](https://repology.org/badge/repository-big/terra_37.svg?header=Terra+37)](https://repology.org/repository/terra_37)
 [![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
-[![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39)

 Terra is a rolling-release Fedora repository for all the software you need.
 With Terra, you can install the latest packages knowing that quality and security are assured.
@@ -14,7 +14,7 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so

 Name:			armcord-bin
-Version:		3.2.5
+Version:		3.2.4.libwebp
 Release:		1%{?dist}
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:		armcord
-Version:	3.2.5
+Version:	3.2.4.libwebp
 Release:	1%{?dist}
 License:	OSL-3.0
 Summary:	Custom lightweight Discord client designed to enhance your experience
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.172
+Version:        0.0.171
 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.172
+Version:        0.0.171
 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.32
+Version:        0.0.31
 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.52
+Version:        0.0.50
 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.52
+Version:        0.0.50
 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.32
+Version:		0.0.31
 Release:		1%{?dist}
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 2968405ebf0f4abca2b06c2bdae26ff9f58aa991
+%global commit 8b9442ced668b24565206830cf47c928b3b6af82
 %forgemeta

 Name:       lomiri-system-settings
-Version:    1.0.2
-Release:    1%{?dist}
+Version:    1.0.1
+Release:    %autorelease
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name: dart
-Version: 3.1.5
+Version: 3.1.3
 Release: 1%{?dist}
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -51,6 +51,7 @@ Requires:	budgie-applet-recentlyused
 Requires:	budgie-applet-rotation-lock
 Requires:	budgie-applet-showtime
 Requires:	budgie-applet-takeabreak
+Requires:	budgie-applet-trash
 Requires:	budgie-applet-visualspace
 Requires:	budgie-applet-wallstreet
 Requires:	budgie-applet-window-shuffler
@@ -207,6 +208,14 @@ upside down, dim the screen, lock screen or show a countdown message on break
 time. The applet can be accessed quickly from the panel to temporarily switch
 it off.

+%package -n	budgie-applet-trash
+Requires:	budgie-extras-common
+Summary:	Applet allows access to trash capabilities for the Budgie Desktop
+%description -n	budgie-applet-trash
+The trash applet allows the user access the desktop trash capabilities
+from the panel including the ability to delete and restore files stored
+in the trash folder.
+
 %package -n	budgie-applet-visualspace
 Requires:	budgie-extras-common
 Summary:	Shows the current workspace(s), as bullet(s)
@@ -384,6 +393,9 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.takeabreak.gschema.xml
 %{_datadir}/pixmaps/takeabreak*.svg

+%files -n budgie-applet-trash
+%{_libdir}/budgie-desktop/plugins/budgie-trash
+
 %files -n budgie-applet-visualspace
 %config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
 %{_libdir}/budgie-desktop/plugins/budgie-visualspace
@@ -11,8 +11,6 @@ URL:            https://github.com/elementary/greeter
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        40-%{appname}.conf

-Patch0:         https://github.com/elementary/greeter/commit/dbd9b6f9701f5992c3b3257c025b9cd80d041cc8.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -36,9 +34,9 @@ BuildRequires:  pkgconfig(granite) >= 5.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(liblightdm-gobject-1)
-BuildRequires:  pkgconfig(mutter-clutter-13)
-BuildRequires:  pkgconfig(mutter-cogl-13)
-BuildRequires:  pkgconfig(mutter-cogl-pango-13)
+BuildRequires:  pkgconfig(mutter-clutter-12)
+BuildRequires:  pkgconfig(mutter-cogl-12)
+BuildRequires:  pkgconfig(mutter-cogl-pango-12)
 BuildRequires:  pkgconfig(x11)

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -70,7 +68,7 @@ The elementary Greeter is a styled Login Screen for LightDM.


 %prep
-%autosetup -p1 -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version}


 %build
@@ -12,19 +12,15 @@ License:        LGPL-2.0-or-later
 URL:            https://github.com/elementary/photos
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

-# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits)
-Patch0:         https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 BuildRequires:  fdupes
-BuildRequires:  git-core

 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
-BuildRequires:  pkgconfig(geocode-glib-2.0)
+BuildRequires:  pkgconfig(geocode-glib-1.0)
 BuildRequires:  pkgconfig(gexiv2) >= 0.4.90
 BuildRequires:  pkgconfig(gio-2.0) >= 2.20
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.20
@@ -37,12 +33,17 @@ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
 BuildRequires:  pkgconfig(gudev-1.0) >= 145
+BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libexif) >= 0.6.16
 BuildRequires:  pkgconfig(libgphoto2) >= 2.4.2
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
+BuildRequires:  pkgconfig(libsoup-2.4) >= 2.26.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.6.32
+BuildRequires:  pkgconfig(rest-0.7) >= 0.7
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
+BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.0.0

 Requires:       hicolor-icon-theme

@@ -52,8 +53,7 @@ Foundation.


 %prep
-%autosetup -n %{srcname}-%{version} -N
-git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git
+%autosetup -n %{srcname}-%{version} -p1


 %build
@@ -94,6 +94,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/applications/%{appname}-viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
+%{_datadir}/glib-2.0/schemas/%{appname}-extras.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
 %{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
 %{_datadir}/metainfo/%{appname}.appdata.xml
@@ -1,5 +1,5 @@
 Name:			pantheon-tweaks
-Version:		1.1.1
+Version:		1.1.0
 Release:		1%{?dist}
 Summary:		A system settings panel for the Pantheon desktop environment
 License:		GPL-3.0
@@ -15,8 +15,6 @@ License:        GPL-3.0-or-later
 URL:            https://github.com/elementary/switchboard-plug-network
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

-Patch0:         https://github.com/elementary/switchboard-plug-network/pull/357.patch
-
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
@@ -5,7 +5,7 @@

 Name:           switchboard-plug-tweaks
 Summary:        Switchboard Tweaks Plug
-Version:        1.1.1
+Version:        1.1.0
 Release:        1%{?dist}
 License:        GPL-3.0-or-later

@@ -27,9 +27,9 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
-BuildRequires:  pkgconfig(mutter-clutter-13)
-BuildRequires:  pkgconfig(mutter-cogl-13)
-BuildRequires:  pkgconfig(mutter-cogl-pango-13)
+BuildRequires:  pkgconfig(mutter-clutter-12)
+BuildRequires:  pkgconfig(mutter-cogl-12)
+BuildRequires:  pkgconfig(mutter-cogl-pango-12)

 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}

@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 7b210a9970360c3cde833e8b76f9231b4db5ae29
+%global commit bf320e2d15282a466f32396486c42dbb577d3905
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,52 +0,0 @@
-Name: abacus
-Version: 0.1.0
-Release: %autorelease
-Summary: Calculate Stuff
-URL: https://github.com/tau-OS/abacus
-Source0: %url/archive/refs/tags/v%{version}.tar.gz
-License: GPL-3.0
-
-BuildRequires: meson
-BuildRequires: gcc
-BuildRequires: gettext
-BuildRequires: cmake
-BuildRequires: vala
-BuildRequires: ninja-build
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gtk4)
-BuildRequires: pkgconfig(libhelium-1)
-BuildRequires: pkgconfig(json-glib-1.0)
-Requires: libhelium
-BuildRequires: desktop-file-utils
-
-%description
-%{summary}.
-
-%prep
-%forgeautosetup
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%find_lang com.fyralabs.Abacus
-
-%post
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%files -f com.fyralabs.Abacus.lang
-%license LICENSE
-%{_bindir}/com.fyralabs.Abacus
-%{_datadir}/applications/com.fyralabs.Abacus.desktop
-%{_datadir}/icons/hicolor/scalable/apps/com.fyralabs.Abacus*
-%{_datadir}/icons/hicolor/symbolic/apps/com.fyralabs.Abacus*
-
-
-%changelog
-%autochangelog
@@ -1,5 +0,0 @@
-project "pkg" {
-    rpm {
-		spec = "abacus.spec"
-	}
-}
@@ -1 +0,0 @@
-rpm.version(gh("tau-OS/abacus"));
@@ -1,5 +0,0 @@
-project "pkg" {
-    rpm {
-		spec = "kairos.spec"
-	}
-}
@@ -1,59 +0,0 @@
-Name: kairos
-Version: 0.1.0
-Release: %autorelease
-Summary: Check the weather outside
-URL: https://github.com/tau-OS/kairos
-Source0: %url/archive/refs/tags/v%{version}.tar.gz
-License: GPL-3.0
-
-BuildRequires: meson
-BuildRequires: gcc
-BuildRequires: gettext
-BuildRequires: cmake
-BuildRequires: vala
-BuildRequires: ninja-build
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gtk4)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(libgeoclue-2.0)
-BuildRequires: pkgconfig(geocode-glib-2.0)
-BuildRequires: pkgconfig(gee-0.8)
-BuildRequires: pkgconfig(libbismuth-1)
-BuildRequires: pkgconfig(libhelium-1)
-BuildRequires: pkgconfig(json-glib-1.0)
-BuildRequires: pkgconfig(gweather4)
-Requires: libhelium
-BuildRequires: desktop-file-utils
-
-%description
-%{summary}.
-
-%prep
-%forgeautosetup
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%post
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%files
-%license COPYING
-%{_bindir}/com.fyralabs.Kairos
-%{_datadir}/applications/com.fyralabs.Kairos.desktop
-%{_datadir}/dbus-1/services/com.fyralabs.Kairos.service
-%{_datadir}/icons/hicolor/*/apps/com.fyralabs.Kairos*
-%{_datadir}/metainfo/com.fyralabs.Kairos.appdata.xml
-%{_datadir}/glib-2.0/schemas/com.fyralabs.Kairos.gschema.xml
-
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("tau-OS/kairos"));
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit 4ea3c0ce0ac7a51c41ac015c7973db703d20c7d3
+%global commit ed5564cbba53d1c4a3acfb53024db3a912083f59
 %forgemeta

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

@@ -2,7 +2,7 @@
 %global         debug_package %{nil}

 Name:           iosevka-fusion-fonts
-Version:        27.3.1
+Version:        27.2.0
 Release:        1%{?dist}
 Summary:        A custom font based on iosevka

@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	0.42.3
+Version:	0.42.1
 Release:	1%{?dist}
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/sarasa-gothic-ttc-%version.7z
@@ -1,8 +1,8 @@
-%define osuresver 2023.1023.0
+%define osuresver 2023.1014.0
 %global debug_package %{nil}

 Name:			osu-lazer
-Version:		2023.1026.0
+Version:		2023.1008.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,7 +1,7 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit 3719ea21b090dd58d897b7bd5c8db4e4c54f488c
+%global commit 7015b8f7b256588fe46476f77433e27ca4097bd5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
 %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
@@ -145,7 +145,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %{_datadir}/%{nice_name}/NewLaunch.jar
 %{_datadir}/%{nice_name}/JavaCheck.jar
 %{_datadir}/%{nice_name}/qtlogging.ini
-%{_datadir}/%{nice_name}/NewLaunchLegacy.jar
 %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
 %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
 %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
@@ -1,7 +1,7 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit 3719ea21b090dd58d897b7bd5c8db4e4c54f488c
+%global commit 7015b8f7b256588fe46476f77433e27ca4097bd5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
 %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
@@ -145,7 +145,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %{_datadir}/%{nice_name}/NewLaunch.jar
 %{_datadir}/%{nice_name}/JavaCheck.jar
 %{_datadir}/%{nice_name}/qtlogging.ini
-%{_datadir}/%{nice_name}/NewLaunchLegacy.jar
 %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
 %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
 %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
@@ -121,7 +121,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %{_datadir}/%{nice_name}/NewLaunch.jar
 %{_datadir}/%{nice_name}/JavaCheck.jar
 %{_datadir}/%{nice_name}/qtlogging.ini
-%{_datadir}/%{nice_name}/NewLaunchLegacy.jar
 %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
 %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
 %{_datadir}/mime/packages/modrinth-mrpack-mime.xml
@@ -121,7 +121,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %{_datadir}/%{nice_name}/NewLaunch.jar
 %{_datadir}/%{nice_name}/JavaCheck.jar
 %{_datadir}/%{nice_name}/qtlogging.ini
-%{_datadir}/%{nice_name}/NewLaunchLegacy.jar
 %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
 %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
 %{_datadir}/mime/packages/modrinth-mrpack-mime.xml
@@ -3,7 +3,7 @@

 # https://github.com/rs/curlie
 %global goipath         github.com/rs/curlie
-Version:                1.7.2
+Version:                1.7.1

 %gometa -f

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

 Name:           argagg
-Version:        0.4.6
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        Simple C++ command line argument/option parser

@@ -1 +1 @@
-rpm.version(gh("vietjtnguyen/argagg"));
+rpm.version(gh_tag("vietjtnguyen/argagg"));
@@ -3,7 +3,7 @@
 %forgemeta

 Name:       cmake-extras
-Version:    1.7
+Version:    1.6
 Release:    1%{?dist}
 Summary:    A collection of add-ons for the CMake build tool
 License:    GPL-3.0
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit fc4bfff014a3b83640d0fca787aeefc84c055614
+%global commit 7550cae965e3ff62821cc68d8e042acae615543f
 %forgemeta

 Name:           lomiri-app-launch
-Version:        0.1.8
+Version:        0.1.7
 Release:        1%{?dist}
 Summary:        Provides the Lomiri App Launch user space daemon
 License:        GPL-3.0
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit 0822514d99cb887bf9919edbe032ec1b1e5b0af7
+%global commit fc900668e0cef3bd1cad0af1fbc1980583ce2216
 %forgemeta

 Name:           lomiri-ui-toolkit
-Version:        1.3.5011
-Release:        1%{?dist}
+Version:        1.3.5010
+Release:        2%?dist
 Summary:        QML components to ease the creation of beautiful applications in QML for Lomiri

 License:        LGPL-3.0
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-url-dispatcher
-%global commit 1ac312239a088e5a797b786a22bec42cb0037039
+%global commit e5bae41a5ad7fda9474bebe2508347665fb77065
 %forgemeta

 Name:           lomiri-url-dispatcher
@@ -1,4 +1,4 @@
-%global commit dd77e4628f1a65f332f0cb81c82a19c0fcfa40c2
+%global commit 7a6d6cf492d61317a80047d1b4a35e52f9e668f0
 %global ver 1.8.20
 Name: tdlib-nightly
 Version: %ver^%commit
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name:           moby-compose
-Version:        2.23.0
+Version:        2.22.0
 Release:        1%{?dist}
 Summary:        Define and run multi-container applications with Docker

@@ -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'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-
-include('templates/terra.tpl')
@@ -1,15 +1,13 @@
 Name:           terra-mock-configs
-Version:        6
-Release:        1%{?dist}
+Version:        4
+Release:        2%{?dist}
 Summary:        Mock configs for Terra repos

 License:        MIT
-URL:            http://terra.fyralabs.com
+URL:            https://terra.fyralabs.com
 Source0:        terra.tpl
 Source1:        terra-38-x86_64.cfg
 Source2:        terra-38-aarch64.cfg
-Source3:        terra-39-x86_64.cfg
-Source4:        terra-39-aarch64.cfg

 BuildRequires:  mock-core-configs
 Requires:       mock-core-configs
@@ -34,18 +32,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/mock/templates
 cp -v %{SOURCE0} %{buildroot}%{_sysconfdir}/mock/templates/
 cp -v %{SOURCE1} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE3} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE4} %{buildroot}%{_sysconfdir}/mock/

-# For legacy compatibility, only while Terra 38 is still alive
+# For legacy compatibility, remove in next Terra release
 ln -s %{_sysconfdir}/mock/templates/terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/anda.tpl
 ln -s %{_sysconfdir}/mock/terra-38-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-x86_64.cfg
 ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-aarch64.cfg

 %files
 %config %{_sysconfdir}/mock/templates/terra.tpl
-%config %{_sysconfdir}/mock/terra-39-x86_64.cfg
-%config %{_sysconfdir}/mock/terra-39-aarch64.cfg
 %config %{_sysconfdir}/mock/terra-38-x86_64.cfg
 %config %{_sysconfdir}/mock/terra-38-aarch64.cfg
 %config %{_sysconfdir}/mock/templates/anda.tpl
@@ -53,14 +47,7 @@ ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/a
 %config %{_sysconfdir}/mock/anda-38-aarch64.cfg

 %changelog
-* Wed Aug 16 2023 madonuko <mado@fyralabs.com> - 6-1
- Remove RPM Fusion
-
-* Wed Aug 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 5-1
- Update for Terra 39
-
 * Thu May 18 2023 Lleyton Gray <lleyton@fyralabs.com>
 - Rename to terra-mock-configs and rename files to terra
-
 * Mon Oct 03 2022 Cappy Ishihara <cappy@cappuchino.xyz>
 - Intial Release
@@ -41,6 +41,50 @@ enabled=1
 enabled_metadata=1
 metadata_expire=4h

+# RPMFusion
+# We do not check GPG keys, because I can't find a direct link to the GPG key
+
+[rpmfusion-free]
+name=RPM Fusion for Fedora $releasever - Free
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
+enabled=1
+metadata_expire=14d
+type=rpm-md
+gpgcheck=0
+repo_gpgcheck=0
+
+[rpmfusion-free-updates]
+name=RPM Fusion for Fedora $releasever - Free - Updates
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
+enabled=1
+enabled_metadata=1
+type=rpm-md
+gpgcheck=0
+repo_gpgcheck=0
+
+[rpmfusion-nonfree]
+name=RPM Fusion for Fedora $releasever - Nonfree
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
+enabled=1
+enabled_metadata=1
+metadata_expire=14d
+type=rpm-md
+gpgcheck=0
+repo_gpgcheck=0
+
+[rpmfusion-nonfree-updates]
+name=RPM Fusion for Fedora $releasever - Nonfree - Updates
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
+enabled=1
+enabled_metadata=1
+type=rpm-md
+gpgcheck=0
+repo_gpgcheck=0
+

 {% if mirrored %}
 [fedora]
@@ -1,5 +1,5 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit fbc801d1d15aa2c5f12a3f3bc1e35aad185dafb1
+%global commit f5d70e7fa7195658e3200f71a1653e07fe81275a
 %global ver 2.1.1
 %global debug_package %nil

@@ -4,7 +4,7 @@
 %define _build_id_links none

 Name: sass
-Version: 1.69.5
+Version: 1.69.3
 Release: 1%{?dist}
 Summary: The reference implementation of Sass, written in Dart
 License: MIT
@@ -1,6 +1,6 @@
 Summary:        tauOS GTK/GNOME Shell Themes
 Name:           tau-helium
-Version:        1.5.10
+Version:        1.5.9
 Release:        1%{?dist}
 License:        GPL-3.0
 URL:            https://github.com/tau-OS/tau-helium
@@ -1,7 +1,7 @@
 Summary:        tauOS Icon Theme
 Name:           tau-hydrogen
-Version:        1.0.13
-Release:        1%{?dist}
+Version:        1.0.11
+Release:        2%{?dist}
 License:        GPL-3.0
 URL:            https://github.com/tau-OS/tau-hydrogen
 Source0:        https://github.com/tau-OS/tau-hydrogen/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name:			python3-ruff
-Version:		0.1.3
+Version:		0.0.292
 Release:		1%{?dist}
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
@@ -21,7 +21,7 @@ integrating more functionality behind a single, common interface.
 maturin build --release --strip --locked --all-features

 %install
-python3 -m installer --destdir="%{buildroot}" target/wheels/*.whl
+python3.11 -m installer --destdir="%{buildroot}" target/wheels/*.whl
 rm -rf %{python3_sitelib}/ruff/__pycache__

 %files
@@ -4,8 +4,8 @@
 %global crate bandwhich

 Name:           rust-bandwhich
-Version:        0.21.1
-Release:        1%{?dist}
+Version:        0.21.0
+Release:        %autorelease
 Summary:        Display current network utilization by process, connection and remote IP/hostname

 License:        MIT
@@ -2,7 +2,7 @@
 %global crate felix

 Name:           rust-felix
-Version:        2.9.0
+Version:        2.8.1
 Release:        1%{?dist}
 Summary:        Tui file manager with vim-like key mapping

@@ -2,7 +2,7 @@
 %global crate maturin

 Name:           rust-terra-maturin
-Version:        1.3.1
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages

@@ -11,6 +11,9 @@ Summary:        Command-line utility for easily compressing and decompressing fi
 License:        MIT
 URL:            https://crates.io/crates/ouch
 Source:         %{crates_source}
+# Automatically generated patch to strip foreign dependencies
+Patch:          ouch-fix-metadata-auto.diff
+
 BuildRequires:  anda-srpm-macros rust-packaging >= 21

 %global _description %{expand:
@@ -6,7 +6,7 @@ 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
+BuildRequires:  cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gtk4) >= 4.7
 BuildRequires:  pkgconfig(libadwaita-1) >= 1.2
@@ -1,5 +1,5 @@
 Name:           youki
-Version:        0.3.0
+Version:        0.2.0
 Release:        1%{?dist}
 Summary:        A container runtime written in Rust

@@ -1,5 +1,5 @@
 Name:           terra-release
-Version:        39
+Version:        38
 Release:        1
 Summary:        Release package for Terra

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

 %changelog
-* Wed Aug 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 39-1
- Update for Terra 39
-
 * Sat May 6 2023 Lleyton Gray <lleyton@fyralabs.com> - 38-1
 - Initial package
@@ -12,7 +12,7 @@
 %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so

 Name:			electron
-Version:		27.0.2
+Version:		27.0.0
 Release:		1%{?dist}
 Summary:		Build cross platform desktop apps with web technologies
 License:		MIT
@@ -1,5 +1,5 @@
 Name:		limine
-Version:	5.20231028.0
+Version:	5.20231006.0
 Release:	1%{?dist}
 Summary:	Modern, advanced, portable, multiprotocol bootloader
 License:	BSD-2-Clause
@@ -3,7 +3,7 @@
 %global priority 90

 %global real_name vala
-%global commit 708bf9d07c78d583d50e64faf59e29f80e67301b
+%global commit c47021eb0bf139a50676a62992a0bab437b30dfa
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git

@@ -201,7 +201,7 @@ export -n VALAFLAGS
 %{_libdir}/pkgconfig/libvala-%{api_ver}.pc

 %files doc
-%doc %{_libdir}/valadoc-%{api_ver}/doclets/devhelp
+%doc %{_datadir}/devhelp/books/vala-%{api_ver}

 %files -n valadoc-nightly
 %{_bindir}/valadoc