damn

capitalize the project name
add: sunshine
2026-05-31 09:01:55 +00:00 · 2024-04-15 18:59:33 +07:00 · 2024-04-15 18:54:26 +07:00 · 2024-04-15 18:35:44 +07:00 · 2024-04-14 01:02:49 +08:00 · 2024-04-13 16:49:52 +00:00
220 changed files with 1521 additions and 1720 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f39
+      - f40
  pull_request:
    branches:
-      - f39
+      - f40
  merge_group:
    branches:
-      - f39
+      - f40
  workflow_dispatch:
  workflow_call:

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

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

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

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

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

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

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -3,20 +3,20 @@ name: Lint
 on:
  push:
    branches:
-      - f39
+      - f40
  pull_request:
    branches:
-      - f39
+      - f40
  merge_group:
    branches:
-      - f39
+      - f40
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f40
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Lint spec files
        run: rpmlint $(find anda -type f -name "*.spec" -type f)
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -3,6 +3,7 @@ name: Push comps updates
 on:
  push:
    branches:
+      - f40
      - f39
      - f38
      - f37
@@ -14,9 +15,9 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f40
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
@@ -8,11 +8,11 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -46,8 +46,8 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f37 || true
            copy_over f38 || true
-            copy_over f40 || true
            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -8,11 +8,11 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -47,8 +47,9 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f39 || true
+            copy_over f37 || true
            copy_over f38 || true
-            copy_over f40 || true
            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -1,5 +1,5 @@
 Name:			anki-bin
-Version:		24.06.3
+Version:		24.04.1
 Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        24.06.3
+Version:        24.04.1
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -22,7 +22,7 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %version
-%patch 1 -p1
+%patch1 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5

@@ -1,5 +1,5 @@
 Name:           anki
-Version:        24.06.3
+Version:        24.04.1
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -20,10 +20,8 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.

 %prep
-rm -rf *
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
-%patch 0 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki

@@ -14,8 +14,8 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so

 Name:			armcord-bin
-Version:		3.2.7
-Release:		1%?dist
+Version:		3.2.6
+Release:		1%{?dist}
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
 URL:			https://github.com/ArmCord/ArmCord
@@ -26,7 +26,6 @@ Source2:		https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
 Requires:		electron xdg-utils
 ExclusiveArch:	x86_64 aarch64 armv7l
 Conflicts:		armcord
-BuildRequires:	add-determinism

 %description
 ArmCord is a custom client designed to enhance your Discord experience
@@ -1,15 +1,15 @@
 %define debug_package %nil

 Name:		armcord
-Version:	3.2.7
-Release:	1%?dist
+Version:	3.2.6
+Release:	1%{?dist}
 License:	OSL-3.0
 Summary:	Custom lightweight Discord client designed to enhance your experience
 URL:		https://github.com/ArmCord/ArmCord
 Group:		Applications/Internet
 Source1:	launch.sh
 Requires:	electron xdg-utils
-BuildRequires:	nodejs-npm git add-determinism
+BuildRequires:	nodejs-npm git
 Conflicts:	armcord-bin
 BuildArch:	noarch

@@ -18,7 +18,6 @@ ArmCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
-rm -rf *
 git clone %url .
 git checkout v%version

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

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

 Name:           discord-canary
-Version:        0.0.442
+Version:        0.0.346
 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.58
+Version:        0.0.49
 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.92
+Version:        0.0.79
 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.92
+Version:        0.0.79
 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.58
+Version:		0.0.49
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "envision.spec"
-    }
-}
@@ -1,46 +0,0 @@
-%global commit b594f75778961c281daca398011914e9ac14b753
-%global commit_date 20240625
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name:           envision
-Version:        %commit_date.%commit
-Release:        1%?dist
-Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
-License:        AGPL-3.0-or-later
-URL:            https://gitlab.com/gabmus/envision/
-Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
-BuildRequires:  pkgconfig(glib-2.0) >= 2.66
-BuildRequires:  pkgconfig(gio-2.0) >= 2.66
-BuildRequires:  pkgconfig(gtk4) >= 4.10.0
-BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel
-BuildRequires:  libappstream-glib
-BuildRequires:  desktop-file-utils
-BuildRequires:  glib2-devel
-Recommends:     android-tools
-
-%description
-%summary.
-
-%prep
-%autosetup -n envision-%commit
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/envision
-%_datadir/applications/org.gabmus.envision.desktop
-%_datadir/envision/
-%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
-%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
-%_metainfodir/org.gabmus.envision.appdata.xml
@@ -1,5 +0,0 @@
-rpm.global("commit", gitlab_commit("gitlab.com", "46446166", "main"));
-if rpm.changed() {
-	rpm.global("commit_date", date());
-	rpm.release();
-}
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.7.1
+Version:		0.6.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -1,7 +1,7 @@
-%global commit bc5ab97d9a3c2fa28a942e0a09908aced1055e2a
+%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240619
-%global ver v0.38.0
+%global commit_date 20240325
+%global ver v0.37.0

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

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

 License:        Apache-2.0
