Update lomiri-system-settings.spec

Signed-off-by: madomado <madonuko@outlook.com>
fix: lomiri-system-settings
2026-05-31 09:01:55 +00:00 · 2024-05-16 19:21:15 +08:00 · 2024-05-16 18:45:18 +08:00 · 2024-05-16 05:16:55 +00:00 · 2024-05-16 01:12:21 +00:00 · 2024-05-15 23:37:27 +00:00
157 changed files with 2869 additions and 1250 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f40
+      - frawhide
  pull_request:
    branches:
-      - f40
+      - frawhide
  merge_group:
    branches:
-      - f40
+      - frawhide
  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:f40
+      image: ghcr.io/terrapkg/builder:frawhide
      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@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Generate build matrix
@@ -40,7 +40,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["40"]
+        version: ["rawhide"]
      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@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -68,9 +68,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        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: ["40"]
+        version: ["rawhide"]
        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@v3
+      - uses: actions/checkout@v4
        with:
          ref: f${{ matrix.version }}
          fetch-depth: 1
@@ -21,7 +21,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["40"]
+        version: ["rawhide"]
        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@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -38,7 +38,7 @@ jobs:

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

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        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: ["40"]
+        version: ["rawhide"]
      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@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -27,7 +27,7 @@ jobs:

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

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        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:
-      - f40
+      - frawhide
  pull_request:
    branches:
-      - f40
+      - frawhide
  merge_group:
    branches:
-      - f40
+      - frawhide
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:frawhide
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Lint spec files
        run: rpmlint $(find anda -type f -name "*.spec" -type f)
@@ -1,38 +0,0 @@
-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:
-      - f40
+      - frawhide
      - f39
      - f38
      - f37
@@ -15,9 +15,9 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:frawhide
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
@@ -8,20 +8,21 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key
+      - name: Install SSH signing key & Set up git repository
        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
@@ -30,7 +31,6 @@ 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 frawhide || true
+            copy_over f39 || true
+            copy_over f40 || true
            git push -u origin --all
          fi
@@ -8,20 +8,21 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key
+      - name: Install SSH signing key & Set up git repository
        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
@@ -31,7 +32,6 @@ 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,9 +47,8 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
-            copy_over f39 || true
-            copy_over f37 || true
            copy_over f38 || true
-            copy_over frawhide || true
+            copy_over f39 || true
+            copy_over f40 || true
            git push -u origin --all
          fi
@@ -1,7 +1,9 @@
 # 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). Since we use a GitHub Wiki for [documentation](https://developer.fyralabs.com/terra), our guidelines may be found there. See the links below:
+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

 * [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.346
+Version:        0.0.396
 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.346
+Version:        0.0.396
 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.49
+Version:        0.0.54
 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.79
+Version:        0.0.85
 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.79
+Version:        0.0.85
 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.49
+Version:		0.0.54
 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:			feishin
-Version:		0.6.1
+Version:		0.7.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -1,7 +1,7 @@
-%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70
+%global commit 03ca3408354e99a7c50838c57531bba1c167ef87
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240325
-%global ver v0.37.0
+%global commit_date 20240516
+%global ver v0.38.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -13,8 +13,8 @@
 %global crate sccache

 Name:           rust-sccache
-Version:        0.7.7
-Release:        1%{?dist}
+Version:        0.8.0
+Release:        1%?dist
 Summary:        Ccache-like tool

 License:        Apache-2.0
@@ -6,7 +6,7 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.1
+Version:	1.5.2
 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
@@ -1,6 +1,6 @@
-%global nodev 18.13.0
-%global npmv 8.19.3
-%global ver 0.18.1
+%global nodev 20.12.2
+%global npmv 10.5.0
+%global ver 0.19.1
 %define debug_package %nil
 %global _build_id_links none

@@ -3,7 +3,7 @@
 Name:           elementary-appcenter
 Summary:        Software Center from elementary
 Version:        7.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0

 Provides:       appcenter = %{version}-%{release}
@@ -12,6 +12,8 @@ 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
@@ -0,0 +1,311 @@
+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',
@@ -11,7 +11,7 @@ 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
+Patch0:         https://github.com/elementary/greeter/compare/7.0.0..42320c266395606b0c20782603e7407124c3f7a4.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -36,9 +36,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-14)
+BuildRequires:  pkgconfig(mutter-cogl-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-14)
 BuildRequires:  pkgconfig(x11)

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -3,8 +3,8 @@

 Name:           elementary-icon-theme
 Summary:        Icons from the Elementary Project
-Version:        7.3.1
-Release:        2%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/icons
@@ -3,8 +3,8 @@

 Name:           elementary-theme
 Summary:        Elementary GTK+ Stylesheet
-Version:        7.3.0
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0

 URL:            https://github.com/elementary/stylesheet
@@ -3,14 +3,16 @@
 Name:           gala
 Summary:        Gala window manager
 Version:        7.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
+Epoch:          1

 URL:            https://github.com/elementary/gala
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

 # patch some default settings to better match Fedora
 Patch0:         0000-Modify-default-settings-for-Fedora.patch
+Patch:          https://github.com/elementary/gala/compare/7.1.3..43d1e6a01b56a84a4e752e1970a35c19402941eb.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -31,11 +33,13 @@ BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libbamf3)
 BuildRequires:  pkgconfig(libcanberra)
-BuildRequires:  pkgconfig(mutter-clutter-13)
-BuildRequires:  pkgconfig(mutter-cogl-13)
-BuildRequires:  pkgconfig(mutter-cogl-pango-13)
+BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(mutter-clutter-14)
+BuildRequires:  pkgconfig(mutter-cogl-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-14)

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

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

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

 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -85,8 +89,8 @@ This package contains the development headers.


 %check
-desktop-file-validate \
-    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+%dnl desktop-file-validate \
+%dnl    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop

 desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/gala*.desktop
@@ -98,7 +102,7 @@ desktop-file-validate \
 %files -f gala.lang
 %doc README.md
 %license COPYING
-%config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop

 %{_bindir}/gala
 %{_bindir}/gala-daemon
@@ -5,8 +5,8 @@ apps built for elementary.}

 Name:           granite-7
 Summary:        Elementary companion library for GTK+ and GLib
