fix(klassy): files (#1138 )

Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit 6a1b812195)
chore(gala): bump release (#1133 )
2026-06-06 11:52:17 +00:00 · 2024-04-30 12:12:23 +00:00 · 2024-04-30 08:21:39 +02:00 · 2024-04-29 23:44:15 -05:00 · 2024-04-30 11:10:24 +08:00 · 2024-04-29 21:57:18 +00:00
85 changed files with 1179 additions and 623 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - f40
  pull_request:
    branches:
-      - frawhide
+      - f40
  merge_group:
    branches:
-      - frawhide
+      - f40
  workflow_dispatch:
  workflow_call:

@@ -23,13 +23,13 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Generate build matrix
@@ -40,7 +40,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["40"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -48,7 +48,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -68,10 +68,9 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -7,7 +7,7 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["40"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -21,7 +21,7 @@ jobs:
      - name: Install Anda
        run: cargo install anda

-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          ref: f${{ matrix.version }}
          fetch-depth: 1
@@ -21,7 +21,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["40"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -30,7 +30,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -38,7 +38,7 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
@@ -53,10 +53,9 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -11,7 +11,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["40"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -19,7 +19,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -27,7 +27,7 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
@@ -42,10 +42,9 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -3,20 +3,20 @@ name: Lint
 on:
  push:
    branches:
-      - frawhide
+      - f40
  pull_request:
    branches:
-      - frawhide
+      - f40
  merge_group:
    branches:
-      - frawhide
+      - f40
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Lint spec files
        run: rpmlint $(find anda -type f -name "*.spec" -type f)
@@ -0,0 +1,38 @@
+name: Sync PR to other branches
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - f38
+
+jobs:
+  sync:
+    strategy:
+      matrix:
+        branch: ["f37"]
+      fail-fast: false
+    if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
+          ref: ${{ matrix.branch }}
+      - name: Install SSH key and Setup Git
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config user.name "Raboneko"
+          git config user.email "raboneko@fyralabs.com"
+          git config gpg.format "ssh"
+          git config user.signingkey "${{ runner.temp }}/signing_key"
+      - name: Apply patches and Push
+        run: |
+          curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
+          git am -S --keep-cr --signoff < pr.patch
+          git push -u origin --all
@@ -3,7 +3,7 @@ name: Push comps updates
 on:
  push:
    branches:
-      - frawhide
+      - f40
      - f39
      - f38
      - f37
@@ -15,9 +15,9 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
@@ -8,21 +8,20 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
        run: |
          mkdir -p ${{ runner.temp }}
          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Nightly Update
        run: anda update -vv --filters nightly=1
@@ -31,6 +30,7 @@ jobs:

      - name: Save
        run: |
+          git config --global --add safe.directory "*"
          if [[ `git status --porcelain` ]]; then
            git config user.name "Raboneko"
            git config user.email "raboneko@fyralabs.com"
@@ -46,8 +46,8 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f37 || true
            copy_over f38 || true
-            copy_over f39 || true
-            copy_over f40 || true
+            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -8,21 +8,20 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
        run: |
          mkdir -p ${{ runner.temp }}
          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
        run: anda update -vv
@@ -32,6 +31,7 @@ jobs:

      - name: Save
        run: |
+          git config --global --add safe.directory "*"
          if [[ `git status --porcelain` ]]; then
            git config user.name "Raboneko"
            git config user.email "raboneko@fyralabs.com"
@@ -47,8 +47,9 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
-            copy_over f38 || true
            copy_over f39 || true
-            copy_over f40 || true
+            copy_over f37 || true
+            copy_over f38 || true
+            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -1,9 +1,7 @@
 # Contributing

-First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q).
-
-## Documentations
+First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documentation](https://developer.fyralabs.com/terra), our guidelines may be found there. See the links below:

 * [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
 * [FAQ](https://developer.fyralabs.com/terra/faq)
-* [Policy](https://developer.fyralabs.com/terra/policy)
+* [Policy](https://developer.fyralabs.com/terra/policy)
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.376
+Version:        0.0.346
 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.376
+Version:        0.0.346
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -1,7 +1,7 @@
-%global commit ec447fd4a266e8158519f5e89589c368211bfa14
+%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240502
-%global ver v0.38.0
+%global commit_date 20240325
+%global ver v0.37.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -6,7 +6,7 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.2
+Version:	1.5.2.alpha.1
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
@@ -3,7 +3,7 @@
 Name:           elementary-appcenter
 Summary:        Software Center from elementary
 Version:        7.4.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0

 Provides:       appcenter = %{version}-%{release}
@@ -12,8 +12,6 @@ Obsoletes:      appcenter < 7.2.1-2
 URL:            https://github.com/elementary/appcenter
 Source0:        %url/archive/%{version}/appcenter-%{version}.tar.gz

-Patch0:         pr2099.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -1,311 +0,0 @@
-commit fce55d9373bfb82953191b32e276a2129ffcb8c1
-Author: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
-Date:   Wed Feb 7 00:14:43 2024 +0100
-
-    Add support for AppStream 1.0 (#2099)
-
-diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala
-index 98931505..10f2baab 100644
--- a/src/Core/FlatpakBackend.vala
-+++ b/src/Core/FlatpakBackend.vala
-@@ -400,8 +400,13 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
- 
-         var category_array = new GLib.GenericArray<AppStream.Category> ();
-         category_array.add (category);
-+#if HAS_APPSTREAM_1_0
-+        AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components ().as_array (), category_array, false);
-+        AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components ().as_array (), category_array, false);
-+#else
-         AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components (), category_array, false);
-         AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components (), category_array, false);
-+#endif
-         components = category.get_components ();
- 
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-@@ -417,13 +422,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-         var comps = user_appstream_pool.search (query);
-         if (category == null) {
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 apps.add_all (packages);
-             });
-         } else {
-             var cat_packages = get_applications_for_category (category);
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 foreach (var package in packages) {
-                     if (package in cat_packages) {
-@@ -435,13 +448,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
- 
-         comps = system_appstream_pool.search (query);
-         if (category == null) {
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 apps.add_all (packages);
-             });
-         } else {
-             var cat_packages = get_applications_for_category (category);
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 foreach (var package in packages) {
-                     if (package in cat_packages) {
-@@ -510,7 +531,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-                 continue;
-             }
- 
-+#if HAS_APPSTREAM_1_0
-+            if (package.component.get_developer ().get_name () == author) {
-+#else
-             if (package.component.developer_name == author) {
-+#endif
-                 package_ids.add (package.component.id);
- 
-                 AppCenterCore.Package? user_package = null;
-@@ -1095,7 +1120,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
-         } finally {
-             var comp_validator = ComponentValidator.get_default ();
-+#if HAS_APPSTREAM_1_0
-+            user_appstream_pool.get_components ().as_array ().foreach ((comp) => {
-+#else
-             user_appstream_pool.get_components ().foreach ((comp) => {
-+#endif
-                 if (!comp_validator.validate (comp)) {
-                     return;
-                 }
-@@ -1133,7 +1162,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
-         } finally {
-             var comp_validator = ComponentValidator.get_default ();
-+#if HAS_APPSTREAM_1_0
-+            system_appstream_pool.get_components ().as_array ().foreach ((comp) => {
-+#else
-             system_appstream_pool.get_components ().foreach ((comp) => {
-+#endif
-                 if (!comp_validator.validate (comp)) {
-                     return;
-                 }
-diff --git a/src/Core/Package.vala b/src/Core/Package.vala
-index 0f9a90c4..ed141292 100644
--- a/src/Core/Package.vala
-+++ b/src/Core/Package.vala
-@@ -306,7 +306,11 @@ public class AppCenterCore.Package : Object {
-                 return _author;
-             }
- 
-+#if HAS_APPSTREAM_1_0
-+            _author = component.get_developer ().get_name ();
-+#else
-             _author = component.developer_name;
-+#endif
- 
-             if (_author == null) {
-                 var project_group = component.project_group;
-@@ -677,7 +681,11 @@ public class AppCenterCore.Package : Object {
-             }
- 
-             try {
-+#if HAS_APPSTREAM_1_0
-+                description = AppStream.markup_convert (description, TEXT);
-+#else
-                 description = AppStream.markup_convert_simple (description);
-+#endif
-             } catch (Error e) {
-                 warning ("Failed to convert description to markup: %s", e.message);
-             }
-@@ -919,7 +927,11 @@ public class AppCenterCore.Package : Object {
-     }
- 
-     public AppStream.Release? get_newest_release () {
-+#if HAS_APPSTREAM_1_0
-+        var releases = component.get_releases_plain ().get_entries ();
-+#else
-         var releases = component.get_releases ();
-+#endif
-         releases.sort_with_data ((a, b) => {
-             if (a.get_version () == null || b.get_version () == null) {
-                 if (a.get_version () != null) {
-diff --git a/src/Core/PackageKitBackend.vala b/src/Core/PackageKitBackend.vala
-index 09da4074..a108831e 100644
--- a/src/Core/PackageKitBackend.vala
-+++ b/src/Core/PackageKitBackend.vala
-@@ -275,7 +275,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-         } finally {
-             var new_package_list = new Gee.HashMap<string, Package> ();
-             var comp_validator = ComponentValidator.get_default ();
-+#if HAS_APPSTREAM_1_0
-+            appstream_pool.get_components ().as_array ().foreach ((comp) => {
-+#else
-             appstream_pool.get_components ().foreach ((comp) => {
-+#endif
-                 if (!comp_validator.validate (comp)) {
-                     return;
-                 }
-@@ -317,7 +321,12 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-             component.set_id (id);
-             component.set_origin (Package.APPCENTER_PACKAGE_ORIGIN);
- 
-#if HAS_APPSTREAM_0_15
-+#if HAS_APPSTREAM_1_0
-+            var components = new AppStream.ComponentBox (AppStream.ComponentBoxFlags.NONE);
-+            components.add (component);
-+
-+            appstream_pool.add_components (components);
-+#elif HAS_APPSTREAM_0_15
-             var components = new GenericArray<AppStream.Component> ();
-             components.add (component);
- 
-@@ -430,7 +439,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-                 break;
-             }
- 
-+#if HAS_APPSTREAM_1_0
-+            if (package.component.get_developer ().get_name () == author) {
-+#else
-             if (package.component.developer_name == author) {
-+#endif
-                 packages.add (package);
-             }
-         }
-@@ -447,7 +460,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
- 
-         var category_array = new GLib.GenericArray<AppStream.Category> ();
-         category_array.add (category);
-+#if HAS_APPSTREAM_1_0
-+        AppStream.utils_sort_components_into_categories (appstream_pool.get_components ().as_array (), category_array, true);
-+#else
-         AppStream.utils_sort_components_into_categories (appstream_pool.get_components (), category_array, true);
-+#endif
-         components = category.get_components ();
- 
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-@@ -465,7 +482,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-         var comps = appstream_pool.search (query);
-         if (category == null) {
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var package = get_package_for_component_id (comp.get_id ());
-                 if (package != null) {
-                     apps.add (package);
-@@ -473,7 +494,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-             });
-         } else {
-             var cat_packages = get_applications_for_category (category);
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var package = get_package_for_component_id (comp.get_id ());
-                 if (package != null && package in cat_packages) {
-                     apps.add (package);
-diff --git a/src/Views/AppInfoView.vala b/src/Views/AppInfoView.vala
-index 5a3a361a..bef37f0e 100644
--- a/src/Views/AppInfoView.vala
-+++ b/src/Views/AppInfoView.vala
-@@ -310,8 +310,16 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
-                 oars_flowbox.add (uncurated);
-             }
- #endif
-+
-+#if HAS_APPSTREAM_1_0
-+            var active_locale = "en-US";
-+            if (package_component.get_context () != null) {
-+                active_locale = package_component.get_context ().get_locale () ?? "en-US";
-+            }
-+#else
-             var active_locale = package_component.get_active_locale ();
-            if (active_locale != "en_US") {
-+#endif
-+            if (active_locale != "en_US" && active_locale != "en-US") {
-                 var percent_translated = package_component.get_language (
-                     // Expects language without locale
-                     active_locale.split ("_")[0]
-@@ -492,7 +500,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
-             }
-         }
- 
-+#if HAS_APPSTREAM_1_0
-+        screenshots = package_component.get_screenshots_all ();
-+#else
-         screenshots = package_component.get_screenshots ();
-+#endif
- 
-         if (screenshots.length > 0) {
-             screenshot_carousel = new Hdy.Carousel () {
-@@ -1030,7 +1042,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
-             get_app_download_size.begin ();
- 
-             Idle.add (() => {
-+#if HAS_APPSTREAM_1_0
-+                var releases = package.component.get_releases_plain ().get_entries ();
-+#else
-                 var releases = package.component.get_releases ();
-+#endif
- 
-                 foreach (unowned var release in releases) {
-                     if (release.get_version () == null) {
-@@ -1049,7 +1065,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
- 
-                         release_carousel.add (release_row);
- 
-+#if HAS_APPSTREAM_1_0
-+                        if (package.installed && AppStream.vercmp_simple (release.get_version (), package.get_version ()) <= 0) {
-+#else
-                         if (package.installed && AppStream.utils_compare_versions (release.get_version (), package.get_version ()) <= 0) {
-+#endif
-                             break;
-                         }
-                     }
-diff --git a/src/Widgets/ReleaseRow.vala b/src/Widgets/ReleaseRow.vala
-index 3b487914..36fcbc76 100644
--- a/src/Widgets/ReleaseRow.vala
-+++ b/src/Widgets/ReleaseRow.vala
-@@ -116,7 +116,11 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
-     private string format_release_description (string? description ) {
-         if (description != null) {
-             try {
-+#if HAS_APPSTREAM_1_0
-+                var markup = AppStream.markup_convert (description, TEXT);
-+#else
-                 var markup = AppStream.markup_convert_simple (description);
-+#endif
- 
-                 if (markup.strip () != "") {
-                     return markup;
-diff --git a/src/meson.build b/src/meson.build
-index d3d558ef..df69a0bf 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -78,6 +78,10 @@ if appstream.version().version_compare('>=0.16')
-     args += '--define=HAS_APPSTREAM_0_16'
- endif
- 
-+if appstream.version().version_compare('>=1.0')
-+    args += '--define=HAS_APPSTREAM_1_0'
-+endif
-+
- if get_option('packagekit_backend')
-     appcenter_files += files(
-         'Core/PackageKitBackend.vala',
@@ -3,7 +3,7 @@
 Name:           gala
 Summary:        Gala window manager
 Version:        7.1.3
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
 Epoch:          1

@@ -39,7 +39,7 @@ BuildRequires:  pkgconfig(mutter-clutter-14)
 BuildRequires:  pkgconfig(mutter-cogl-14)
 BuildRequires:  pkgconfig(mutter-cogl-pango-14)

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

 # gala provides a generic icon (apps/multitasking-view)
 Requires:       hicolor-icon-theme
@@ -65,7 +65,7 @@ This package contains the shared libraries.

 %package        devel
 Summary:        Gala window manager development files
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}

 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -9,14 +9,12 @@
 Name:           switchboard-plug-about
 Summary:        Switchboard System Information plug
 Version:        6.2.0
-Release:        3%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-about
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

-Patch0:         https://github.com/elementary/switchboard-plug-about/compare/6.2.0..72d7da13da2824812908276751fd3024db2dd0f8.patch
-
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
@@ -9,11 +9,10 @@ Summary:        Stylish top panel
 Version:        3.0.5
 Release:        1%{?dist}
 License:        GPL-2.0-or-later
-Epoch:          1

 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/elementary/wingpanel/compare/23a3eb7c2448b4f35398116df7d01b075361ef1f..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
+Patch0:         https://github.com/elementary/wingpanel/commit/d6009d9f0d5c7479172093447ccceccba86ff1f3.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -29,11 +28,11 @@ 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-14)
-BuildRequires:  pkgconfig(mutter-cogl-14)
-BuildRequires:  pkgconfig(mutter-cogl-pango-14)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

 # wingpanel ayatana appindicator support was abandoned by upstream
 # wingpanel-indicator-ayatana-2.0.3-10.fc32 retired for fedora 33+
@@ -44,8 +43,8 @@ Obsoletes:      wingpanel-indicator-ayatana < 2.0.3-11

 %package        libs
 Summary:        Stylish top panel (shared library)
-Enhances:       %{name} = %{epoch}:%{version}-%{release}
-Enhances:       %{name}-devel = %{epoch}:%{version}-%{release}
+Enhances:       %{name} = %{version}-%{release}
+Enhances:       %{name}-devel = %{version}-%{release}

 %description    libs %{common_description}

@@ -54,7 +53,7 @@ This package contains the shared library.

 %package        devel
 Summary:        Stylish top panel (development files)
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}

 %description    devel %{common_description}

@@ -3,7 +3,7 @@

 Name:           gnome-shell-extension-%{extension}
 Version:        2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME Shell extension to bring back the app menu
 License:        GPL-3.0-only
 URL:            https://github.com/fthx/appmenu-is-back
@@ -11,8 +11,9 @@ URL:            https://github.com/fthx/appmenu-is-back
 BuildArch:      noarch

 Source0:        https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz
+Patch0:         https://github.com/fthx/appmenu-is-back/commit/c251ff36d226dac679eb745638e3df236d3e1a20.patch

-Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
+Requires:       (gnome-shell >= 46~ with gnome-shell < 47~)
 Recommends:     gnome-extensions-app

 %description
@@ -30,5 +31,8 @@ install -Dm644 extension.js %{buildroot}%{_datadir}/gnome-shell/extensions/%{uui
 %{_datadir}/gnome-shell/extensions/%{uuid}

 %changelog
+* Mon Apr 1 2024 Lleyton Gray <lleyton@fyralabs.com> - 2-2
+- Patch for GNOME 46 compatibility
+
 * Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 2-1
 - Initial Release
@@ -1,13 +1,13 @@
 # from Fedora upstream
 %global extension   pop-shell
 %global uuid        %{extension}@system76.com
-%global commit      cfa0c55e84b7ce339e5ce83832f76fee17e99d51
+%global commit      9a30c5bd49c373896410852d6477596ac4c43bd3
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global commit_date 20240404
+%global commit_date 240218
 %global ver         1.2.0

 Name:           terra-gnome-shell-extension-%{extension}
-Version:        %{ver}^%commit_date.%{shortcommit}
+Version:        %{ver}^%{shortcommit}
 Release:        1%?dist
 Summary:        GNOME Shell extension for advanced tiling window management
 License:        GPL-3.0-only
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 23b9e9ea3694235e19868846bab5292b2518fd34
+%global commit 8328f9a6863b4bae48adfdbc29b32b4c571c6530
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
+%global commit 11bddd982b3643aacdf052cf339ae1ca1873fbb2
 %forgemeta

 Name:           lomiri-app-launch
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager
-%global commit 6e4342ae0ef3710343e2dbf0b8da586853625e2e
+%global commit 682c4928a91da598767e0be2496d9c35af7db035
 %forgemeta

 Name:       lomiri-download-manager
-Version:    0.5.2
-Release:    1%?dist
+Version:    0.1.3
+Release:    1%{?dist}
 Summary:    Upload Download Manager for Lomiri
 License:    LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-download-manager
@@ -1,4 +1,4 @@
-let o = get("https://gitlab.com/api/v4/projects/25034025/repository/tags").json_arr()[0];
+let o = get("https://gitlab.com/api/v4/projects/17088252/repository/tags").json_arr()[0];
 let f = rpm.f;
 rpm.version(o.name);
 // check if changed
@@ -1,16 +1,15 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 10d7151a3e4ea08b92e85be7e6e631c48219feaf
+%global commit 30d9df926b6837b139990a622d39171ea42c9017
 %forgemeta

 Name:       lomiri-system-settings
-Version:    1.1.0
-Release:    1%?dist
+Version:    1.0.2
+Release:    1%{?dist}
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
 Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
-Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch

 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit 28178b0be8fc2c66934da155dee1c6238ecc98c0
+%global commit 454d980c352f3cea725458ff8a3d04ae686d2a96
 %forgemeta

 Name:           lomiri-ui-toolkit
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit a083a14fe65105fc1996ceb1b92165ca3b0cb94e
+%global commit 426b9f3436938f149490cee340e1fab79ee7b650
 %forgemeta

 Name:          lomiri
@@ -1,6 +1,6 @@
 Name:           unity-settings-daemon
 Version:        15.04.1+21.10.20220802
-Release:        2%?dist
+Release:        %autorelease
 Summary:        Daemon handling for Unity session settings

 License:        GPL-2.0 AND LGPL-2.0-or-later
@@ -0,0 +1,6 @@
+project pkg {
+	arches = ["x86_64"]
+	rpm {
+		spec = "iosevka-fusion-fonts.spec"
+	}
+}
@@ -0,0 +1,142 @@
+%global         source_name Iosevka
+%global         debug_package %{nil}
+
+Name:           iosevka-fusion-fonts
+Version:        29.2.0
+Release:        1%?dist
+Summary:        A custom font based on iosevka
+
+License:        OFL-1.1
+URL:            https://github.com/be5invis/Iosevka
+Source0:        %{url}/archive/v%{version}.tar.gz
+Source1:        iosevka-fusion.toml
+
+BuildArch:      noarch
+
+BuildRequires:  clang
+BuildRequires:  nodejs-npm
+BuildRequires:  ttfautohint
+
+%description
+Based on Iosevka font, https://github.com/be5invis/Iosevka,
+this font mixes elements from various fonts tailored to my personal taste.
+
+%prep
+%autosetup -n %{source_name}-%{version}
+%__cp %SOURCE1 %{_builddir}/%{source_name}-%{version}/private-build-plans.toml
+
+%build
+npm install
+npm run build -- ttf::iosevka-fusion
+
+%install
+%__mkdir -p %{buildroot}%{_datadir}/fonts/%{name}
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-bold.ttf             \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Bold.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-bolditalic.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BoldItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-book.ttf             \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Book.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-bookitalic.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BookItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extrabold.ttf        \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBold.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extrabolditalic.ttf  \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBoldItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extralight.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLight.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extralightitalic.ttf \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLightItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-heavy.ttf            \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Heavy.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-heavyitalic.ttf      \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-HeavyItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-italic.ttf           \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Italic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-light.ttf            \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Light.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-lightitalic.ttf      \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-LightItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-medium.ttf           \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Medium.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-mediumitalic.ttf     \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-MediumItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-regular.ttf          \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Regular.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-semibold.ttf         \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBold.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-semibolditalic.ttf   \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBoldItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-thin.ttf             \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Thin.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-thinitalic.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ThinItalic.ttf
+
+%files
+%license LICENSE.md
+%doc README.md
+%{_datadir}/fonts/*
+
+%changelog
+* Wed Dec 28 2022 windowsboy111 <windowsboy111@fyralabs.com> - 16.8.4
+- Initial package
@@ -0,0 +1,190 @@
+[buildPlans.iosevka-fusion]
+family      = "Iosevka Fusion"
+spacing     = "fixed"
+serifs      = "sans"
+
+[buildPlans.iosevka-fusion.variants.design]
+cv01 = 1    # A cap straight
+cv02 = 1    # B cap straight
+cv03 = 1    # C cap serifless
+cv04 = 1    # D cap serifless
+cv05 = 1    # E cap serifless
+cv06 = 1    # F cap serifless
+cv07 = 6    # G cap toothless rounded serifless hooked
+cv08 = 1    # H cap serifless
+cv09 = 1    # I cap long serifs
+cv10 = 2    # J cap serified
+cv11 = 2    # K cap curly
+cv12 = 1    # L cap serifless
+cv13 = 1    # M cap short middle leg
+cv14 = 1    # N cap symmetric
+cv15 = 1    # P cap straight
+cv16 = 4    # Q cap crossing tail
+cv17 = 1    # R cap straight
+cv18 = 1    # S cap serifless
+cv19 = 1    # T cap serifless
+cv20 = 3    # U cap serifless
+cv21 = 1    # V cap straight
+cv22 = 1    # W straight
+cv23 = 1    # X cap straight
+cv24 = 1    # Y cap straight
+cv25 = 1    # Z cap straight
+cv28 = 1    # c serifless
+cv33 = 1    # h straight
+cv34 = 10   # i serified flat tailed
+cv35 = 6    # j flat hook serified
+cv37 = 10   # l serified flat tailed
+cv42 = 9    # r compact
+cv43 = 1    # s serifless
+cv44 = 2    # t flat hook
+cv49 = 6    # y cursive flat terminal hook
+cv53 = 1    # Λ, Δ lambda and delta cap straight
+cv54 = 2    # α alpha straight tailed
+cv55 = 1    # δ delta rounded top
+cv56 = 1    # Γ gamma cap straight
+cv57 = 6    # ι iota serified flat tailed
+cv58 = 2    # λ lambda top tailed
+cv59 = 1    # μ me tailless
+cv60 = 2    # ξ xe flat top
+cv77 = 13   # 0 oval dashed forward slash
+cv80 = 2    # 3 arched
+cv82 = 2    # 5 open contour
+cv84 = 1    # 7 straight
+cv85 = 3    # 8 two asymmetric circles
+cv89 = 2    # ~ tilde low
+cv90 = 3    # * asterisk five-pointed low
+cv91 = 1    # _ underscore right below baseline
+cv92 = 1    # ^ uptick high
+cv93 = 1    # ( parentheses normal slope
+cv94 = 2    # { braces curly
+cv95 = 1    # # column straight
+cv97 = 4    # @ three-fold, tall height
+cv98 = 2    # $ dollar strike through
+VXSF = 2    # ¢ cent strike through
+cv99 = 1    # % percent dots
+VXSA = 1    # | bar natural slope
+VXSB = 1    # ' single quote straight
+VXSC = 1    # ` grave/backtick straight
+VXSD = 1    # ? smooth
+cv88 = 2    # .:; square punctuation marks
+cv87 = 2    # ijäöü square diacretics
+
+[buildPlans.iosevka-fusion.variants.upright]
+cv26 = 3    # a double storey rounded
+cv27 = 2    # b rounded
+cv29 = 2    # d rounded
+cv30 = 1    # e straight
+cv31 = 16   # f serifless bottom flat top crossbar at x height
+cv32 = 9    # g single storey flat hook earless cornered top
+cv36 = 1    # k straight
+cv38 = 5    # m earless normal middle leg
+cv39 = 3    # n earless straight
+cv40 = 2    # p earless
+cv41 = 2    # q earless
+cv45 = 2    # u rounded
+cv46 = 1    # v straight
+cv47 = 1    # w straight
+cv48 = 1    # x straight
+cv50 = 1    # z straight
+cv78 = 3    # 1 serified with base
+cv79 = 1    # 2 straight
+cv81 = 3    # 4 semi-open contour
+cv83 = 3    # 6 straight
+cv86 = 3    # 9 straight
+cv96 = 2    # & et open top (ampersand)
+
+[buildPlans.iosevka-fusion.variants.italic]
+cv26 = 1    # a double storey straight
+cv27 = 1    # b straight
+cv29 = 1    # d straight
+cv30 = 2    # e curly
+cv31 = 18   # f flat hook tailed crossbar at x height
+cv32 = 7    # g single storey flat hook
+cv36 = 2    # k curly
+cv38 = 1    # m straight normal middle leg
+cv39 = 1    # n straight
+cv40 = 1    # p straight
+cv41 = 1    # q straight
+cv45 = 1    # u straight
+cv46 = 2    # v curly
+cv47 = 2    # w curly short middle top
+cv48 = 2    # x curly
+cv50 = 4    # z curly
+cv78 = 2    # 1 serified no base
+cv79 = 2    # 2 curly
+cv81 = 1    # 4 closed contour crossing
+cv83 = 1    # 6 closed contour
+cv86 = 1    # 9 closed contour
+cv96 = 4    # & et open top toothed (ampersand)
+
+[buildPlans.iosevka-fusion.weights.thin]
+shape = 100
+menu  = 100
+css   = 100
+
+[buildPlans.iosevka-fusion.weights.extralight]
+shape = 200
+menu  = 200
+css   = 200
+
+[buildPlans.iosevka-fusion.weights.light]
+shape = 300
+menu  = 300
+css   = 300
+
+[buildPlans.iosevka-fusion.weights.regular]
+shape = 400
+menu  = 400
+css   = 400
+
+[buildPlans.iosevka-fusion.weights.book]
+shape = 450
+menu  = 450
+css   = 450
+
+[buildPlans.iosevka-fusion.weights.medium]
+shape = 500
+menu  = 500
+css   = 500
+
+[buildPlans.iosevka-fusion.weights.semibold]
+shape = 600
+menu  = 600
+css   = 600
+
+[buildPlans.iosevka-fusion.weights.bold]
+shape = 700
+menu  = 700
+css   = 700
+
+[buildPlans.iosevka-fusion.weights.extrabold]
+shape = 800
+menu  = 800
+css   = 800
+
+[buildPlans.iosevka-fusion.weights.heavy]
+shape = 900
+menu  = 900
+css   = 900
+
+[buildPlans.iosevka-fusion.slopes.upright]
+angle = 0
+shape = "upright"
+menu  = "upright"
+css   = "normal"
+
+[buildPlans.iosevka-fusion.slopes.italic]
+angle = 9.4
+shape = "italic"
+menu  = "italic"
+css   = "italic"
+
+[buildPlans.iosevka-fusion.widths.normal]
+shape = 600
+menu  = 5
+css   = "normal"
+
+[buildPlans.iosevka-fusion.metric-override]
+leading = 1350
+sb = 60
+xHeight = 530
@@ -0,0 +1 @@
+rpm.version(gh("be5invis/Iosevka"));
@@ -1,10 +1,11 @@
 Name:			seto-fonts
 Version:		6.20
-Release:		3%?dist
+Release:		2%?dist
 URL:			https://setofont.osdn.jp/
-Source0:		https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz
+Source0:		https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip
 License:		OFL-1.1
 Summary:		A handwritten font that contains kanji up to JIS 4th level and difficult kanji
+BuildRequires:	unzip
 BuildArch:		noarch


@@ -13,7 +14,7 @@ BuildArch:		noarch


 %prep
-%setup -q -n pkg-seto-fonts-%version
+%setup -q -n setofont

 %build

@@ -24,8 +25,11 @@ install -Dm644 *.ttf %buildroot/%_datadir/fonts/%name/

 %files
 %doc readme.txt
-%license LICENSE.md
 %_datadir/fonts/%name/

 %changelog
-%autochangelog
+* Sun Jun 18 2023 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-2
+- Fix install dir.
+
+* Tue Nov 22 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-1
+- Initial package
@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit bfac12604e9cd0884987ca89f34a455cf16c543c
+%global commit df0280f52b68f4352d8da711136609c16ce4db7b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
 %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
 %global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8

-%global commit_date 20240501
+%global commit_date 20240325
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -0,0 +1,79 @@
+From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001
+From: seth <getchoo@tuta.io>
+Date: Sun, 15 Jan 2023 14:47:49 -0500
+Subject: [PATCH] find cmark with pkgconfig
+
+Signed-off-by: seth <getchoo@tuta.io>
+---
+ cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 59 insertions(+)
+ create mode 100755 cmake/Findcmark.cmake
+
+diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake
+new file mode 100755
+index 00000000..9858e5df
+--- /dev/null
+++ b/cmake/Findcmark.cmake
+@@ -0,0 +1,59 @@
+# SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+# SPDX-License-Identifier: GPL-3.0-only
+
+#
+# CMake module to search for the cmark library
+#
+
+# first try to find cmark-config.cmake
+# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
+find_package(cmark CONFIG QUIET)
+if(cmark_FOUND AND TARGET cmark::cmark)
+  # found it!
+  return()
+endif()
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_CMARK QUIET cmark)
+endif()
+
+if(NOT CMARK_INCLUDE_DIR)
+  find_path(CMARK_INCLUDE_DIR
+            NAMES cmark.h
+            PATHS
+            ${PC_CMARK_INCLUDEDIR}
+            ${PC_CMARK_INCLUDE_DIRS}
+            /usr/include
+            /usr/local/include)
+endif()
+
+if(NOT CMARK_LIBRARY)
+  find_library(CMARK_LIBRARY
+               NAMES cmark
+               HINTS
+               ${PC_CMARK_LIBDIR}
+               ${PC_CMARK_LIBRARY_DIRS}
+               /usr/lib
+               /usr/local/lib)
+endif()
+
+if(NOT TARGET cmark::cmark)
+  add_library(cmark::cmark UNKNOWN IMPORTED)
+  set_target_properties(cmark::cmark
+                        PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+                                   ${CMARK_INCLUDE_DIR})
+  set_property(TARGET cmark::cmark APPEND
+               PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(cmark
+                                  DEFAULT_MSG
+                                  CMARK_INCLUDE_DIR
+                                  CMARK_LIBRARY)
+
+mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR)
+
+set(CMARK_LIBRARIES ${CMARK_LIBRARY})
+set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR})
+-- 
+2.39.0
+
@@ -0,0 +1,8 @@
+project pkg {
+	rpm {
+		spec = "prismlauncher-qt5-nightly.spec"
+	}
+	labels {
+		nightly = "1"
+	}
+}
@@ -0,0 +1,198 @@
+%global real_name prismlauncher
+%global nice_name PrismLauncher
+
+%global commit df0280f52b68f4352d8da711136609c16ce4db7b
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
+%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
+%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
+
+%global commit_date 20240325
+%global snapshot_info %{commit_date}.%{shortcommit}
+
+%bcond_with qt6
+
+# Change this variables if you want to use custom keys
+# Leave blank if you want to build Prism Launcher without MSA id or curseforge api key
+%define msa_id default
+%define curseforge_key default
+
+%if %{with qt6}
+%global qt_version 6
+%global min_qt_version 6
+%else
+%global qt_version 5
+%global min_qt_version 5.12
+%endif
+
+%global build_platform terra
+
+%if %{with qt6}
+Name:             prismlauncher-nightly
+%else
+Name:             prismlauncher-qt5-nightly
+%endif
+Version:          9.0^%{snapshot_info}
+Release:          1%?dist
+Summary:          Minecraft launcher with ability to manage multiple instances
+License:          GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
+Group:            Amusements/Games
+URL:              https://prismlauncher.org/
+Source0:          https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz
+Source1:          https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz
+Source2:          https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz
+Source3:          https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz
+Patch0:           0001-find-cmark-with-pkgconfig.patch
+
+BuildRequires:    cmake >= 3.15
+BuildRequires:    extra-cmake-modules
+BuildRequires:    gcc-c++
+BuildRequires:    java-17-openjdk-devel
+BuildRequires:    desktop-file-utils
+BuildRequires:    libappstream-glib
+BuildRequires:    cmake(ghc_filesystem)
+BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Gui) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
+
+%if %{with qt6}
+BuildRequires:    cmake(Qt6Core5Compat)
+%endif
+
+BuildRequires:    pkgconfig(libcmark)
+%if 0%{fedora} < 38
+BuildRequires:    cmark
+%endif
+BuildRequires:    pkgconfig(scdoc)
+BuildRequires:    pkgconfig(zlib)
+
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
+
+Requires:         qt%{qt_version}-qtimageformats
+Requires:         qt%{qt_version}-qtsvg
+Requires:         javapackages-filesystem
+Recommends:       java-21-openjdk
+Recommends:       java-17-openjdk
+Suggests:         java-1.8.0-openjdk
+
+# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+Recommends:       xrandr
+# libflite needed for using narrator in minecraft
+Recommends:       flite
+# Prism supports enabling gamemode
+Suggests:         gamemode
+
+Conflicts:        %{real_name}
+Conflicts:        %{real_name}-qt5
+%if %{without qt6}
+Conflicts:        %{real_name}-nightly
+%endif
+
+
+%description
+A custom launcher for Minecraft that allows you to easily manage
+multiple installations of Minecraft at once (Fork of MultiMC)
+
+
+%prep
+%autosetup -p1 -n PrismLauncher-%{commit}
+
+tar -xzf %{SOURCE1} -C libraries
+tar -xvf %{SOURCE2} -C libraries
+tar -xvf %{SOURCE3} -C libraries
+
+rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/
+mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus
+mv -f libraries/quazip-%{quazip_commit} libraries/quazip
+mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus
+
+# Do not set RPATH
+sed -i "s|\$ORIGIN/||" CMakeLists.txt
+
+
+%build
+%cmake \
+  -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
+  -DLauncher_BUILD_PLATFORM="%{build_platform}" \
+  %if "%{msa_id}" != "default"
+  -DLauncher_MSA_CLIENT_ID="%{msa_id}" \
+  %endif
+  %if "%{curseforge_key}" != "default"
+  -DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \
+  %endif
+  -DBUILD_TESTING=OFF
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+
+%check
+%ctest
+
+
+%files
+%doc README.md
+%license LICENSE COPYING.md
+%dir %{_datadir}/%{nice_name}
+%{_bindir}/%{real_name}
+%{_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
+%{_datadir}/mime/packages/modrinth-mrpack-mime.xml
+%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories
+%{_mandir}/man?/prismlauncher.*
+
+
+%changelog
+* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 8.0^20230726.4f00012-1
+- remove terra-fractureiser-detector from recommends, use proper build platform,
+  and add patches for epel/older fedora versions
+
+* Sun Jul 23 2023 seth <getchoo at tuta dot io> - 8.0^20230722.273d75f-1
+- update submodules, version, & use autorelease
+
+* Wed Jun 07 2023 seth <getchoo at tuta dot io> - 7.0^20230603.954d4d7-1
+- specify jdk 17 + cleanup outdated patches/scriptlets
+
+* Sun May 14 2023 seth <getchoo at tuta dot io> - 7.0^20230513.c5aff7c-1
+- add qtlogging.ini to files list
+
+* Mon Mar 20 2023 seth <getchoo at tuta dot io> - 7.0^20230319.6dcf34a-1
+- recommend flite to support narrator in minecraft
+
+* Fri Feb 03 2023 seth <getchoo at tuta dot io> - 7.0^20230203.58d9ced-1
+- disable tests and explicitly require cmark
+
+* Sun Jan 15 2023 seth <getchoo at tuta dot io> - 7.0^20230115.f1247d2-1
+- add 0001-find-cmark-with-pkgconfig.patch
+
+* Fri Jan 13 2023 seth <getchoo at tuta dot io> - 7.0^20230113.3de681d-1
+- add cmark as a build dep
+
+* Tue Jan 03 2023 seth <getchoo at tuta dot io> - 7.0^20230102.4b12c85-1
+- add qlogging categories
+
+* Mon Dec 05 2022 seth <getchoo at tuta dot io> - 6.0^20221204.79d5bef-1
+- revise file to better follow fedora packaging guidelines and add java 8 as a
+  dependency
+
+* Thu Nov 10 2022 seth <getchoo at tuta dot io> - 5.1-0.1.20221110.e6d057f
+- add package to Amusements/Games
+
+* Sun Nov 06 2022 seth <getchoo at tuta dot io> - 5.0-0.1.20221105.9fb80a2
+- update installed files
+
+* Thu Oct 27 2022 seth <getchoo at tuta dot io> - 5.0-0.1.20221027.610b971
+- initial commit
@@ -0,0 +1,11 @@
+if filters.contains("nightly") {
+	rpm.global("commit", gh_commit("PrismLauncher/PrismLauncher"));
+	if rpm.changed() {
+		rpm.release();
+		let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt");
+		let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1);
+		let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1);
+		rpm.global("commit_date", date());
+		rpm.version(`${maj}.${min}^%{snapshot_info}`);
+	}
+}
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "prismlauncher-qt5.spec"
+	}
+}
@@ -0,0 +1,188 @@
+%global real_name prismlauncher
+%global nice_name PrismLauncher
+%bcond_with qt6
+
+# Change this variables if you want to use custom keys
+# Leave blank if you want to build Prism Launcher without MSA id or curseforge api key
+%define msa_id default
+%define curseforge_key default
+
+%if %{with qt6}
+%global qt_version 6
+%global min_qt_version 6
+%else
+%global qt_version 5
+%global min_qt_version 5.12
+%endif
+
+%global build_platform terra
+
+%if %{with qt6}
+Name:             prismlauncher
+%else
+Name:             prismlauncher-qt5
+%endif
+Version:          8.2
+Release:          2%?dist
+Summary:          Minecraft launcher with ability to manage multiple instances
+# see COPYING.md for more information
+# each file in the source also contains a SPDX-License-Identifier header that declares its license
+License:          GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
+Group:            Amusements/Games
+URL:              https://prismlauncher.org/
+Source0:          https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz
+
+BuildRequires:    cmake >= 3.15
+BuildRequires:    extra-cmake-modules
+BuildRequires:    gcc-c++
+BuildRequires:    java-17-openjdk-devel
+BuildRequires:    desktop-file-utils
+BuildRequires:    libappstream-glib
+BuildRequires:    cmake(ghc_filesystem)
+BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Gui) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
+
+%if %{with qt6}
+BuildRequires:    cmake(Qt6Core5Compat)
+%endif
+
+BuildRequires:    pkgconfig(libcmark)
+BuildRequires:    pkgconfig(scdoc)
+BuildRequires:    pkgconfig(zlib)
+
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
+
+Requires:         qt%{qt_version}-qtimageformats
+Requires:         qt%{qt_version}-qtsvg
+Requires:         javapackages-filesystem
+Recommends:       java-21-openjdk
+Recommends:       java-17-openjdk
+Suggests:         java-1.8.0-openjdk
+
+# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+Recommends:       xrandr
+# libflite needed for using narrator in minecraft
+Recommends:       flite
+
+# Prism supports enabling gamemode
+Suggests:         gamemode
+
+%if %{without qt6}
+Conflicts:        %{real_name}
+%endif
+
+%description
+A custom launcher for Minecraft that allows you to easily manage
+multiple installations of Minecraft at once (Fork of MultiMC)
+
+
+%prep
+%autosetup -n PrismLauncher-%{version}
+
+rm -rf libraries/{extra-cmake-modules,filesystem,zlib}
+
+# Do not set RPATH
+sed -i "s|\$ORIGIN/||" CMakeLists.txt
+
+
+%build
+%cmake \
+  -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
+  -DLauncher_BUILD_PLATFORM="%{build_platform}" \
+  %if "%{msa_id}" != "default"
+  -DLauncher_MSA_CLIENT_ID="%{msa_id}" \
+  %endif
+  %if "%{curseforge_key}" != "default"
+  -DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \
+  %endif
+  -DBUILD_TESTING=OFF
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+
+%check
+%ctest
+
+
+%files
+%doc README.md
+%license LICENSE COPYING.md
+%dir %{_datadir}/%{nice_name}
+%{_bindir}/prismlauncher
+%{_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
+%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories
+%{_mandir}/man?/prismlauncher.*
+%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
+
+
+%changelog
+* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
+- move JREs to weak deps, add java 21 for snapshots
+
+* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
+- remove terra-fractureiser-detector from recommends, use proper build platform
+
+* Thu Jun 08 2023 seth <getchoo@tuta.io> - 6.3-3
+- specify jdk 17 + cleanup outdated patches/scriptlets
+
+* Mon Mar 20 2023 seth <getchoo at tuta dot io> - 6.3-2
+- recommend flite to support narrator in minecraft
+
+* Sat Feb 04 2023 seth <getchoo at tuta dot io> - 6.3-1
+- update to 6.3
+
+* Mon Dec 19 2022 seth <getchoo at tuta dot io> - 6.1-2
+- start using non-headless java deps
+
+* Mon Dec 12 2022 seth <getchoo at tuta dot io> - 6.0-1
+- update to 6.0
+
+* Mon Dec 05 2022 seth <getchoo at tuta dot io> - 5.2-3
+- revise file to better follow fedora packaging guidelines and add java 8 as a
+  dependency
+
+* Tue Nov 15 2022 seth <getchoo at tuta dot io> - 5.2-2
+- use newer version of toml++ to fix issues on aarch64
+
+* Tue Nov 15 2022 seth <getchoo at tuta dot io> - 5.2-1
+- update to 5.2
+
+* Thu Nov 10 2022 seth <getchoo at tuta dot io> - 5.1-2
+- add package to Amusements/Games
+
+* Tue Nov 01 2022 seth <getchoo at tuta dot io> - 5.1-1
+- update to 5.1
+
+* Wed Oct 19 2022 seth <getchoo at tuta dot io> - 5.0-3
+- add missing deps and build with qt6 by default
+
+* Wed Oct 19 2022 seth <getchoo at tuta dot io> - 5.0-2
+- add change-jars-path.patch to allow for package-specific jar path
+
+* Wed Oct 19 2022 seth <getchoo at tuta dot io> - 5.0-1
+- update to version 5.0
+
+* Tue Oct 18 2022 Cappy Ishihara <cappy@cappuchino.xyz> - 1.4.2.git981e9cf-0.2.20221018.981e9cf
+- Update provides and obsoletes
+
+* Tue Oct 18 2022 seth <getchoo at tuta dot io> - 1.4.2.git981e9cf-0.1.20221018.981e9cf
+- start using qt6
+
+* Tue Oct 18 2022 Cappy Ishihara <cappy@cappuchino.xyz> - 1.4.2-1
+- Repackaged as Prism Launcher
@@ -0,0 +1 @@
+rpm.version(gh("PrismLauncher/PrismLauncher"));
@@ -1,8 +1,8 @@
 %define debug_package %nil

 Name:			crystal
-Version:		1.12.1
-Release:		1%?dist
+Version:		1.11.2
+Release:		1%{?dist}
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
 URL:			https://crystal-lang.org/
@@ -1,2 +1,2 @@
 let html = get("https://crystal-lang.org/");
-rpm.version(find("Latest release: <strong>(.+?)</strong>", html, 1))
+rpm.version(find("Latest release <.+>(.+)</a>", html, 1))
@@ -1,13 +1,13 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 185e06c92362083c06c76f87e325889b1c9dc659
+%global commit 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
-%global commit_date 20240502
+%global commit_date 20240322
 %global debug_package %nil

 Name:			nim-nightly
 Version:		%ver^%commit_date.%shortcommit
-Release:		1%?dist
+Release:		2%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD
 URL:			https://nim-lang.org
@@ -1,6 +0,0 @@
-project pkg {
-  arches = ["x86_64"]
-  rpm {
-	spec = "python-pip-system-certs.spec"
-  }
-}
@@ -1,56 +0,0 @@
-# Created by pyp2rpm-3.3.10
-%global pypi_name pip-system-certs
-%global pypi_version 4.0
-
-Name:           python-%{pypi_name}
-Version:        %{pypi_version}
-Release:        1%{?dist}
-Summary:        Live patches pip to use system certs by default
-
-License:        BSD-2-Clause
-URL:            https://gitlab.com/alelec/pip-system-certs
-Source0:        https://files.pythonhosted.org/packages/source/p/%{pypi_name}/pip_system_certs-%{pypi_version}.tar.gz
-BuildArch:      noarch
-
-BuildRequires:  python3-devel python3-pip python3dist(setuptools) python3dist(wheel) git
-
-
-%description
-This package patches pip and requests at runtime to use
-certificates from the default system store (rather than the bundled certs
-ca). This will allow pip to verify tls/ssl connections to servers who's cert is
-trusted by your system install.
-
-%package -n     python3-%{pypi_name}
-Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
-
-Requires:       python3dist(wrapt) >= 1.10.4
-%description -n python3-%{pypi_name}
-This package patches pip and requests at runtime to use
-certificates from the default system store (rather than the bundled certs
-ca). This will allow pip to verify tls/ssl connections to servers who's cert is
-trusted by your system install.
-
-%prep
-%autosetup -n pip_system_certs-%{pypi_version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-
-%build
-pip install git-versioner
-%pyproject_wheel
-
-%install
-%pyproject_install
-
-%pyproject_save_files pip_system_certs
-
-%files -n python3-%{pypi_name} -f %pyproject_files
-%license LICENSE
-%doc README.rst
-%python3_sitelib/pip_system_certs.pth
-
-%changelog
-* Thu Apr 04 2024 madomado <madonuko@outlook.com> - 4.0-1
- Initial package.
@@ -1 +0,0 @@
-rpm.global("pypi_version", pypi("pip-system-certs"));
@@ -1,5 +1,5 @@
 Name:			nushell
-Version:		0.93.0
+Version:		0.92.2
 Release:		1%?dist
 Summary:		A new type of shell
 License:		MIT
@@ -1,25 +0,0 @@
-From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001
-From: madomado <madonuko@outlook.com>
-Date: Mon, 25 Mar 2024 18:33:25 +0800
-Subject: [PATCH] gix 0.61.1 -> 0.61.0
-
---
- Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index d98ba90..c3059c9 100644
--- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -82,7 +82,7 @@ version = "1.0.4"
- version = "0.4.3"
- 
- [dependencies.gix]
-version = "0.61.1"
-+version = "0.61.0"
- features = [
-     "max-performance-safe",
-     "revision",
-- 
-2.44.0
-
@@ -1,20 +1,21 @@
-# Generated by rust2rpm 26
-#bcond_without check
+%global debug_package %{nil}
+# Generated by rust2rpm 24
+%bcond_without check

 %global crate starship

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

 License:        ISC
 URL:            https://crates.io/crates/starship
 Source:         %{crates_source}
-# Automatically generated patch to strip dependencies and normalize metadata
-Patch0:         starship-fix-metadata-auto.diff
+# Automatically generated patch to strip foreign dependencies
+Patch:          starship-fix-metadata-auto.diff

-BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  rust-packaging >= 21
 BuildRequires:  anda-srpm-macros
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
@@ -28,13 +29,11 @@ shell! ☄🌌️.}

 %package     -n %{crate}
 Summary:        %{summary}
-License:        ISC

 %description -n %{crate} %{_description}

 %files       -n %{crate}
 %license LICENSE
-#license LICENSE.dependencies
 %doc README.md
 %{_bindir}/starship

@@ -171,14 +170,14 @@ use the "starship-battery" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml

 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep_online

 %build
-%{cargo_build}
+%cargo_build

 %install
-%{cargo_install}
+%cargo_install

 %if %{with check}
 %check
@@ -1,6 +1,6 @@
--- starship-1.18.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ starship-1.18.1/Cargo.toml	2024-03-24T13:14:24.022475+00:00
-@@ -263,18 +263,3 @@
+--- starship-1.14.2/Cargo.toml	1970-01-01T00:00:01+00:00
+++ starship-1.14.2/Cargo.toml	2023-04-25T12:48:23.509565+00:00
+@@ -254,18 +254,3 @@
 ]
 default-features = false
 
@@ -8,7 +8,7 @@
 -version = "0.2.0"
 -
 -[target."cfg(windows)".dependencies.windows]
-version = "0.54.0"
+-version = "0.48.0"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_UI_Shell",
@@ -5,7 +5,7 @@
 %global crate zellij

 Name:           rust-zellij
-Version:        0.40.1
+Version:        0.40.0
 Release:        1%?dist
 Summary:        Terminal workspace with batteries included

@@ -1,9 +1,9 @@
 %global real_name vala-language-server

-%global commit a49292758922160244d1842cdcba0a5154d1cb27
+%global commit 0b020298aa3dafacd2f6633533ca91fba5698340
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

-%global commit_date 20240330
+%global commit_date 20240323
 %global snapshot_info %{commit_date}.%{shortcommit}
 %global verrel 0.48.7

@@ -3,11 +3,11 @@
 %global priority 90

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

-%global commit_date 20240426
+%global commit_date 20240218
 %global snapshot_info %{commit_date}.%{shortcommit}

 Name:           vala-nightly
@@ -1 +0,0 @@
-rpm.version(gitlab("6865057"));
@@ -1,9 +1,10 @@
-Name:    vala-panel
-Version: 24.03
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel
+%global commit ead4e7a36b0e4b0a2ac43c5d9ca17eb753461afe
 %forgemeta

-Release: 1%?dist
+Name:    vala-panel
+Version: 0.5.0
+Release: 2%?dist
 License: LGPL-3.0-or-later
 Summary: This package provides Application Menu plugin for vala-panel
 Group:   System/GUI/Other
@@ -37,7 +38,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %forgeautosetup

 %build
-%meson -Dwnck=enabled -Dplatforms='wayland,x11'
+%meson -Dwnck=enabled -Dplatforms='layer-shell,x11'
 %meson_build

 %install
@@ -72,7 +73,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
 %{_datadir}/vala-panel/applets/*.plugin
 %dir %{_datadir}/vala-panel/images
 %{_datadir}/vala-panel/images/background.png
-%{_libdir}/girepository-1.0/ValaPanel-%version.typelib

 %files devel
 %doc README.md
@@ -82,7 +82,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
 %{_libdir}/libvalapanel.so
 %{_libdir}/pkgconfig/vala-panel.pc
 %{_datadir}/vala/vapi/vala-panel.*
-%{_datadir}/gir-1.0/ValaPanel-%version.gir

 %changelog
 %autochangelog
@@ -2,8 +2,8 @@
 %global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})

-%global openh264_version 2.4.1
-%global gst_version 1.24.3
+%global openh264_version 2.4.0
+%global gst_version 1.23.2

 Name:           openh264
 Version:        %{openh264_version}
@@ -1,5 +1,5 @@
-%global commit 77b34797d89d23ccfab3f3e1eab532f0bc73ab38
-%global ver 1.8.28
+%global commit 586bc784138042d2710168cd0b29f5dd6d415f45
+%global ver 1.8.26
 %global commit_date 20240219
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

@@ -3,12 +3,12 @@
 Name:       kwin-system76-scheduler-integration

 %global forgeurl https://github.com/maxiberta/%{name}
-%global commit e00f1b74998d6513552633c791ea23ffa3fe78a0
-%global date 20240425
+%global commit 093a269670275feaa240d02c712f1ec8b812fd80
+%global date 20240320
 %forgemeta

 Version:    0.1
-Release:    1%?dist
+Release:    6%?dist
 Summary:    Notify the System76 Scheduler which app has focus so it can be prioritized
 License:    MIT
 URL:        %forgeurl
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -euo pipefail
+
+DBUS_SERVICE="com.system76.Scheduler"
+DBUS_PATH="/com/system76/Scheduler"
+DBUS_INTERFACE="com.system76.Scheduler"
+DBUS_METHOD="SetForegroundProcess"
+
+while true; do 
+  read method call time sender _ dest serial path interface member
+  read type pid
+  [ "$member" = "member=$DBUS_METHOD" ] && qdbus --system $DBUS_SERVICE $DBUS_PATH $DBUS_INTERFACE.$DBUS_METHOD $pid
+done < <(dbus-monitor "destination=$DBUS_SERVICE,path=$DBUS_PATH,interface=$DBUS_INTERFACE,member=$DBUS_METHOD")
@@ -1,5 +1,5 @@
 rpm.global("commit", gh_commit("maxiberta/kwin-system76-scheduler-integration"));
 if rpm.changed() {
  rpm.global("date", date()); // remove if we don't need the `date` macro
-  rpm.release();
+    rpm.release();
 }
@@ -4,7 +4,7 @@
 %define _build_id_links none

 Name: sass
-Version: 1.76.0
+Version: 1.75.0
 Release: 1%?dist
 Summary: The reference implementation of Sass, written in Dart
 License: MIT
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "chromebook-wireplumber-config.spec"
+	}
+}
@@ -0,0 +1,36 @@
+%global commit 4f5a96a359e0917ace6ae3778618a46d5e88c45a
+%global commit_date 20240322
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global debug_package %{nil}
+%define __os_install_post %{nil}
+
+Name:           chromebook-wireplumber-config
+Version:        %commit_date.%shortcommit
+Release:        1%?dist
+
+License:        Apache-2.0
+Summary:        Chromebook wireplumber configs
+URL:            https://github.com/WeirdTreeThing/chromebook-linux-audio
+Source0:        https://github.com/WeirdTreeThing/chromebook-linux-audio/archive/%commit/chromebook-linux-audio-%commit.tar.gz
+
+Requires:       wireplumber
+
+%description
+WeirdTreeThing's wireplumber configs for chromebooks.
+
+%prep
+%autosetup -n chromebook-linux-audio-%commit
+
+%install
+mkdir -p %buildroot/etc/wireplumber/main.lua.d
+cp conf/avs/51-avs-dmic.lua %buildroot/etc/wireplumber/main.lua.d/
+cp conf/common/51-increase-headroom.lua %buildroot/etc/wireplumber/main.lua.d/
+
+%files
+%doc README.md
+%license LICENSE
+/etc/wireplumber/main.lua.d/*.lua
+
+%changelog
+* Thu Mar 28 2024 june-fish <terra@june.fish>
+- Initial package.
@@ -0,0 +1,7 @@
+if filters.contains("nightly") {
+  rpm.global("commit", gh_commit("WeirdTreeThing/chromebook-linux-audio"));
+  if rpm.changed() {
+    rpm.release();
+    rpm.global("commit_date", date());
+  }
+}
@@ -1,4 +1,4 @@
-config_opts['releasever'] = 'rawhide'
+config_opts['releasever'] = '40'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)

@@ -1,4 +1,4 @@
-config_opts['releasever'] = 'rawhide'
+config_opts['releasever'] = '40'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)

@@ -1,5 +1,5 @@
 Name:           terra-mock-configs
-Version:        8
+Version:        7
 Release:        1%{?dist}
 Summary:        Mock configs for Terra repos

@@ -10,8 +10,6 @@ Source1:        terra-38-x86_64.cfg
 Source2:        terra-38-aarch64.cfg
 Source3:        terra-39-x86_64.cfg
 Source4:        terra-39-aarch64.cfg
-Source5:        terra-rawhide-x86_64.cfg
-Source6:        terra-rawhide-aarch64.cfg

 BuildRequires:  mock-core-configs
 Requires:       mock-core-configs
@@ -38,8 +36,6 @@ cp -v %{SOURCE1} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE3} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE4} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE5} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE6} %{buildroot}%{_sysconfdir}/mock/

 # For legacy compatibility, only while Terra 38 is still alive
 ln -s %{_sysconfdir}/mock/templates/terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/anda.tpl
@@ -48,8 +44,6 @@ ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/a

 %files
 %config %{_sysconfdir}/mock/templates/terra.tpl
-%config %{_sysconfdir}/mock/terra-rawhide-x86_64.cfg
-%config %{_sysconfdir}/mock/terra-rawhide-aarch64.cfg
 %config %{_sysconfdir}/mock/terra-39-x86_64.cfg
 %config %{_sysconfdir}/mock/terra-39-aarch64.cfg
 %config %{_sysconfdir}/mock/terra-38-x86_64.cfg
@@ -59,9 +53,6 @@ ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/a
 %config %{_sysconfdir}/mock/anda-38-aarch64.cfg

 %changelog
-* Mon Jan 15 2024 madonuko <mado@fyralabs.com> - 9.1
- Update for Terra rawhide
-
 * Mon Jan 08 2024 Lleyton Gray <lleyton@fyralabs.com> - 7-1
 - Bump ccache max size to 10G

@@ -4,7 +4,7 @@ Version:    40
 # The dist number is the version here, it is intentionally not repeated in the release
 %global dist %nil

-Release:    3
+Release:    2
 Summary:    A package to obsolete retired packages, based on Fedora's equivalent package

 License:    LicenseRef-Fedora-Public-Domain
@@ -118,11 +118,8 @@ BuildArch:  noarch
 %obsolete katsu-systemd-sysusers-presets-polkit 1.0-2
 %obsolete katsu-systemd-sysusers-presets-rpcbind 1.0-2

-%obsolete_ticket https://github.com/terrapkg/packages/issues/991
-%obsolete iosevka-fusion-fonts 25.1.1-2
-
-
 %description
+
 Currently obsoleted packages:

 %list_obsoletes
@@ -1,11 +1,12 @@
 Name:           terra-release
 Version:        40
-Release:        1
+Release:        2
 Summary:        Release package for Terra

 License:        MIT
 URL:            https://terra.fyralabs.com
 Source0:        terra.repo
+Source1:        terra.urls
 BuildArch:      noarch

 Requires:       system-release(%{version})
@@ -19,13 +20,15 @@ Release package for Terra, containing the Terra repository configuration.

 %install
 install -D -p -m 0644 -t %{buildroot}%{_sysconfdir}/yum.repos.d %{SOURCE0}
+install -D -p -m 0644 -t %{buildroot}%{_sysconfdir}/debuginfod %{SOURCE1}

 %files
 %config(noreplace) %{_sysconfdir}/yum.repos.d/terra.repo
+%config(noreplace) %{_sysconfdir}/debuginfod/terra.urls

 %changelog
-* Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 40-1
- Update for Terra 40 (in this case rawhide)
+* Mon Feb 26 2024 Lleyton Gray <lleyton@fyralabs.com> - 39-3
+- Add debuginfod url

 * Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 39-2
 - Add source repository
@@ -1,6 +1,6 @@
 [terra]
 name=Terra $releasever
-baseurl=https://repos.fyralabs.com/terra$releasever
+metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever&arch=$basearch
 metadata_expire=6h
 type=rpm
 skip_if_unavailable=True
@@ -12,7 +12,7 @@ enabled_metadata=1

 [terra-source]
 name=Terra $releasever - Source
-baseurl=https://repos.fyralabs.com/terra$releasever-source
+metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-source&arch=$basearch
 metadata_expire=6h
 type=rpm
 skip_if_unavailable=True
@@ -20,4 +20,4 @@ gpgcheck=1
 gpgkey=https://repos.fyralabs.com/terra$releasever-source/key.asc
 repo_gpgcheck=1
 enabled=0
-enabled_metadata=0
+enabled_metadata=0
@@ -0,0 +1 @@
+https://debuginfod.fyralabs.com/
@@ -1,5 +1,5 @@
 Name:           anda-srpm-macros
-Version:        0.1.6
+Version:        0.1.5
 Release:        1%{?dist}
 Summary:        SRPM macros for extra Fedora packages

@@ -9,7 +9,6 @@ Source0:        macros.cargo_extra
 Source1:        macros.caching
 Source2:        macros.anda
 Source3:        macros.go_extra
-Source4:        macros.nim_extra

 Recommends:     rust-packaging
 Requires:       git-core
@@ -29,20 +28,15 @@ install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE0}
 install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE1}
 install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE2}
 install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE3}
-install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE4}

 %files
 %{_rpmmacrodir}/macros.cargo_extra
 %{_rpmmacrodir}/macros.caching
 %{_rpmmacrodir}/macros.anda
 %{_rpmmacrodir}/macros.go_extra
-%{_rpmmacrodir}/macros.nim_extra


 %changelog
-* Wed Mar 13 2024 madonuko <mado@fyralabs.com> - 0.1.6-1
- Add nim_c, nim_tflags and nim_lflags
-
 * Thu Aug 3 2023 madonuko <mado@fyralabs.com> - 0.1.4-1
 - Add go_build_online and go_prep_online

@@ -1,5 +0,0 @@
-%nim_tflags %(echo "%?build_cflags -fPIE" | sed "s/-O2/-Ofast/g" | sed "s/-Wall//g")
-
-%nim_lflags %?build_ldflags -pie
-
-%nim_c -d:release -t:"%nim_tflags" -l:"%nim_lflags"
@@ -1,12 +1,12 @@
 Name:           klassy

 %global forgeurl https://github.com/paulmcauley/%{name}
-%global tag 6.1.breeze6.0.3
-%global date 20240411
+%global tag 6.0.breeze6.0.2
+%global date 20240314
 %forgemeta

 Version:        %{tag}
-Release:        1%?dist
+Release:        %autorelease
 Summary:        Window Decoration, Application Style and Global Theme plugin for recent versions of the KDE Plasma desktop.
 License:        GPL-2.0-or-later
 Group:          System/GUI/KDE
@@ -1 +1 @@
-7
+6
@@ -1,4 +1,4 @@
-%global ver 1.8.10-7
+%global ver 1.8.10-6

 Summary:        tauOS GTK/GNOME Shell Themes
 Name:           tau-helium
@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:			katsu
-Version:		0.2.2
+Version:		0.2.1
 Release:		1%?dist
 Summary:		The vicious image builder
 License:		MIT
@@ -12,7 +12,7 @@
 %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so

 Name:			electron
-Version:		30.0.2
+Version:		29.3.0
 Release:		1%?dist
 Summary:		Build cross platform desktop apps with web technologies
 License:		MIT
@@ -1,40 +0,0 @@
-%define commit c060a44d085fefabd414a026dc3177533f20f0f3
-%define shortcommit %(c=%{commit}; echo ${c:0:12})
-Name:           gsctool
-Version:        git+%{shortcommit}
-Release:        1%{?dist}
-Summary:        Chromium OS EC utilities
-
-License:      BSD-3-Clause
-URL:          https://chromium.googlesource.com/chromiumos/platform/ec  
-Source0:      https://chromium.googlesource.com/chromiumos/platform/ec/+archive/%{commit}.tar.gz#/%{name}-git+%{commit}.tar.gz
-
-BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  pkgconfig(openssl)
-BuildRequires:  gcc
-
-%description
-Chromium OS EC utilities
-
-%prep
-%autosetup -c
-
-%build
-ls
-pushd extra/usb_updater
-%make_build
-
-
-%install
-pushd extra/usb_updater
-install -D -m 755 gsctool %{buildroot}%{_bindir}/gsctool
-
-
-%files
-%{_bindir}/gsctool
-
-
-%changelog
-* Wed Mar 27 2024 Cappy Ishihara <cappy@cappuchino.xyz>
- initial release
@@ -1,5 +1,5 @@
 project pkg {
 	rpm {
-		spec = "gsctool.spec"
+		spec = "sbctl.spec"
 	}
 }
@@ -0,0 +1,89 @@
+Name:           sbctl
+Version:        0.13
+Release:        1%{?dist}
+Summary:        Secure Boot key manager
+
+License:        MIT
+URL:            https://github.com/Foxboron/sbctl
+Source0:        https://github.com/Foxboron/sbctl/releases/download/%{version}/sbctl-%{version}.tar.gz
+
+# Fixes https://github.com/Foxboron/sbctl/issues/293, allowing kernel-install to work properly with Fedora
+Patch1:         https://patch-diff.githubusercontent.com/raw/Foxboron/sbctl/pull/294.patch
+
+
+ExclusiveArch:  %{golang_arches}
+
+Requires:       binutils
+Requires:       util-linux
+
+Recommends:     systemd-udev
+
+BuildRequires:  asciidoc
+BuildRequires:  git
+BuildRequires:  go-rpm-macros
+
+%description
+sbctl intends to be a user-friendly secure boot key manager capable of setting
+up secure boot, offer key management capabilities, and keep track of files that
+needs to be signed in the boot chain.
+
+
+%prep
+%autosetup -p1
+
+sed -i '/go build/d' Makefile
+
+
+%build
+export GOPATH=%{_builddir}/go
+%global gomodulesmode GO111MODULE=on
+%gobuild -o sbctl ./cmd/sbctl
+%make_build
+
+
+%install
+%make_install PREFIX=%{_prefix}
+
+
+%transfiletriggerin -P 1 -- /boot /efi /usr/lib /usr/libexec
+if grep -q -m 1 -e '\.efi$' -e '/vmlinuz$'; then
+    exec </dev/null
+    %{_bindir}/sbctl sign-all -g
+fi
+
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/sbctl
+%{_prefix}/lib/kernel/install.d/91-sbctl.install
+%{_mandir}/man8/sbctl.8*
+%{_datadir}/bash-completion/completions/sbctl
+%{_datadir}/fish/vendor_completions.d/sbctl.fish
+%{_datadir}/zsh/site-functions/_sbctl
+
+
+%changelog
+* Sat Mar 30 2024 Cappy Ishihara <cappy@cappuchino.xyz> - 0.13-1
+- Push to Terra
+
+* Tue Dec 26 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.13-1
+- Update to version 0.13
+
+* Sun Nov 12 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.12-2
+- Switch to upstream 91-sbctl.install kernel-install script
+
+* Fri Oct 20 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.12-1
+- Update to version 0.12
+
+* Sat Mar 25 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.11-1
+- Update to version 0.11
+
+* Mon Dec 12 2022 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.10-1
+- Update to version 0.10
+
+* Tue May 3 2022 Andrew Gunnerson <chillermillerlong@hotmail.com> - 0.9-1
+- Update to version 0.9
+
+* Thu Jan 27 2022 Andrew Gunnerson <chillermillerlong@hotmail.com> - 0.8-1
+- Initial release
@@ -0,0 +1 @@
+rpm.version(gh("Foxboron/sbctl"));
@@ -1,8 +1,8 @@
 #bcond_without tests
-%global commit ac817bc83efd939dca3e40c4b527d0ccfc77172b
+%global commit e5d4f11104ce7ea1717a90eea82c0f7d230ea5d5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240429
-%global ver 2024.04.09
+%global commit_date 20240325
+%global ver 2024.03.10

 Name:           yt-dlp-nightly
 Version:        %ver^%commit_date.%shortcommit
				`@@ -0,0 +1 @@`
				`rpm.version(gh("PrismLauncher/PrismLauncher"));`
				`@@ -1 +0,0 @@`
				`rpm.global("pypi_version", pypi("pip-system-certs"));`