@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-	spec = "spacedrive.spec"
-  }
-  labels {
-    large = 1
-  }
-}
@@ -1,51 +0,0 @@
-Name:			spacedrive
-Version:		0.4.0
-Release:		1%?dist
-Summary:		An open source cross-platform file explorer
-License:		AGPL-3.0
-URL:			https://spacedrive.com
-Source0:		https://github.com/spacedriveapp/spacedrive/archive/refs/tags/%version.tar.gz
-Requires:		ffmpeg libheif gtk3 webkit2gtk4.1 pango gdk-pixbuf2 cairo libsoup glib2 openssl
-BuildRequires:	pnpm git-core perl gcc javascriptcoregtk4.0-devel pkgconfig(webkit2gtk-4.0)
-BuildRequires:  pkgconfig(libsoup-2.4) glib2-devel gtk3-devel openssl-devel pkgconfig(zlib)
-BuildRequires:  openssl clang-devel
-
-%description
-Spacedrive is an open source cross-platform file manager, powered by a virtual distributed filesystem (VDFS) written in Rust. 
-
-%prep
-%autosetup
-
-# we need nightly cargo
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup.sh
-chmod +x ./rustup.sh
-./rustup.sh -y -t nightly --profile minimal
-source "$HOME/.cargo/env"
-rm rustup.sh %SOURCE0
-
-pnpm setup
-source $HOME/.bashrc
-pnpm i -g pnpm
-$HOME/.local/share/pnpm/pnpm install
-$HOME/.local/share/pnpm/pnpm store prune # GH workers running out of disk space… oh well
-
-%build
-source $HOME/.cargo/env
-source $HOME/.bashrc
-export CARGO_TARGET_DIR=target
-
-# hack
-cp $HOME/.local/share/pnpm/pnpm %_bindir/pnpm
-
-$HOME/.local/share/pnpm/pnpm prep
-$HOME/.local/share/pnpm/pnpm tauri build --bundles app -- --no-default-features
-
-%install
-install -Dm755 -t %buildroot%_bindir apps/desktop/src-tauri/target/release/spacedrive
-
-%files
-%license LICENSE
-%_bindir/spacedrive
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("spacedriveapp/spacedrive"));
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "tuxclocker.spec"
-  }
-}
@@ -1,42 +0,0 @@
-Name:           tuxclocker
-Version:        1.5.1
-Release:        1%?dist
-Summary:        Qt overclocking tool for GNU/Linux 
-License:        GPL-3.0
-URL:            https://github.com/Lurkki14/tuxclocker
-# boost qt5-qtbase qt5-qtcharts
-Requires:       hicolor-icon-theme
-BuildRequires:  git-core meson hwdata qt5-qttools gettext anda-srpm-macros
-BuildRequires:  boost-devel qt5-qtbase-devel qt5-qtcharts-devel libdrm-devel libXNVCtrl-devel openssl-devel
-Recommends:     xorg-x11-drv-nvidia libdrm libXNVCtrl hwdata
-
-%description
-TuxClocker is a hardware controlling and monitoring program.
-TuxClocker consists of a DBus daemon and a Qt GUI that uses the daemon.
-
-%prep
-git clone --recursive %url .
-git checkout %version
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/tuxclocker-qt
-%_bindir/tuxclockerd
-%_libdir/libtuxclocker.so
-%_libdir/tuxclocker/
-%_datadir/applications/tuxclocker.desktop
-%_datadir/dbus-1/system-services/org.tuxclocker.service
-%_datadir/dbus-1/system.d/org.tuxclocker.conf
-%_datadir/locale/*/LC_MESSAGES/tuxclocker.mo
-%_iconsdir/hicolor/scalable/apps/tuxclocker-logo.svg
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("Lurkki14/tuxclocker"));
@@ -6,7 +6,7 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.2
+Version:	1.5.1
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
@@ -1,6 +1,6 @@
-%global nodev 20.12.2
-%global npmv 10.5.0
-%global ver 0.19.2
+%global nodev 18.13.0
+%global npmv 8.19.3
+%global ver 0.18.1
 %define debug_package %nil
 %global _build_id_links none

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

 Name:           elementary-calculator
 Summary:        Calculator app designed for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.0.3
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -3,8 +3,8 @@

 Name:           elementary-capnet-assist
 Summary:        Captive Portal Assistant for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.4.4
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/capnet-assist
@@ -21,13 +21,10 @@ BuildRequires:  pkgconfig(gcr-ui-3)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
 BuildRequires:  pkgconfig(webkit2gtk-4.1)
-BuildRequires:  pkgconfig(gcr-4)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(webkitgtk-6.0)
 BuildRequires:  fdupes

 Requires:       NetworkManager
@@ -3,8 +3,8 @@

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

 URL:            https://github.com/elementary/icons
@@ -5,13 +5,16 @@

 Name:           elementary-photos
 Summary:        Photo manager and viewer from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.8.0
+Release:        2%?dist
 License:        LGPL-2.0-or-later

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

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

 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
 BuildRequires:  pkgconfig(geocode-glib-2.0)
@@ -41,8 +43,6 @@ BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
-BuildRequires:  pkgconfig(libportal)
-BuildRequires:  pkgconfig(libportal-gtk3)

 Requires:       hicolor-icon-theme

@@ -53,6 +53,7 @@ Foundation.

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


 %build
@@ -74,10 +75,10 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}.viewer.desktop
+    %{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml


 %files -f %{appname}.lang
@@ -91,11 +92,11 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/%{appname}/

 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/applications/%{appname}.viewer.desktop
+%{_datadir}/applications/%{appname}-viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/icons/hicolor/*/apps/%{appname}.viewer.svg
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
+%{_datadir}/metainfo/%{appname}.appdata.xml


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

 Name:           elementary-shortcut-overlay
 Summary:        Native, OS-wide shortcut overlay
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.0.1
+Release:        %autorelease
 License:        GPL-3.0

 URL:            https://github.com/elementary/shortcut-overlay