-Version:        7.4.0
-Release:        1%{?dist}
+Version:        7.5.0
+Release:        1%?dist
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/granite
@@ -82,6 +82,7 @@ desktop-file-validate \

 %{_datadir}/metainfo/granite-7.metainfo.xml
 %{_datadir}/icons/hicolor/*/apps/io.elementary.granite-7.svg
+%{_datadir}/themes/Granite/


 %files devel
@@ -9,12 +9,14 @@
 Name:           switchboard-plug-about
 Summary:        Switchboard System Information plug
 Version:        6.2.0
-Release:        2%{?dist}
+Release:        3%{?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,10 +9,11 @@ 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/commit/d6009d9f0d5c7479172093447ccceccba86ff1f3.patch
+Patch0:         https://github.com/elementary/wingpanel/compare/23a3eb7c2448b4f35398116df7d01b075361ef1f..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch

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

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

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

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

 %description    libs %{common_description}

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

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

 %description    devel %{common_description}

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

 Name:           gnome-shell-extension-%{extension}
 Version:        2
-Release:        2%{?dist}
+Release:        1%{?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,9 +11,8 @@ 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 >= 46~ with gnome-shell < 47~)
+Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
 Recommends:     gnome-extensions-app

 %description
@@ -31,8 +30,5 @@ 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      9a30c5bd49c373896410852d6477596ac4c43bd3
+%global commit      cfa0c55e84b7ce339e5ce83832f76fee17e99d51
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global commit_date 240218
+%global commit_date 20240404
 %global ver         1.2.0

 Name:           terra-gnome-shell-extension-%{extension}
-Version:        %{ver}^%{shortcommit}
+Version:        %{ver}^%commit_date.%{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 8328f9a6863b4bae48adfdbc29b32b4c571c6530
+%global commit 10be08a7940b86d1cdca963a01542c92b064c7bd
 %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 11bddd982b3643aacdf052cf339ae1ca1873fbb2
+%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
 %forgemeta

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

 Name:       lomiri-download-manager
-Version:    0.1.3
-Release:    1%{?dist}
+Version:    0.5.2
+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/17088252/repository/tags").json_arr()[0];
+let o = get("https://gitlab.com/api/v4/projects/25034025/repository/tags").json_arr()[0];
 let f = rpm.f;
 rpm.version(o.name);
 // check if changed
@@ -1,15 +1,15 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 30d9df926b6837b139990a622d39171ea42c9017
+%global commit a17feddaac58fd275ee470dbce6d54df24da4a0d
 %forgemeta

 Name:       lomiri-system-settings
-Version:    1.0.2
-Release:    1%{?dist}
+Version:    1.1.0
+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
+Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/%version-3/debian/patches/2000_use-maliit-keyboard-for-language-plugin.patch

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

 Name:           lomiri-ui-toolkit
@@ -4,7 +4,7 @@

 Name:           lomiri-url-dispatcher
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A small library for handling URLs over dbus

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

 Name:          lomiri
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 1ubuntu3
+%define _ubuntu_rel 1ubuntu4

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
@@ -0,0 +1,142 @@
+From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
+From: Jeremy Linton <jeremy.linton@arm.com>
+Date: Fri, 22 Oct 2021 14:51:54 -0500
+Subject: [PATCH] Delay for logind, and fallback to seat0
+
+There is systemd/logind race with when restarting
+sddm that causes logind1 not to be available. Previously
+this meant the seat0 was immediately created regardless
+of the state of CanGraphical.
+
+Fixing this, though we still want seat0 to be started
+if none of the seats appear to be graphical. Presumably
+there are some graphics on the machine, otherwise
+why run sddm? Wait a bit, and create seat0 anyway. If
+this fails the output from Xorg should tell us why. This
+is generally a better strategy than what happens a good
+amount of time now, where sddm is started and silent about
+why the screen is blank.
+
+References:
+* https://bugzilla.redhat.com/2011991
+* https://bugzilla.redhat.com/2016310
+
+Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
+---
+ src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++----------
+ src/daemon/SeatManager.cpp     | 22 ++++++++++++++++++++++
+ src/daemon/SeatManager.h       |  1 +
+ 3 files changed, 44 insertions(+), 10 deletions(-)
+
+diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
+index 011bb7f..6255c69 100644
+--- a/src/daemon/LogindDBusTypes.cpp
+++ b/src/daemon/LogindDBusTypes.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include <QDebug>
+ 
+#include <unistd.h>
+
+ class LogindPathInternal {
+ public:
+     LogindPathInternal();
+@@ -46,17 +48,26 @@ LogindPathInternal::LogindPathInternal()
+     qRegisterMetaType<UserInfoList>("UserInfoList");
+     qDBusRegisterMetaType<UserInfoList>();
+ 
+-    if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
+-        qDebug() << "Logind interface found";
+-        available = true;
+-        serviceName = QStringLiteral("org.freedesktop.login1");
+-        managerPath = QStringLiteral("/org/freedesktop/login1");
+-        managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
+-        seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
+-        sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
+-        userIfaceName = QStringLiteral("org.freedesktop.login1.User");
+-        return;
+#ifdef HAVE_SYSTEMD
+    // systemd-logind should be running, although because it takes a few moments to restart after
+    // systemctl isolate calls, it may not yet be running. Wait a few seconds for it, while blocking everything else.
+    int logind_wait_seconds = 50;
+    while (logind_wait_seconds--) {
+        if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
+            qDebug() << "Logind interface found";
+            available = true;
+            serviceName = QStringLiteral("org.freedesktop.login1");
+            managerPath = QStringLiteral("/org/freedesktop/login1");
+            managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
+            seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
+            sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
+            userIfaceName = QStringLiteral("org.freedesktop.login1.User");
+            return;
+        }
+	qDebug() << "Sleeping for systemd-logind";
+	usleep(100000);
+     }
+#endif
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+         qDebug() << "Console kit interface found";
+diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
+index bd207e6..39d8b85 100644
+--- a/src/daemon/SeatManager.cpp
+++ b/src/daemon/SeatManager.cpp
+@@ -26,6 +26,9 @@
+ #include <QDBusMessage>
+ #include <QDBusPendingReply>
+ #include <QDBusContext>
+#include <QDebug>
+#include <QFileInfo>
+#include <QTimer>
+ 
+ #include "LogindDBusTypes.h"
+ 
+@@ -115,6 +118,8 @@ namespace SDDM {
+ 
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
+
+	QTimer::singleShot(5000, this, &SeatManager::checkSeat);
+     }
+ 
+     void SeatManager::createSeat(const QString &name) {
+@@ -152,6 +157,23 @@ namespace SDDM {
+         m_seats.value(name)->createDisplay(Display::defaultDisplayServerType());
+     }
+ 
+    // this is a bit hacky, but linux DRM drivers
+    // won't initially be available so there is a race
+    // between determing if a efifb/etc graphical object
+    // is the only graphics on the machine, or a DRM driver
+    // will take over the display. So we will hang out for a few
+    // seconds and if none of the seats are declared cangraphical
+    // its possible the only graphics on the machine don't have
+    // a drm driver.
+    void SeatManager::checkSeat(void) {
+        if (m_seats.isEmpty()) {
+	     //if (QFileInfo::exists(QStringLiteral("/dev/fb0"))) {
+                 qWarning() << "No graphical seats found, attempt to start one on the main console anyway...";
+                 createSeat(QStringLiteral("seat0"));
+	     //}
+        }
+    }
+
+     void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
+     {
+         auto logindSeat = new LogindSeat(name, objectPath);
+diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
+index b2f9796..aa43047 100644
+--- a/src/daemon/SeatManager.h
+++ b/src/daemon/SeatManager.h
+@@ -49,6 +49,7 @@ namespace SDDM {
+     private:
+         QHash<QString, Seat *> m_seats; //these will exist only for graphical seats
+         QHash<QString, LogindSeat*> m_systemSeats; //these will exist for all seats
+        void checkSeat(void);
+     };
+ }
+ 
+-- 
+2.39.2
+
@@ -0,0 +1,2 @@
+This scripts dir contains only samples, but are generally not used directly.
+In practice, sddm runtime uses items under /etc/sddm by default
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "terra-sddm.spec"
+  }
+}
@@ -0,0 +1,11 @@
+diff -up sddm-0.18.0/services/sddm.service.in.env sddm-0.18.0/services/sddm.service.in
+--- sddm-0.18.0/services/sddm.service.in.env	2018-07-18 05:31:40.000000000 -0500
+++ sddm-0.18.0/services/sddm.service.in	2019-03-14 08:23:22.095498405 -0500
+@@ -7,6 +7,7 @@ After=systemd-user-sessions.service gett
+ [Service]
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
+ Restart=always
+EnvironmentFile=-/etc/sysconfig/sddm
+ 
+ [Install]
+ Alias=display-manager.service
@@ -0,0 +1,53 @@
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index 54bcace..9b8fa22 100644
+--- a/src/common/Configuration.h
+++ b/src/common/Configuration.h
+@@ -37,9 +37,8 @@ namespace SDDM {
+         enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
+ 
+         //  Name                   Type         Default value                                   Description
+-        // TODO: Change default to x11-user in a future release
+-        Entry(DisplayServer,       QString,     _S("x11"),                                      _S("Which display server should be used.\n"
+-                                                                                                   "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
+        Entry(DisplayServer,       QString,     _S("wayland"),                                  _S("Which display server should be used.\n"
+                                                                                                   "Valid values are: x11, x11-user, wayland."));
+         Entry(HaltCommand,         QString,     _S(HALT_COMMAND),                               _S("Halt command"));
+         Entry(RebootCommand,       QString,     _S(REBOOT_COMMAND),                             _S("Reboot command"));
+         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.\n"
+@@ -51,7 +50,7 @@ namespace SDDM {
+         //  Name   Entries (but it's a regular class again)
+         Section(Theme,
+             Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
+-            Entry(Current,             QString,     _S(""),                                     _S("Current theme name"));
+            Entry(Current,             QString,     _S("01-breeze-fedora"),                     _S("Current theme name"));
+             Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars\n"
+                                                                                                    "The files should be named <username>.face.icon"));
+             Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
+@@ -71,9 +70,9 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/xsessions"),
+                                                      _S("/usr/share/xsessions")},               _S("Comma-separated list of directories containing available X sessions"));
+             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
+-            Entry(DisplayCommand,      QString,     _S(DATA_INSTALL_DIR "/scripts/Xsetup"),     _S("Path to a script to execute when starting the display server"));
+-            Entry(DisplayStopCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xstop"),      _S("Path to a script to execute when stopping the display server"));
+            Entry(SessionLogFile,      QString,     _S(".cache/xsession-errors"),               _S("Path to the user session log file"));
+            Entry(DisplayCommand,      QString,     _S(SYS_CONFIG_DIR "/sddm/Xsetup"),          _S("Path to a script to execute when starting the display server"));
+            Entry(DisplayStopCommand,  QString,     _S(SYS_CONFIG_DIR "/sddm/Xstop"),           _S("Path to a script to execute when stopping the display server"));
+             Entry(EnableHiDPI,         bool,        true,                                      _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+@@ -82,12 +81,12 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/wayland-sessions"),
+                                                      _S("/usr/share/wayland-sessions")},        _S("Comma-separated list of directories containing available Wayland sessions"));
+             Entry(SessionCommand,      QString,     _S(WAYLAND_SESSION_COMMAND),                _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
+            Entry(SessionLogFile,      QString,     _S(".cache/wayland-errors"),                _S("Path to the user session log file"));
+             Entry(EnableHiDPI,         bool,        true,                                       _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+         Section(Users,
+-            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin"),         _S("Default $PATH for logged in users"));
+            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
+             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));
@@ -0,0 +1,67 @@
+From 52175648f4e1b415f93b24a3ef970983024659f2 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <neal@gompa.dev>
+Date: Wed, 28 Feb 2024 16:47:16 -0500
+Subject: [PATCH] Default to Qt6 and always use versioned greeters
+
+Distributors can handle creating an unversioned name if necessary.
+---
+ src/common/ThemeMetadata.cpp | 4 ++--
+ src/daemon/Greeter.cpp       | 3 +--
+ src/greeter/CMakeLists.txt   | 9 +--------
+ 3 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/src/common/ThemeMetadata.cpp b/src/common/ThemeMetadata.cpp
+index 2cb3762..003056a 100644
+--- a/src/common/ThemeMetadata.cpp
+++ b/src/common/ThemeMetadata.cpp
+@@ -28,7 +28,7 @@ namespace SDDM {
+         QString mainScript { QStringLiteral("Main.qml") };
+         QString configFile;
+         QString translationsDirectory { QStringLiteral(".") };
+-        int qtVersion = 5;
+        int qtVersion = 6;
+     };
+ 
+     ThemeMetadata::ThemeMetadata(const QString &path, QObject *parent) : QObject(parent), d(new ThemeMetadataPrivate()) {
+@@ -61,6 +61,6 @@ namespace SDDM {
+         d->mainScript = settings.value(QStringLiteral("SddmGreeterTheme/MainScript"), QStringLiteral("Main.qml")).toString();
+         d->configFile = settings.value(QStringLiteral("SddmGreeterTheme/ConfigFile"), QStringLiteral("theme.conf")).toString();
+         d->translationsDirectory = settings.value(QStringLiteral("SddmGreeterTheme/TranslationsDirectory"), QStringLiteral(".")).toString();
+-        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 5).toInt();
+        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 6).toInt();
+     }
+ }
+diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
+index 07fccde..5a956b6 100644
+--- a/src/daemon/Greeter.cpp
+++ b/src/daemon/Greeter.cpp
+@@ -82,8 +82,7 @@ namespace SDDM {
+ 
+     QString Greeter::greeterPathForQt(int qtVersion)
+     {
+-        const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
+-        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
+        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter-qt%1").arg(qtVersion);
+     }
+ 
+     bool Greeter::start() {
+diff --git a/src/greeter/CMakeLists.txt b/src/greeter/CMakeLists.txt
+index 72769e4..524368d 100644
+--- a/src/greeter/CMakeLists.txt
+++ b/src/greeter/CMakeLists.txt
+@@ -1,11 +1,4 @@
+-if(QT_MAJOR_VERSION EQUAL "5")
+-    # Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
+-    # might still be running and only know about "sddm-greeter". Keeping the
+-    # previous name around also helps users calling it directly.
+-    set(GREETER_TARGET sddm-greeter)
+-else()
+-    set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+-endif()
+set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+ 
+ message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
+ 
+-- 
+2.43.0
+
@@ -0,0 +1,20 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+
+account    required    pam_nologin.so
+account    include     system-auth
+
+password   include     system-auth
+
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet5.so auto_start
+-session    optional    pam_kwallet.so auto_start
+session    include     postlogin
@@ -0,0 +1,17 @@
+#%PAM-1.0
+
+# Load environment from /etc/environment and ~/.pam_environment
+auth		required pam_env.so
+
+# Always let the greeter start without authentication
+auth		required pam_permit.so
+
+# No action required for account management
+account		required pam_permit.so
+
+# Can't change password
+password	required pam_deny.so
+
+# Setup session
+session		required pam_unix.so
+session		optional pam_systemd.so
@@ -0,0 +1,12 @@
+diff --git a/services/sddm-tmpfiles.conf.in b/services/sddm-tmpfiles.conf.in
+index fb45553..6acfb6c 100644
+--- a/services/sddm-tmpfiles.conf.in
+++ b/services/sddm-tmpfiles.conf.in
+@@ -1,5 +1,7 @@
+ # Home dir of the sddm user, also contains state.conf
+ d	${STATE_DIR}	0750	sddm	sddm
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
+Z	${STATE_DIR}	-	sddm	sddm
+ # This contains X11 auth files passed to Xorg and the greeter
+ d	${RUNTIME_DIR}	0711	root	root
+ # Sockets for IPC
@@ -0,0 +1,2 @@
+#Type Name ID GECOS                  Home directory Shell
+u     sddm -  "SDDM Greeter Account" /var/lib/sddm   -
@@ -0,0 +1,2 @@
+[General]
+DisplayServer=x11
@@ -0,0 +1,122 @@
+[Autologin]
+# Whether sddm should automatically log back into sessions when they exit
+#Relogin=false
+
+# Name of session file for autologin session
+#Session=
+
+# Username for autologin session
+#User=
+
+
+[General]
+# Enable Qt's automatic high-DPI scaling
+#EnableHiDPI=false
+
+# Halt command
+#HaltCommand=/usr/bin/systemctl poweroff
+
+# Initial NumLock state. Can be on, off or none.
+# If property is set to none, numlock won't be changed
+# NOTE: Currently ignored if autologin is enabled.
+#Numlock=none
+
+# Reboot command
+#RebootCommand=/usr/bin/systemctl reboot
+
+# Control x11/wayland startup
+# DisplayServer=wayland
+
+[Theme]
+# Current theme name
+#Current=01-breeze-fedora
+
+# Cursor theme used in the greeter
+#CursorTheme=
+
+# Number of users to use as threshold
+# above which avatars are disabled
+# unless explicitly enabled with EnableAvatars
+#DisableAvatarsThreshold=7
+
+# Enable display of custom user avatars
+#EnableAvatars=true
+
+# Global directory for user avatars
+# The files should be named <username>.face.icon
+#FacesDir=/usr/share/sddm/faces
+
+# Theme directory path
+#ThemeDir=/usr/share/sddm/themes
+
+
+[Users]
+# Default $PATH for logged in users
+#DefaultPath=/usr/local/bin:/usr/bin:/bin
+
+# Comma-separated list of shells.
+# Users with these shells as their default won't be listed
+#HideShells=
+
+# Comma-separated list of users that should not be listed
+#HideUsers=
+
+# Maximum user id for displayed users
+#MaximumUid=60000
+
+# Minimum user id for displayed users
+#MinimumUid=1000
+
+# Remember the session of the last successfully logged in user
+#RememberLastSession=true
+
+# Remember the last successfully logged in user
+#RememberLastUser=true
+
+
+[Wayland]
+# Path to a script to execute when starting the desktop session
+#SessionCommand=/etc/sddm/wayland-session
+
+# Directory containing available Wayland sessions
+#SessionDir=/usr/share/wayland-sessions
+
+# Path to the user session log file
+#SessionLogFile=.cache/wayland-errors
+
+
+[X11]
+# Path to a script to execute when starting the display server
+#DisplayCommand=/etc/sddm/Xsetup
+
+# Path to a script to execute when stopping the display server
+#DisplayStopCommand=/etc/sddm/Xstop
+
+# The lowest virtual terminal number that will be used.
+#MinimumVT=1
+
+# Arguments passed to the X server invocation
+#ServerArguments=-nolisten tcp
+
+# Path to X server binary
+#ServerPath=/usr/bin/X
+
+# Path to a script to execute when starting the desktop session
+#SessionCommand=/etc/X11/xinit/Xsession
+
+# Directory containing available X sessions
+#SessionDir=/usr/share/xsessions
+
+# Path to the user session log file
+#SessionLogFile=.cache/xsession-errors
+
+# Path to the Xauthority file
+#UserAuthFile=.Xauthority
+
+# Path to xauth binary
+#XauthPath=/usr/bin/xauth
+
+# Path to Xephyr binary
+#XephyrPath=/usr/bin/Xephyr
+
+
@@ -0,0 +1,23 @@
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth        substack      password-auth
+-auth        optional      pam_gnome_keyring.so
+-auth        optional      pam_kwallet5.so
+-auth        optional      pam_kwallet.so
+auth        include       postlogin
+
+account     required      pam_nologin.so
+account     include       password-auth
+
+password    include       password-auth
+
+session     required      pam_selinux.so close
+session     required      pam_loginuid.so
+-session    optional    pam_ck_connector.so
+session     required      pam_selinux.so open
+session     optional      pam_keyinit.so force revoke
+session     required      pam_namespace.so
+session     include       password-auth
+-session     optional      pam_gnome_keyring.so auto_start
+-session     optional      pam_kwallet5.so auto_start
+-session     optional      pam_kwallet.so auto_start
+session     include       postlogin
@@ -0,0 +1,5 @@
+# workaround https://bugzilla.redhat.com/1686675
+# see also https://bugreports.qt.io/browse/QTBUG-58508
+QML_DISABLE_DISK_CACHE=1
+# enable qDebug messages for debug build
+# QT_LOGGING_RULES="*.debug=true"
@@ -0,0 +1,293 @@
+# Disable X11 for RHEL 10+
+%bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10]
+
+Name:           terra-sddm
+Version:        0.21.0
+Release:        5%{?dist}
+License:        GPL-2.0-or-later
+Summary:        QML based desktop and login manager
+Provides:       sddm = %version-%release
+
+URL:            https://github.com/sddm/sddm
+Source0:        %{url}/archive/v%{version}/sddm-%{version}.tar.gz
+
+## upstream patches
+# Port all themes to Qt 6
+# Submitted: https://github.com/sddm/sddm/pull/1876
+Patch1:         sddm-PR1876.patch
+
+## upstreamable patches
+# Fix race with logind restart, and start seat0 if !CanGraphical on timer
+# https://bugzilla.redhat.com/show_bug.cgi?id=2011991
+# https://bugzilla.redhat.com/show_bug.cgi?id=2016310
+# Submmited: https://github.com/sddm/sddm/pull/1494
+Patch11:        0001-Delay-for-logind-and-fallback-to-seat0.patch
+
+## downstream patches
+Patch101:       sddm-0.20.0-fedora_config.patch
+
+# sddm.service: +EnvironmentFile=-/etc/sysconfig/sddm
+Patch103:       sddm-0.18.0-environment_file.patch
+
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
+Patch104:       sddm-rpmostree-tmpfiles-hack.patch
+
+# Workaround lack of Qt 5 greeter build
+Patch105:       sddm-0.21.0-qt6greeter.patch
+
+# https://github.com/sddm/sddm/pull/1779
+Patch106:       https://github.com/sddm/sddm/pull/1779.patch
+
+# Shamelessly stolen from gdm
+Source10:       sddm.pam
+# Shamelessly stolen from gdm
+Source11:       sddm-autologin.pam
+# Previously included in sddm sources
+Source12:       sddm-greeter.pam
+# sample sddm.conf generated with sddm --example-config, and entries commented-out
+Source13:       sddm.conf
+# README.scripts
+Source14:       README.scripts
+# sysconfig snippet
+Source15:       sddm.sysconfig
+# sddm x11 override config
+Source16:       sddm-x11.conf
+# sysusers config file. note these are shipped in the upstream tarball
+# but we cannot use the files from the tarball for %pre scriptlet
+# generation, so we duplicate them as source files for that purpose;
+# this is an ugly hack that should be removed if it becomes possible.
+# see https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TFDMAU7KLMSQTKPJELHSM6PFVXIZ56GK/
+Source17:       sddm-systemd-sysusers.conf
+
+
+Provides: service(graphical-login) = sddm
+
+BuildRequires:  cmake >= 2.8.8
+BuildRequires:  extra-cmake-modules
+BuildRequires:  pam-devel
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-xkb)
+# sometimes python-docutils, sometimes python2-docutils, sometimes python3-docutils.
+# use path then for sanity
+BuildRequires:  /usr/bin/rst2man
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6DBus)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6Qml)
+BuildRequires:  cmake(Qt6Quick)
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Test)
+BuildRequires:  cmake(Qt6QuickTest)
+# verify presence to pull defaults from /etc/login.defs
+BuildRequires:  shadow-utils
+BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
+
+Obsoletes: kde-settings-sddm < 20-5
+
+%if 0%{?fedora}
+# for /usr/share/backgrounds/default.png
+BuildRequires: desktop-backgrounds-compat
+BuildRequires: GraphicsMagick
+Requires: desktop-backgrounds-compat
+# for /usr/share/pixmaps/system-logo-white.png
+Requires: system-logos
+%endif
+Requires: systemd
+%if %{with x11}
+Requires: xorg-x11-xinit
+%endif
+%{?systemd_requires}
+
+Requires(pre): shadow-utils
+
+# Virtual dependency for sddm greeter setup
+Requires: sddm-greeter-displayserver
+Suggests: sddm-wayland-generic
+
+%description
+SDDM is a modern graphical display manager aiming to be fast, simple and
+beautiful. It uses modern technologies like QtQuick, which in turn gives the
+designer the ability to create smooth, animated user interfaces.
+
+%package wayland-generic
+Summary: Generic Wayland SDDM greeter configuration
+Provides: sddm-greeter-displayserver
+Conflicts: sddm-greeter-displayserver
+Requires: weston
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description wayland-generic
+This package contains configuration and dependencies for SDDM
+to use Weston for the greeter display server.
+
+This is the generic default Wayland configuration provided
+by SDDM.
+
+%if %{with x11}
+%package x11
+Summary: X11 SDDM greeter configuration
+Provides: sddm-greeter-displayserver
+Conflicts: sddm-greeter-displayserver
+# This will eventually go away...
+Provides: deprecated()
+Requires: xorg-x11-server-Xorg
+Requires: %{name} = %{version}-%{release}
+Recommends: qt6-qtvirtualkeyboard
+BuildArch: noarch
+
+%description x11
+This package contains configuration and dependencies for SDDM
+to use X11 for the greeter display server.
+%endif
+
+%package themes
+Summary: SDDM Themes
+# for upgrade path
+Obsoletes: sddm < 0.2.0-0.12
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+%description themes
+A collection of sddm themes, including: elarun, maldives, maya
+
+
+%prep
+%autosetup -p1 %{?commitdate:-n sddm-%{commit}} -n sddm-%version
+
+%if 0%{?fedora}
+#FIXME/TODO: use version on filesystem instead of using a bundled copy
+cp -v /usr/share/backgrounds/default.png  \
+      src/greeter/theme/background.png
+ls -sh src/greeter/theme/background.png
+gm mogrify -resize 1920x1200 src/greeter/theme/background.png
+ls -sh src/greeter/theme/background.png
+%endif
+
+
+%build
+%cmake \
+  -DBUILD_WITH_QT6:BOOL=ON \
+  -DBUILD_MAN_PAGES:BOOL=ON \
+  -DCMAKE_BUILD_TYPE:STRING="Release" \
+  -DENABLE_JOURNALD:BOOL=ON \
+  -DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \
+  -DWAYLAND_SESSION_COMMAND:PATH=/etc/sddm/wayland-session
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+mkdir -p %{buildroot}%{_sysconfdir}/sddm.conf.d
+mkdir -p %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d
+install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/sddm
+install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
+install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-greeter
+install -Dpm 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/sddm.conf
+install -Dpm 644 %{SOURCE14} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
+install -Dpm 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/sddm
+%if %{with x11}
+install -Dpm 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
+%endif
+mkdir -p %{buildroot}/run/sddm
+mkdir -p %{buildroot}%{_localstatedir}/lib/sddm
+mkdir -p %{buildroot}%{_sysconfdir}/sddm/
+cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
+      %{buildroot}%{_sysconfdir}/sddm/
+# we're using /etc/X11/xinit/Xsession (by default) instead
+rm -fv %{buildroot}%{_sysconfdir}/sddm/Xsession
+
+# De-conflict the dbus file
+mv %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf \
+   %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
+
+%if 0%{?fedora} && 0%{?fedora} < 43
+# Provide unversioned greeter until F40 is EOL
+ln -sr %{buildroot}%{_bindir}/sddm-greeter-qt6 %{buildroot}%{_bindir}/sddm-greeter
+%endif
+
+
+%pre
+%sysusers_create_compat %{SOURCE17}
+
+%post
+%systemd_post sddm.service
+# handle incompatible configuration changes
+(grep \
+   -e '^Current=fedora$' \
+   -e '^\[XDisplay\]$' \
+   -e '^\[WaylandDisplay\]$' \
+   %{_sysconfdir}/sddm.conf > /dev/null && \
+ sed -i.rpmsave \
+   -e 's|^Current=fedora$|#Current=01-breeze-fedora|' \
+   -e 's|^\[XDisplay\]$|\[X11\]|' \
+   -e 's|^\[WaylandDisplay\]$|\[Wayland\]|' \
+   %{_sysconfdir}/sddm.conf
+) ||:
+
+
+%preun
+%systemd_preun sddm.service
+
+
+%postun
+%systemd_postun sddm.service
+
+
+%files
+%license LICENSE
+%doc README.md CONTRIBUTORS
+%dir %{_sysconfdir}/sddm/
+%dir %{_sysconfdir}/sddm.conf.d
+%dir %{_prefix}/lib/sddm/sddm.conf.d
+%config(noreplace)   %{_sysconfdir}/sddm/*
+%config(noreplace)   %{_sysconfdir}/sddm.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/sddm
+%config(noreplace) %{_sysconfdir}/pam.d/sddm*
+%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
+%{_bindir}/sddm
+%{_bindir}/sddm-greeter*
+%{_libexecdir}/sddm-helper
+%{_libexecdir}/sddm-helper-start-wayland
+%{_libexecdir}/sddm-helper-start-x11user
+%{_tmpfilesdir}/sddm.conf
+%{_sysusersdir}/sddm.conf
+%attr(0711, root, sddm) %dir /run/sddm
+%attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm
+%{_unitdir}/sddm.service
+%{_qt6_archdatadir}/qml/SddmComponents/
+%dir %{_datadir}/sddm
+%{_datadir}/sddm/faces/
+%{_datadir}/sddm/flags/
+%{_datadir}/sddm/scripts/
+%dir %{_datadir}/sddm/themes/
+# %%lang'ify? they're small, probably not worth it -- rex
+%{_datadir}/sddm/translations*/
+%{_mandir}/man1/sddm.1*
+%{_mandir}/man1/sddm-greeter.1*
+%{_mandir}/man5/sddm.conf.5*
+%{_mandir}/man5/sddm-state.conf.5*
+
+
+%files wayland-generic
+# No files since default configuration
+
+
+%if %{with x11}
+%files x11
+%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
+%endif
+
+
+%files themes
+%{_datadir}/sddm/themes/elarun/
+%{_datadir}/sddm/themes/maldives/
+%{_datadir}/sddm/themes/maya/
+
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("sddm/sddm"));
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.88.1.24104
+Version:		1.89.1.24130
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.19.5
+Version:		3.22.0
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -7,7 +7,7 @@

 # https://github.com/containerd/containerd
 %global goipath         github.com/containerd/containerd