@@ -49,7 +49,7 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml


 %files -f %{appname}.lang
@@ -59,7 +59,7 @@ appstream-util validate-relax --nonet \
 %{_bindir}/%{appname}

 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml


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

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

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

 URL:            https://github.com/elementary/gala
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -36,7 +35,7 @@ BuildRequires:  pkgconfig(mutter-clutter-13)
 BuildRequires:  pkgconfig(mutter-cogl-13)
 BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

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

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

 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -5,8 +5,8 @@ apps built for elementary.}

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

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

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


 %files devel
@@ -3,8 +3,8 @@

 Name:           pantheon-agent-polkit
 Summary:        Pantheon Polkit Agent
-Version:        8.0.0
-Release:        1%?dist
+Version:        1.0.5
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -18,12 +18,10 @@ BuildRequires:  vala >= 0.34.1
 BuildRequires:  fdupes

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(polkit-agent-1)
 BuildRequires:  pkgconfig(polkit-gobject-1)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
-BuildRequires:  pkgconfig(gtk4)

 %description
 An agent for Polkit authorization designed for Pantheon.
@@ -52,7 +50,7 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml


 %files -f %{appname}.lang
@@ -64,7 +62,7 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/policykit-1-pantheon/

 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml


 %changelog
@@ -1,6 +1,6 @@
 Name:			pantheon-tweaks
-Version:		2.0.2
-Release:		1%?dist
+Version:		1.1.2
+Release:		1%{?dist}
 Summary:		A system settings panel for the Pantheon desktop environment
 License:		GPL-3.0
 URL:			https://github.com/pantheon-tweaks/pantheon-tweaks
@@ -5,8 +5,8 @@

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

 URL:            https://github.com/pantheon-tweaks/pantheon-tweaks
@@ -3,8 +3,8 @@

 Name:           switchboard
 Summary:        Modular Desktop Settings Hub
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.0.2
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -9,7 +9,6 @@ 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
@@ -33,7 +32,7 @@ BuildRequires:  pkgconfig(mutter-clutter-13)
 BuildRequires:  pkgconfig(mutter-cogl-13)
 BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

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

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

 %description    libs %{common_description}

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

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

 %description    devel %{common_description}

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

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

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

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

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

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

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

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

 Name:           lomiri-app-launch
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit aacd2e4704112468b44332e8c8b1f7445651b8da
+%global commit 30d9df926b6837b139990a622d39171ea42c9017
 %forgemeta

 Name:       lomiri-system-settings
-Version:    1.1.0
-Release:    1%?dist
+Version:    1.0.2
+Release:    1%{?dist}
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 1ubuntu4
+%define _ubuntu_rel 1ubuntu3

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-datetime
 Summary:    A GTK implementation of the StatusNotifierItem Specification
-Version:    24.5.0
-Release:    1%?dist
+Version:    24.2.0
+Release:    1%{?dist}
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-datetime
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-messages
 Summary:    Ayatana Indicator Messages Applet
-Version:    24.5.0
-Release:    1%?dist
+Version:    23.10.0
+Release:    %autorelease
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-messages
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-session
 Summary:    Ayatana Indicator Session Applet
-Version:    24.5.0
+Version:    24.2.0
 Release:    1%?dist
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-session
@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-sound
 Summary:    Ayatana Indicator Sound Applet
-Version:    24.5.0
+Version:    24.4.0
 Release:    1%?dist
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-sound
@@ -1,6 +0,0 @@
-project pkg {
-  arches = ["x86_64"]
-  rpm {
-    spec = "asar.spec"
-  }
-}
@@ -1,41 +0,0 @@
-%define debug_package %nil
-%define __strip /bin/true
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
-
-Name:           asar
-Version:        3.2.10
-Release:        1%?dist
-Summary:        Simple extensive tar-like archive format with indexing
-License:        MIT
-URL:            https://github.com/electron/asar
-Source0:        %url/archive/refs/tags/v%version.tar.gz
-Requires:       nodejs
-BuildRequires:  nodejs-npm
-BuildArch:      noarch
-
-%description
-Asar is a simple extensive archive format, it works like `tar` that concatenates all files
-together without compression, while having random access support.
-
-%prep
-%autosetup
-
-%build
-
-%install
-mkdir -p %buildroot%_bindir
-PATH="$PATH:%buildroot%_bindir"
-npm install -g --prefix %buildroot%_prefix %SOURCE0
-
-%files
-%doc README.md
-%license LICENSE.md
-%_bindir/asar
-%_prefix/lib/node_modules/@electron/asar/
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("electron/asar"));
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.90.2.24171
+Version:		1.88.1.24104
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -28,8 +28,6 @@ VSCodium is a new choice of tool that combines the simplicity of a code editor
 with what developers need for the core edit-build-debug cycle.

 %prep
-mkdir stuff
-cd stuff
 tar xf %SOURCE0

 cat <<EOF > vscodium-bin-uri-handler.desktop
@@ -72,7 +70,6 @@ EOF
 %build

 %install
-cd stuff
 mkdir -p %buildroot%_datadir/doc/%name/ %buildroot%_datadir/licenses/%name
 install -Dm644 %SOURCE1 %buildroot%_docdir/%name/
 install -Dm644 %SOURCE2 %buildroot%_datadir/licenses/%name/
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.22.2
+Version:		3.19.5
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -1,14 +1,13 @@
 %define debug_package %nil

 Name:		neovide
-Version:	0.13.1
-Release:	1%?dist
+Version:	0.12.2
+Release:	1%{?dist}
 Summary:	No Nonsense Neovim Client in Rust
 License:	MIT
 URL:		https://neovide.dev/
 Source0:	https://github.com/neovide/neovide/archive/refs/tags/%version.tar.gz
-Requires:	fontconfig freetype libglvnd
-Requires:	neovim > 0.9.5
+Requires:	neovim fontconfig freetype libglvnd
 BuildRequires:	anda-srpm-macros cargo-rpm-macros >= 24 cmake gtk3 python3 SDL2
 BuildRequires:	fontconfig-devel freetype-devel libX11-xcb libX11-devel libstdc++-static libstdc++-devel
 ExclusiveArch:	x86_64
@@ -1,6 +1,6 @@
 Name:		terra-rgbds
-Version:	0.8.0
-Release:	1%?dist
+Version:	0.7.0
+Release:	1%{?dist}
 Summary:	A development package for the Game Boy, including an assembler

 # See LICENSE for details