-Version:                1.7.15
+Version:                1.7.16

 %gometa

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

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

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

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

@@ -1,6 +0,0 @@
-project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "iosevka-fusion-fonts.spec"
-	}
-}
@@ -1,142 +0,0 @@
-%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
@@ -1,190 +0,0 @@
-[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
@@ -1 +0,0 @@
-rpm.version(gh("be5invis/Iosevka"));
@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	1.0.10
+Version:	1.0.12
 Release:	1%?dist
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/Sarasa-TTC-%version.7z
@@ -1,11 +1,10 @@
 Name:			seto-fonts
 Version:		6.20
-Release:		2%?dist
+Release:		3%?dist
 URL:			https://setofont.osdn.jp/
-Source0:		https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip
+Source0:		https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz
 License:		OFL-1.1
 Summary:		A handwritten font that contains kanji up to JIS 4th level and difficult kanji
-BuildRequires:	unzip
 BuildArch:		noarch


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


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

 %build

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

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

 %changelog
-* 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
+%autochangelog
@@ -1,4 +1,4 @@
-%define osuresver 2024.410.0
+%define osuresver 2024.510.0
 %global debug_package %{nil}
 %define __strip /bin/true

@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit df0280f52b68f4352d8da711136609c16ce4db7b
+%global commit 93da066aa24220097d6f424fe13a74bbcfe54c21
 %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 commit_date 20240513
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -1,79 +0,0 @@
-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
-
@@ -1,8 +0,0 @@
-project pkg {
-	rpm {
-		spec = "prismlauncher-qt5-nightly.spec"
-	}
-	labels {
-		nightly = "1"
-	}
-}
@@ -1,198 +0,0 @@
-%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
@@ -1,11 +0,0 @@
-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}`);
-	}
-}
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "prismlauncher-qt5.spec"
-	}
-}
@@ -1,188 +0,0 @@
-%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
@@ -1 +0,0 @@
-rpm.version(gh("PrismLauncher/PrismLauncher"));
@@ -22,8 +22,8 @@ Name:             prismlauncher
 %else
 Name:             prismlauncher-qt5
 %endif
-Version:          8.2
-Release:          2%?dist
+Version:          8.3
+Release:          1%?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
@@ -1,8 +1,8 @@
 %define debug_package %nil

 Name:			crystal
-Version:		1.11.2
-Release:		1%{?dist}
+Version:		1.12.1
+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 <.+>(.+)</a>", html, 1))
+rpm.version(find("Latest release: <strong>(.+?)</strong>", html, 1))
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name: dart
-Version: 3.3.3
+Version: 3.4.0
 Release: 1%?dist
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -2,7 +2,7 @@

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Name:           kotlin-native
-Version:        1.9.23
+Version:        1.9.24
 Release:        1%?dist
 Summary:        LLVM backend for the Kotlin compiler
 ExclusiveArch:  x86_64
@@ -1,7 +1,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Name:           kotlin
-Version:        1.9.23
+Version:        1.9.24
 Release:        1%?dist
 Summary:        Statically typed programming language

@@ -1,11 +1,11 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f
+%global commit 2c8551556e5b51b7a7e487b1043b92d4ad34dbf0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
-%global commit_date 20240322
+%global commit_date 20240516
 %global debug_package %nil

-Name:			nim-nighlty
+Name:			nim-nightly
 Version:		%ver^%commit_date.%shortcommit
 Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
@@ -19,6 +19,9 @@ Source4:		nimsuggest.1
 BuildRequires:	gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre pcre-devel
 Requires:		redhat-rpm-config gcc
 Conflicts:		choosenim
+# somehow wrong name and never noticed
+Provides:		nim-nightly = %version-%release
+Obsoletes:		nim-nighlty < 2.1.1^20240404.9e1b170-2


 %description
@@ -29,6 +32,9 @@ order of priority).

 %package tools
 Summary:	Tools for Nim programming language
+Provides:	nim-nightly-tools = %version-%release
+Obsoletes:	nim-nighlty-tools < 2.1.1^20240404.9e1b170-2
+
 %description tools
 Nim is a compiled, garbage-collected systems programming language with a
 design that focuses on efficiency, expressiveness, and elegance (in that
@@ -41,6 +47,8 @@ This package provides various tools, which help Nim programmers.
 %package doc
 Summary:	Documentation for Nim programming language
 BuildArch:	noarch
+Provides:	nim-nightly-doc = %version-%release
+Obsoletes:	nim-nighlty-doc < 2.1.1^20240404.9e1b170-2
 %description doc
 Nim is a compiled, garbage-collected systems programming language with a
 design that focuses on efficiency, expressiveness, and elegance (in that
@@ -92,11 +100,13 @@ mold -run bin/nim cc -d:nimCallDepthLimit=10000 -r tools/niminst/niminst --var:v

 sh ./install.sh %buildroot/usr/bin

-mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim
+mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim %buildroot%_datadir
 install -Dpm755 bin/nim{grep,suggest,pretty} %buildroot/%_bindir
 install -Dpm644 tools/nim.bash-completion %buildroot/%_datadir/bash-completion/completions/nim
 install -Dpm644 dist/nimble/nimble.bash-completion %buildroot/%_datadir/bash-completion/completions/nimble
 install -Dpm644 -t%buildroot/%_mandir/man1 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4
+mv %buildroot%_bindir/nim %buildroot%_datadir/
+ln -s %_datadir/nim/bin/nim %buildroot%_bindir/nim

 %ifarch x86_64
 mkdir -p %buildroot/%_docdir/%name/html
@@ -121,6 +131,7 @@ rm %buildroot%_bindir/*.bat || true
 %_bindir/nim{,ble}
 %_mandir/man1/nim{,ble}.1*
 %_datadir/bash-completion/completions/nim{,ble}
+%_datadir/nim/
 %_prefix/lib/nim/
 %_sysconfdir/nim/

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

 Name:			nim
-Version:		2.0.2
-Release:		3%{?dist}
+Version:		2.0.4
+Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD
 URL:			https://nim-lang.org
@@ -1,8 +1,8 @@
 %define debug_package %nil

 Name:			python3-mpv
-Version:		1.0.5
-Release:		1%{?dist}
+Version:		1.0.6
+Release:		1%?dist
 Summary:		Python interface to the awesome mpv media player
 License:		GPL-2.0+ OR LGPL-2.1+
 URL:			https://github.com/jaseg/python-mpv
@@ -0,0 +1,6 @@
+project pkg {
+  arches = ["x86_64"]
+  rpm {
+	spec = "python-pip-system-certs.spec"
+  }
+}
@@ -0,0 +1,56 @@
+# 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.
@@ -0,0 +1 @@
+rpm.global("pypi_version", pypi("pip-system-certs"));
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name:			python3-ruff
-Version:		0.3.7
+Version:		0.4.4
 Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
@@ -1,9 +1,9 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 26
 %global crate maturin

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

 License:        MIT OR Apache-2.0
@@ -296,6 +296,18 @@ use the "tracing-subscriber" feature of the "%{crate}" crate.
 %files       -n %{name}+tracing-subscriber-devel
 %ghost %{crate_instdir}/Cargo.toml

+%package     -n %{name}+unicode-xid-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+unicode-xid-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "unicode-xid" feature of the "%{crate}" crate.
+
+%files       -n %{name}+unicode-xid-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+upload-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -320,18 +332,6 @@ use the "ureq" feature of the "%{crate}" crate.
 %files       -n %{name}+ureq-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+url-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+url-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "url" feature of the "%{crate}" crate.
-
-%files       -n %{name}+url-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+wild-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -369,7 +369,7 @@ use the "zig" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml

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

 %build
@@ -1,5 +1,5 @@
 Name:			nushell
-Version:		0.92.2
+Version:		0.93.0
 Release:		1%?dist
 Summary:		A new type of shell
 License:		MIT
@@ -19,7 +19,8 @@ Requires:		glibc openssl zlib
 %{cargo_build -f extra,dataframe} --workspace

 %install
-%cargo_install -f extra,dataframe
+mkdir -p %buildroot%_bindir
+cp target/rpm/nu* %buildroot%_bindir/
 rm -rf .cargo

 %post
@@ -4,8 +4,8 @@
 %global crate oxipng

 Name:           rust-oxipng
-Version:        9.0.0
-Release:        %autorelease
+Version:        9.1.1
+Release:        1%?dist
 Summary:        Lossless PNG compression optimizer

 License:        MIT
@@ -0,0 +1,25 @@
+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,21 +1,20 @@
-%global debug_package %{nil}
-# Generated by rust2rpm 24
-%bcond_without check
+# Generated by rust2rpm 26
+#bcond_without check

 %global crate starship

 Name:           rust-starship
-Version:        1.18.1
+Version:        1.19.0
 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 foreign dependencies
-Patch:          starship-fix-metadata-auto.diff
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch0:         starship-fix-metadata-auto.diff

-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  anda-srpm-macros
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
@@ -29,11 +28,13 @@ 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

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

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

 %build
-%cargo_build
+%{cargo_build}

 %install
-%cargo_install
+%{cargo_install}

 %if %{with check}
 %check
@@ -1,6 +1,6 @@
--- 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 @@
+--- 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 @@
 ]
 default-features = false
 
@@ -8,7 +8,7 @@
 -version = "0.2.0"
 -
 -[target."cfg(windows)".dependencies.windows]
-version = "0.48.0"
+-version = "0.54.0"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_UI_Shell",
@@ -5,8 +5,8 @@
 %global crate zellij

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

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

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

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

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

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

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

 Name:           vala-nightly
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`rpm.version(gh("PrismLauncher/PrismLauncher"));`
				`@@ -0,0 +1 @@`
				`rpm.global("pypi_version", pypi("pip-system-certs"));`