@@ -1,9 +0,0 @@
-project pkg {
-  rpm {
-    spec = "zed-nightly.spec"
-  }
-  labels {
-    nightly = 1
-    large = 1
-  }
-}
@@ -1,9 +0,0 @@
-if filters.contains("nightly") {
-  rpm.global("commit", gh_commit("zed-industries/zed"));
-  if rpm.changed() {
-    let v = find("(\\d+\\.\\d+\\d+\\.\\d+)", find("\nversion = \"(\\d+\\.\\d+\\d+\\.\\d+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1), 1);
-    rpm.global("ver", v);
-    rpm.global("commit_date", date());
-    rpm.release();
-  }
-}
@@ -1,97 +0,0 @@
-%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240619
-%global ver 0.142.0
-
-%bcond_without check
-
-# Exclude input files from mangling
-%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-
-%global crate zed
-%global app_id dev.zed.Zed-Nightly
-
-Name:           zed-nightly
-Version:        %ver^%commit_date.%shortcommit
-Release:        1%?dist
-Summary:        Zed is a high-performance, multiplayer code editor
-
-License:        MIT
-URL:            https://zed.dev/
-Source0:        https://github.com/zed-industries/zed/archive/%{commit}.zip
-
-Conflicts:      zed
-Provides:       zed
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  gcc
-BuildRequires:  g++
-BuildRequires:  clang
-BuildRequires:  mold
-BuildRequires:  alsa-lib-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  wayland-devel
-BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
-BuildRequires:  libzstd-devel
-BuildRequires:  perl-FindBin
-BuildRequires:  perl-IPC-Cmd
-BuildRequires:  perl-File-Compare
-BuildRequires:  perl-File-Copy
-BuildRequires:  perl-lib
-BuildRequires:  vulkan-loader
-
-%description
-Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
-
-%prep
-%autosetup -n %{crate}-%{commit} -p1
-%cargo_prep_online
-
-export DO_STARTUP_NOTIFY="true"
-export APP_ID="%app_id"
-export APP_ICON="%app_id"
-export APP_NAME="Zed Nightly"
-export APP_CLI="zed"
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
-export ZED_RELEASE_CHANNEL=nightly
-export BRANDING_LIGHT="#e9aa6a"
-export BRANDING_DARK="#1a5fb4"
-
-echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
-envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
-
-envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
-
-%build
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
-echo "nightly" > crates/zed/RELEASE_CHANNEL
-
-%cargo_build -- --package zed --package cli
-script/generate-licenses
-
-%install
-install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
-install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
-
-install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
-install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
-
-install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%files
-%{_libexecdir}/zed-editor
-%{_bindir}/zed
-%{_datadir}/applications/%app_id.desktop
-%{_datadir}/pixmaps/%app_id.png
-%{_metainfodir}/%app_id.metainfo.xml
-%license assets/licenses.md
-
-%changelog
-%autochangelog
@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-    spec = "zed-preview.spec"
-  }
-  labels {
-    large = 1
-  }
-}
@@ -1,10 +0,0 @@
-let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
-for release in releases {
-  if !release.prerelease {
-    continue;
-  }
-  let tag = release.tag_name;
-  tag.pop(4); // remove the "-pre" suffix
-  rpm.global("ver", tag);
-  terminate();
-}
@@ -1,91 +0,0 @@
-%bcond_without check
-%global debug_package %{nil}
-%global ver 0.142.1
-
-%global crate zed
-%global app_id dev.zed.Zed-Preview
-
-Name:           zed-preview
-Version:        %ver
-Release:        pre1%?dist
-Summary:        Zed is a high-performance, multiplayer code editor
-
-License:        MIT
-URL:            https://zed.dev/
-Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}-pre.tar.gz
-
-Conflicts:      zed
-Provides:       zed
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  gcc
-BuildRequires:  g++
-BuildRequires:  clang
-BuildRequires:  mold
-BuildRequires:  alsa-lib-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  wayland-devel
-BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
-BuildRequires:  libzstd-devel
-BuildRequires:  perl-FindBin
-BuildRequires:  perl-IPC-Cmd
-BuildRequires:  perl-File-Compare
-BuildRequires:  perl-File-Copy
-BuildRequires:  perl-lib
-BuildRequires:  vulkan-loader
-
-%description
-Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
-
-%prep
-%autosetup -n %{crate}-%{ver}-pre -p1
-%cargo_prep_online
-
-export DO_STARTUP_NOTIFY="true"
-export APP_ID="%app_id"
-export APP_ICON="%app_id"
-export APP_NAME="Zed Preview"
-export APP_CLI="zed"
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
-export ZED_RELEASE_CHANNEL=preview
-export BRANDING_LIGHT="#99c1f1"
-export BRANDING_DARK="#1a5fb4"
-
-echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
-envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
-
-envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
-
-%build
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
-echo "preview" > crates/zed/RELEASE_CHANNEL
-
-%cargo_build -- --package zed --package cli
-script/generate-licenses
-
-%install
-install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
-install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
-
-install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
-install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
-
-install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%files
-%{_libexecdir}/zed-editor
-%{_bindir}/zed
-%{_datadir}/applications/%app_id.desktop
-%{_datadir}/pixmaps/%app_id.png
-%{_metainfodir}/%app_id.metainfo.xml
-%license assets/licenses.md
-
-%changelog
-%autochangelog
@@ -7,7 +7,7 @@

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

 %gometa

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

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

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

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

@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	1.0.15
+Version:	1.0.10
 Release:	1%?dist
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/Sarasa-TTC-%version.7z
@@ -1,10 +1,11 @@
 Name:			seto-fonts
 Version:		6.20
-Release:		3%?dist
+Release:		2%?dist
 URL:			https://setofont.osdn.jp/
-Source0:		https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz
+Source0:		https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip
 License:		OFL-1.1
 Summary:		A handwritten font that contains kanji up to JIS 4th level and difficult kanji
+BuildRequires:	unzip
 BuildArch:		noarch


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


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

 %build

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

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

 %changelog
-%autochangelog
+* Sun Jun 18 2023 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-2
+- Fix install dir.
+
+* Tue Nov 22 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-1
+- Initial package
@@ -1,9 +1,9 @@
-%define osuresver 2024.622.0
+%define osuresver 2024.410.0
 %global debug_package %{nil}
 %define __strip /bin/true

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

-%global commit 8014283bf4150fa6eb3f9d5d4ebaf37262a17308
+%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 20240619
+%global commit_date 20240325
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -38,6 +40,8 @@ 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
@@ -46,7 +50,6 @@ BuildRequires:    gcc-c++
 BuildRequires:    java-17-openjdk-devel
 BuildRequires:    desktop-file-utils
 BuildRequires:    libappstream-glib
-BuildRequires:    tomlplusplus-devel
 BuildRequires:    cmake(ghc_filesystem)
 BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
@@ -55,13 +58,9 @@ 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}
-BuildRequires:    cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version}

 %if %{with qt6}
 BuildRequires:    cmake(Qt6Core5Compat)
-BuildRequires:    quazip-qt6-devel
-%else
-BuildRequires:    quazip-qt5-devel
 %endif

 BuildRequires:    pkgconfig(libcmark)
@@ -104,9 +103,13 @@ multiple installations of Minecraft at once (Fork of MultiMC)
 %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,zlib}/
+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
@@ -153,9 +156,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt


 %changelog
-* Wed Jun 19 2024 Trung Lê <8 at tle dot id dot au> - 9.0^20240619.8014283-1
- use system quazip-qt and tomlplusplus
-
 * 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
@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit a2d28f6872841d047ce3854365c595ebf941b848
+%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 20240401
+%global commit_date 20240325
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_with qt6
@@ -22,7 +22,7 @@ Name:             prismlauncher
 %else
 Name:             prismlauncher-qt5
 %endif
-Version:          8.4
+Version:          8.2
 Release:          2%?dist
 Summary:          Minecraft launcher with ability to manage multiple instances
 # see COPYING.md for more information
@@ -46,16 +46,11 @@ 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}
-BuildRequires:    tomlplusplus-devel

 %if %{with qt6}
 BuildRequires:    cmake(Qt6Core5Compat)
-BuildRequires:    quazip-qt6-devel
-%else
-BuildRequires:    quazip-qt5-devel
 %endif

-
 BuildRequires:    pkgconfig(libcmark)
 BuildRequires:    pkgconfig(scdoc)
 BuildRequires:    pkgconfig(zlib)
@@ -137,9 +132,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt


 %changelog
-* Sun Jun 23 2024 Trung Lê <8@tle.id.au> - 8.2-2
- update to 8.4. Add quazip-qt deps
-
 * Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
 - move JREs to weak deps, add java 21 for snapshots

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

 Name:			crystal
-Version:		1.12.2
-Release:		1%?dist
+Version:		1.11.2
+Release:		1%{?dist}
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
 URL:			https://crystal-lang.org/
@@ -1,2 +1,2 @@
 let html = get("https://crystal-lang.org/");
-rpm.version(find("Latest release: <strong>(.+?)</strong>", html, 1))
+rpm.version(find("Latest release <.+>(.+)</a>", html, 1))
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name: dart
-Version: 3.4.4
+Version: 3.3.3
 Release: 1%?dist
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -1,38 +0,0 @@
-%define debug_package %nil
-%global commit 688ca6ae29de89174794a48be61ecd0fb1111c96
-%global commit_date 20240430
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name:           albius
-Version:        %date.%shortcommit
-Release:        1%?dist
-Summary:        A Linux installer backend with support for SquashFS and OCI installations
-License:        GPL-3.0
-URL:            https://github.com/Vanilla-OS/Albius
-Source0:        %url/archive/%commit/albius-%commit.tar.gz
-BuildRequires:  go anda-srpm-macros btrfs-progs-devel pkgconfig(devmapper) pkgconfig(gpgme) lvm2 gcc
-
-%description
-Albius is a Linux installer backend originally designed for Vanilla OS,
-but capable of handling any Linux distribution that uses either Squashfs
-or OCI images for distributing the base system. Albius is written entirely
-in Go and uses a recipe system (see "recipes" subsection) for describing
-operations, mountpoints and options.
-
-%prep
-%autosetup -n Albius-%commit
-go mod download
-
-%build
-mkdir -p build/bin
-go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w" -buildmode=pie -o build/bin/albius .
-
-%install
-mkdir -p %{buildroot}%{_bindir}/
-install -pm755 build/bin/albius %{buildroot}%{_bindir}/
-
-%files
-%_bindir/albius
-
-%changelog
-%autochangelog
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "albius.spec"
-  }
-}
@@ -1 +0,0 @@
-rpm.version(gh("Vanilla-OS/Albius"));
@@ -5,7 +5,7 @@

 # https://github.com/xyproto/gendesk
 %global goipath         github.com/xyproto/gendesk
-Version:                1.0.10
+Version:                1.0.9
 %global tag             1.0.9
 %global commit          f074161864697100fdc21a99e09b567e82aeb1b9

@@ -20,14 +20,13 @@ of information.}
 %global godocs          README.md

 Name:           %{goname}
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        Generate .desktop files and download .png icons

 License:        BSD-3-Clause
 URL:            %{gourl}
 Source:         %{gosource}
 BuildRequires:  git-core gcc
-Provides:       gendesk

 %description %{common_description}

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

 # https://github.com/xyproto/textoutput
 %global goipath         github.com/xyproto/textoutput
-Version:                1.16.4
+Version:                1.16.3

 %gometa -f

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

 # https://github.com/xyproto/vt100
 %global goipath         github.com/xyproto/vt100
-Version:                1.14.4
+Version:                1.14.3

 %gometa -f

@@ -1,5 +1,5 @@
 Name:		groovy-docs
-Version:	4.0.22
+Version:	4.0.21
 Release:	1%?dist
 Summary:	Documentation for the Groovy programming language
 URL:		https://groovy-lang.org/
@@ -1,5 +1,5 @@
 Name:			groovy
-Version:		4.0.22
+Version:		4.0.21
 Release:		1%?dist
 Summary:		A multi-faceted language for the Java platform
 BuildArch:		noarch
@@ -2,14 +2,14 @@

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Name:           kotlin-native
-Version:        2.0.0
+Version:        1.9.23
 Release:        1%?dist
 Summary:        LLVM backend for the Kotlin compiler
 ExclusiveArch:  x86_64

 License:        ASL 2.0
 URL:            https://kotlinlang.org/docs/reference/native-overview.html
-Source0:        https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-prebuilt-linux-x86_64-%version.tar.gz
+Source0:        https://github.com/JetBrains/kotlin/releases/download/v%{version}/kotlin-native-linux-x86_64-%{version}.tar.gz 

 BuildRequires:  tar
 BuildRequires:  sed
@@ -28,7 +28,7 @@ Kotlin compiler and native implementation of the Kotlin standard library.


 %prep
-tar -xf %{SOURCE0} && cd kotlin-native-prebuilt-linux-x86_64-%{version}
+tar -xf %{SOURCE0} && cd kotlin-native-linux-x86_64-%{version}
 sed -i "s|\(DIR *= *\).*|\1%{_bindir}|" bin/*
 sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/*

@@ -36,7 +36,7 @@ sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/*
 %build

 %install
-rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-prebuilt-linux-x86_64-%{version}
+rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-linux-x86_64-%{version}
 install -m 0755 bin/cinterop %{buildroot}%{_bindir}/
 install -m 0755 bin/generate-platform %{buildroot}%{_bindir}/
 install -m 0755 bin/jsinterop %{buildroot}%{_bindir}/
@@ -79,5 +79,65 @@ kotlinc-native test.kt -o test


 %changelog
-%autochangelog
+* Mon Apr 03 2023 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.8.20
+* Thu Feb 02 2023 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.8.10
+* Wed Dec 28 2022 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.8.0
+* Wed Nov 09 2022 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.7.21
+* Thu Sep 29 2022 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.7.20
+* Fri Jul 08 2022 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.7.10
+* Mon Jun 13 2022 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.7.0
+* Mon Jun 13 2022 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.6.21
+* Thu Jun 09 2022 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.7.0
+* Wed Apr 20 2022 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.6.21
+* Mon Apr 04 2022 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.6.20
+* Tue Dec 14 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.6.10
+* Fri Dec 10 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.6.0
+* Mon Nov 29 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.5.32
+* Tue Nov 16 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.6.0
+* Mon Sep 20 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.5.31
+* Tue Aug 24 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.5.30
+* Tue Jul 13 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.5.21
+* Thu Jun 24 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.5.20
+* Mon May 24 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.5.10
+* Wed May 05 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.5.0
+* Tue Mar 30 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.4.32
+* Fri Feb 26 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.4.31
+* Wed Feb 03 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.4.30
+* Mon Jan 18 2021 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.4.30-RC
+* Mon Dec 07 2020 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.4.21
+* Thu Nov 19 2020 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.4.20
+* Thu Sep 10 2020 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.4.10
+* Fri Aug 14 2020 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.4.0
+* Sat Apr 18 2020 Gonçalo Silva <goncalossilva@gmail.com>
+- Update to 1.3.72
+* Mon Apr 13 2020 Gonçalo Silva <goncalossilva@gmail.com>
 - Kotlin/Native 1.3.71
@@ -1,7 +1,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Name:           kotlin
-Version:        2.0.0
+Version:        1.9.23
 Release:        1%?dist
 Summary:        Statically typed programming language

@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "umdive.spec"
-    }
-}
@@ -1,29 +0,0 @@
-Name:           umdive
-Version:        0.1.1
-Release:        1%?dist
-Summary:        Chroot utility (just like arch-chroot)
-License:        MIT
-URL:            https://github.com/Ultramarine-Linux/dive
-Source0:		%url/archive/refs/tags/v%version.tar.gz
-Requires:       (%_bindir/chroot or %_sbindir/chroot)
-Requires:       %_bindir/mount
-BuildRequires:  anda-srpm-macros nim
-Provides:       dive = %version-%release
-
-%description
-%summary.
-
-%prep
-%autosetup -n dive-%version
-
-%build
-nimble setup -y
-nim c %nim_c src/dive
-
-%install
-install -Dpm755 src/dive %buildroot%_bindir/dive
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/dive
@@ -1 +0,0 @@
-rpm.version(gh("Ultramarine-Linux/dive"));
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "mkfstab.spec"
-    }
-}
@@ -1,26 +0,0 @@
-Name:           mkfstab
-Version:        0.1.2
-Release:        1%?dist
-Summary:        An alternative to genfstab: generate output suitable for addition to /etc/fstab
-License:        MIT
-URL:            https://github.com/Ultramarine-Linux/mkfstab
-Source0:		%url/archive/refs/tags/v%version.tar.gz
-BuildRequires:  nim anda-srpm-macros
-
-%description
-An alternative to genfstab from Arch Linux. This is a dead simple but faster implementation of genfstab.
-
-%prep
-%autosetup
-
-%build
-nimble setup -y
-nim c %nim_c src/%name
-
-%install
-install -Dpm755 src/%name %buildroot%_bindir/%name
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/%name
@@ -1 +0,0 @@
-rpm.version(gh("Ultramarine-Linux/mkfstab"));
@@ -1,11 +1,11 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 9d08d26e3307cf5d21271fd30d983f8d1c66ec50
+%global commit 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
-%global commit_date 20240619
+%global commit_date 20240322
 %global debug_package %nil

-Name:			nim-nightly
+Name:			nim-nighlty
 Version:		%ver^%commit_date.%shortcommit
 Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
@@ -19,9 +19,6 @@ 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
@@ -32,9 +29,6 @@ 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
@@ -47,8 +41,6 @@ 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
@@ -100,18 +92,16 @@ 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 %buildroot%_datadir
+mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim
 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 || true
-cp -a doc/html/*.html %buildroot/%_docdir/%name/html/ || true
-cp tools/dochack/dochack.js %buildroot/%_docdir/%name/ || true
+mkdir -p %buildroot/%_docdir/%name/html
+cp -a doc/html/*.html %buildroot/%_docdir/%name/html/
+cp tools/dochack/dochack.js %buildroot/%_docdir/%name/
 %endif

 cp -r lib/* %buildroot%_prefix/lib/nim/
@@ -131,7 +121,6 @@ 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.6
-Release:		1%?dist
+Version:		2.0.2
+Release:		3%{?dist}
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD
 URL:			https://nim-lang.org
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`rpm.version(gh("spacedriveapp/spacedrive"));`
				`@@ -1 +0,0 @@`
				`rpm.version(gh("Ultramarine-Linux/mkfstab"));`