?

Update intellij-ultimate-idea.spec
Signed-off-by: madomado <wboy111@outlook.com>
2026-05-31 09:01:55 +00:00 · 2025-12-23 19:03:15 +08:00 · 2023-07-09 15:16:09 +08:00 · 2023-07-09 00:02:22 +08:00 · 2023-07-08 23:31:05 +08:00 · 2023-07-08 22:44:33 +08:00
189 changed files with 1137 additions and 2274 deletions
@@ -60,11 +60,6 @@ jobs:
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
-          restore-keys: |
-            ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
-            ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
-            ${{ runner.os }}-br-${{ matrix.version }}
-            ${{ runner.os }}-br

      - name: Include custom build template instead of package default
        run: |
@@ -99,3 +94,63 @@ jobs:
      - name: Notify Madoguchi (Failure)
        if: ( cancelled() || failure() ) && github.event_name == 'push'
        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+
+      - name: Lint RPMs and SRPMs
+        id: lint
+        if: success()
+        run: |
+          echo 'LINT_ERR=false' >> $GITHUB_ENV
+          rpmlint anda-build/ > rpmlint.txt || f=1
+          if [[ $f -eq 1 ]]; then
+            EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+            echo "ESC_LINT_OUT<<$EOF" >> $GITHUB_ENV
+            cat rpmlint.txt | sed 's/`/\\`/g' | sed 's/"/\"/g' >> $GITHUB_ENV
+            echo $EOF >> $GITHUB_ENV
+            echo "lint_out<<$EOF" >> $GITHUB_ENV
+            echo '```' >> $GITHUB_ENV
+            cat rpmlint.txt >> $GITHUB_ENV
+            echo '```' >> $GITHUB_ENV
+            echo $EOF >> $GITHUB_ENV
+            echo 'LINT_ERR=true' >> $GITHUB_ENV
+          fi
+
+      - name: Try to install package
+        id: dnf
+        if: success()
+        run: |
+          echo 'INSTALL_ERR=false' >> $GITHUB_ENV
+          touch out
+          for f in anda-build/rpm/rpms/*.rpm; do
+            dnf in --downloadonly -y $f > $f.dnfout.txt 2>&1 || fail=1
+            if [[ $fail -eq 1 ]]; then
+              echo "### $f" >> out
+              echo '```' >> out
+              cat $f.dnfout.txt >> out
+              echo '```' >> out
+              echo >> out
+              echo 'INSTALL_ERR=true' >> $GITHUB_ENV
+            fi
+          done
+          cat out
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+          echo "ESC_DNF_OUT<<$EOF" >> $GITHUB_ENV
+          cat out | sed 's/`/\\`/g' | sed 's/"/\"/g' >> $GITHUB_ENV
+          echo $EOF >> $GITHUB_ENV
+          echo "dnf_out<<$EOF" >> $GITHUB_ENV
+          cat out >> $GITHUB_ENV
+          echo $EOF >> $GITHUB_ENV
+
+      - name: Generate RPMLint/DNF summary
+        if: success()
+        run: |
+          # Remind me to make all of this not weird later ~ lleyton
+
+          if [[ $LINT_ERR == "true" ]]; then
+            echo -e "## ❌ Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY
+            echo -e "```\n${{ env.ESC_LINT_OUT }}\n```\n" >> $GITHUB_STEP_SUMMARY
+          fi
+
+          if [[ $INSTALL_ERR == "true" ]]; then
+            echo -e "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY
+            echo "${{ env.ESC_DNF_OUT }}" >> $GITHUB_STEP_SUMMARY
+          fi
@@ -23,7 +23,13 @@ jobs:
        run: |
          sudo dnf install -y dnf-plugins-core
          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
-          sudo dnf install -y mock createrepo_c rpm-build gcc curl wget git-core openssl-devel
+          sudo dnf install -y mock createrepo_c rpm-build terra-mock-configs gcc curl wget git-core openssl-devel
+
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/subatomic
+          set-safe-directory: true
+          fetch-depth: 1

      - uses: actions-rs/toolchain@v1
        with:
@@ -34,24 +40,6 @@ jobs:
          command: install
          args: anda

-
-      - uses: actions/checkout@v3
-        with:
-          ref: f${{ matrix.version} }}
-          fetch-depth: 1
-      - name: Build terra-mock-configs
-        run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/mock-configs/pkg -p rpm
-      - name: Install terra-mock-configs
-        run: sudo dnf install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
-
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/subatomic
-          set-safe-directory: true
-          fetch-depth: 1
-      
      - name: Build Subatomic
        run: |
          git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -59,16 +47,13 @@ jobs:
      - name: Install Subatomic
        run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm

-
      - uses: actions/checkout@v3
        with:
          repository: FyraLabs/anda
-          fetch-depth: 1

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

-
      - name: Upload to Subatomic
        run: |
          subatomic-cli upload --prune \
@@ -44,7 +44,7 @@ jobs:
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}

      - name: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
+        run: anda build ${{ matrix.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -13,12 +13,14 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:38
    steps:
      - uses: actions/checkout@v3
+      - id: get-branch
+        uses: grandmasterdev/github-action-get-branch@latest
      - name: Push to subatomic
        run: |
-          branch=${{ github.ref_name }}
+          branch=${{steps.get-branch.outputs.branch-name}}
          ver=${branch/f/}
          subatomic-cli upload-comps \
            --server https://subatomic.fyralabs.com \
@@ -38,15 +38,13 @@ jobs:
            git config user.signingkey "${{ runner.temp }}/signing_key"
            msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
            git commit -S -a -m "$msg"
-            copy_over () {
+            f37 () {
              git format-patch HEAD^
-              git checkout $1
+              git checkout f37
              git apply *.patch || true
-              rm *.patch
              git add *
              git commit -S -a -m "$msg"
            }
-            copy_over f37 || true
-            copy_over f39 || true
+            f37 || true
            git push -u origin --all
          fi
@@ -1,7 +1,7 @@
 name: Update
 on:
  schedule:
-    - cron: "*/10 * * * *"
+    - cron: "*/30 * * * *"
  workflow_dispatch:

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

      - name: Save
@@ -39,15 +39,13 @@ jobs:
            git config user.signingkey "${{ runner.temp }}/signing_key"
            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
            git commit -S -a -m "$msg"
-            copy_over () {
+            f37 () {
              git format-patch HEAD^
-              git checkout $1
+              git checkout f37
              git apply *.patch || true
-              rm *.patch
              git add *
              git commit -S -a -m "$msg"
            }
-            copy_over f37 || true
-            copy_over f39 || true
+            f37 || true
            git push -u origin --all
          fi
@@ -1,13 +1,13 @@
 Name:			anki-bin
-Version:		2.1.66
-Release:		2%{?dist}
+Version:		2.1.65
+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
 URL:			https://apps.ankiweb.net/
 BuildRequires:	python3-installer python3.11 rpm_macro(fdupes)
 Requires:		hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
 Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
-Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine
+Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress
 ExclusiveArch:	x86_64
 Conflicts:		anki
 Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
@@ -1,6 +1,6 @@
 Name:           anki-qt5
-Version:        2.1.66
-Release:        2%{?dist}
+Version:        2.1.65
+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
 URL:            https://apps.ankiweb.net/
@@ -8,7 +8,7 @@ BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protob
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip
 BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
-Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt5-sip
+Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
 ExclusiveArch:  x86_64
 Conflicts:      anki
 Patch0:         0001-No-update.patch
@@ -1,5 +1,4 @@
 project pkg {
-	arches = ["x86_64"]
 	rpm {
 		spec = "anki.spec"
 	}
@@ -1,14 +1,14 @@
 Name:           anki
-Version:        2.1.66
-Release:        2%{?dist}
+Version:        2.1.65
+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
 URL:            https://apps.ankiweb.net/
 BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson
-BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-webengine
+BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-devel python3-pyqt6
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
-Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt6-webengine
+Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-qt5-webengine python3-pyqt6
 Recommends:     mpv
 Obsoletes:      anki <= 2.1.15
 Conflicts:      anki-qt5
@@ -1,5 +1,4 @@
 %define debug_package %nil
-%global _build_id_links none

 %ifarch x86_64
 %global src ArmCord-%version
@@ -9,13 +8,9 @@
 %global src ArmCord-%version-armv7l
 %endif

-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/armcord/.*\\.so
-
 Name:			armcord-bin
-Version:		3.2.4.libwebp
-Release:		1%{?dist}
+Version:		3.2.0
+Release:		2%{?dist}
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
 URL:			https://github.com/ArmCord/ArmCord
@@ -1,25 +1,25 @@
 %define debug_package %nil

-Name:		armcord
-Version:	3.2.4.libwebp
-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
-Conflicts:	armcord-bin
-BuildArch:	noarch
+Name:			armcord
+Version:		3.2.0
+Release:		2%{?dist}
+License:		OSL-3.0
+Summary:		Custom lightweight Discord client designed to enhance your experience
+URL:			https://github.com/ArmCord/ArmCord
+Group:			Applications/Internet
+Source0:		%url/archive/refs/tags/v%version.tar.gz
+Source1:		launch.sh
+Requires:		electron xdg-utils
+BuildRequires:	nodejs-npm
+Conflicts:		armcord-bin
+BuildArch:		noarch

 %description
 ArmCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
-git clone %url .
-git checkout v%version
+%autosetup -n ArmCord-%version

 cat <<EOF > armcord.desktop
 [Desktop Entry]
@@ -36,7 +36,7 @@ EOF


 %build
-npx pnpm@7 install --no-frozen-lockfile
+npx pnpm@7 install --frozen-lockfile --ignore-scripts
 npm run packageQuick


@@ -1,17 +1,10 @@
-%define debug_package %nil
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
-
 Name: authy
-Version: 2.4.1
-Release: 1%{?dist}
+Version: 2.3.0
+Release: 2%{?dist}
 Summary: Two factor authentication desktop application
 License: Unlicense
 URL: https://authy.com/
-Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_21.snap
+Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_19.snap
 Requires: gtk3
 Requires: nss
 BuildRequires: squashfs-tools desktop-file-utils
@@ -1,12 +1,7 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.171
+Version:        0.0.162
 Release:        1%{?dist}
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -57,4 +52,4 @@ chmod o+w %{buildroot}%{_datadir}/discord-canary-openasar/resources -R
 - Bundle discord-canary

 * Thu Oct 20 2022 Cappy Ishihara <cappy@cappuchino.xyz>
-
+- 
@@ -1,12 +1,7 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary
-Version:        0.0.171
+Version:        0.0.162
 Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -1,13 +1,8 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.31
-Release:        1%{?dist}
+Version:        0.0.27
+Release:        2%{?dist}
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
@@ -1,12 +1,7 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb-openasar
-Version:        0.0.50
+Version:        0.0.44
 Release:        1%{?dist}
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -1,12 +1,7 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.50
+Version:        0.0.44
 Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -1,13 +1,8 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.31
-Release:		1%{?dist}
+Version:		0.0.27
+Release:		2%{?dist}
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
 Source0:		https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 8b9442ced668b24565206830cf47c928b3b6af82
+%global commit 42b4b88db8f6ce1ef1cf085e8fd8de6d4484f5d4
 %forgemeta

 Name:       lomiri-system-settings
@@ -20,7 +20,6 @@ BuildRequires: pkgconfig(geonames)
 BuildRequires: pkgconfig(icu-i18n)
 #BuildRequires: pkgconfig(libandroid-properties)
 BuildRequires: pkgconfig(click-0.4)
-BuildRequires: pkgconfig(deviceinfo)
 BuildRequires: pkgconfig(gsettings-qt)
 BuildRequires: pkgconfig(QtGui)
 BuildRequires: pkgconfig(gnome-desktop-3.0)
@@ -1,5 +1,9 @@
-let v = gh("VOICEVOX/voicevox");
-rpm.global("ver", v);
+// let v = gh("VOICEVOX/voicevox");
+// rpm.version(v);
+// let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
+// rpm.define("nodev", find(">=([\\d.]+)", engines.node, 1));
+// rpm.define("nodev", find(">=([\\d.]+)", engines.npm, 1));
+let v = "0.14.7";
 let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
-rpm.global("nodev", find(">=([\\d.]+)", engines.node, 1));
-rpm.global("npmv", find(">=([\\d.]+)", engines.npm, 1));
+print(find(">=([\\d.]+)", engines.node, 1));
+print(find(">=([\\d.]+)", engines.npm, 1));
@@ -1,16 +1,10 @@
 %global nodev 16.17.0
 %global npmv 8.11.0
-%global ver 0.14.8
 %define debug_package %nil
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		%ver
-Release:		4%?dist
+Version:		0.14.7
+Release:		1%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
@@ -1,8 +1,8 @@
 %define debug_package %nil

 Name:			crystal
-Version:		1.10.1
-Release:		1%{?dist}
+Version:		1.8.2
+Release:		2%{?dist}
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
 URL:			https://crystal-lang.org/
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name: dart
-Version: 3.1.3
+Version: 3.0.5
 Release: 1%{?dist}
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -1,6 +1,6 @@
 Name:		budgie-extras
-Version:	1.7.0
-Release:	1%{?dist}
+Version:	1.6.0
+Release:	2%{?dist}

 License:	GPL-3.0
 Summary:	Additional Budgie Desktop enhancements for user experience
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu4
+%define _ubuntu_rel 22.10.20220822-0ubuntu3
 %global _hardened_build 0

 Name:           compiz9
@@ -77,7 +77,7 @@ Compiz Config Manager helps configure Compiz Window Manager, version 0.9 series
 Compiz 9 branch, which is newer then what Fedora packages and required by Unity 7.6 and higher.

 %prep
-%autosetup -p1 -n compiz-%version+%(echo %_ubuntu_rel | sed 's@-0ubuntu.@@')
+%autosetup -p1 -n compiz

 %build
 # The driver blacklist hack is obselete
@@ -1,99 +0,0 @@
-diff --git a/src/Core/Package.vala b/src/Core/Package.vala
-index 62d206fa..cbf05983 100644
--- a/src/Core/Package.vala
-+++ b/src/Core/Package.vala
-@@ -42,8 +42,29 @@ public enum RuntimeStatus {
- }
-
- public class AppCenterCore.Package : Object {
-+    // locally installed packages
-     public const string APPCENTER_PACKAGE_ORIGIN = "appcenter";
-    private const string ELEMENTARY_STABLE_PACKAGE_ORIGIN = "elementary-stable-jammy-main";
-+
-+    // Fedora repositories
-+    private const string FEDORA_STABLE_PACKAGE_ORIGIN = "fedora";
-+    private const string FEDORA_UPDATES_PACKAGE_ORIGIN = "updates";
-+    private const string FEDORA_TESTING_PACKAGE_ORIGIN = "updates-testing";
-+
-+    // RPMFusion repositories
-+    private const string RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-free";
-+    private const string RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-free-updates";
-+    private const string RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-free-updates-testing";
-+    private const string RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-nonfree";
-+    private const string RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates";
-+    private const string RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates-testing";
-+
-+    // Ultramarine repositories
-+    private const string ULTRAMARINE_PACKAGE_ORIGIN = "ultramarine";
-+    private const string AKMODS_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:akmods-secureboot";
-+    private const string KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:kmodtool-secureboot";
-+
-+    // Terra repositories
-+    private const string TERRA_PACKAGE_ORIGIN = "terra";
-
-     public RuntimeStatus runtime_status { get; set; default = RuntimeStatus.UP_TO_DATE; }
-
-@@ -216,8 +237,12 @@ public class AppCenterCore.Package : Object {
-     public bool is_native {
-         get {
-             switch (component.get_origin ()) {
-                case APPCENTER_PACKAGE_ORIGIN:
-                case ELEMENTARY_STABLE_PACKAGE_ORIGIN:
-+                case FEDORA_STABLE_PACKAGE_ORIGIN:
-+                case FEDORA_UPDATES_PACKAGE_ORIGIN:
-+                case FEDORA_TESTING_PACKAGE_ORIGIN:
-+                case ULTRAMARINE_PACKAGE_ORIGIN:
-+                case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
-+                case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
-                     return true;
-                 default:
-                     return false;
-@@ -328,12 +353,33 @@ public class AppCenterCore.Package : Object {
-         owned get {
-             unowned string origin = component.get_origin ();
-             if (backend is PackageKitBackend) {
-                if (origin == APPCENTER_PACKAGE_ORIGIN) {
-                    return _("AppCenter");
-                } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
-                    return _("elementary Updates");
-                } else if (origin.has_prefix ("ubuntu-")) {
-                    return _("Ubuntu (non-curated)");
-+                switch (origin) {
-+                    case FEDORA_STABLE_PACKAGE_ORIGIN:
-+                        return "Fedora";
-+                    case FEDORA_UPDATES_PACKAGE_ORIGIN:
-+                        return "Fedora Updates";
-+                    case FEDORA_TESTING_PACKAGE_ORIGIN:
-+                        return "Fedora Updates (Testing)";
-+                    case RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN:
-+                        return "RPMFusion";
-+                    case RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN:
-+                        return "RPMFusion Updates";
-+                    case RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN:
-+                        return "RPMFusion Updates (Testing)";
-+                    case RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN:
-+                        return "RPMFusion (Non-free Software)";
-+                    case RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN:
-+                        return "RPMFusion (Non-free Software) Updates";
-+                    case RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN:
-+                        return "RPMFusion (Non-free Software) Updates (Testing)";
-+                    case ULTRAMARINE_PACKAGE_ORIGIN:
-+                        return "Ultramarine";
-+                    case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
-+                        return "Secureboot support for akmods";
-+                    case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
-+                        return "Secureboot support for kmodtool";
-+                    case TERRA_PACKAGE_ORIGIN:
-+                        return "Terra";
-                 }
-             } else if (backend is FlatpakBackend) {
-                 var fp_package = this as FlatpakPackage;
-@@ -342,8 +388,6 @@ public class AppCenterCore.Package : Object {
-                 }
-
-                 return fp_package.remote_title;
-            } else if (backend is UbuntuDriversBackend) {
-                return _("Ubuntu Drivers");
-             }
-
-             return _("Unknown Origin (non-curated)");
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "elementary-appcenter.spec"
-	}
-}
@@ -1,10 +0,0 @@
-# false positives
-addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*")
-addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*")
-
-# don't care about manpages
-addFilter("W: no-manual-page-for-binary io.elementary.appcenter*")
-
-# don't care about no documentation for sub-packages
-addFilter("W: no-documentation*")
-
@@ -1,313 +0,0 @@
-%global appname io.elementary.appcenter
-
-Name:           elementary-appcenter
-Summary:        Software Center from elementary
-Version:        7.4.0
-Release:        1%{?dist}
-License:        GPL-3.0
-
-Provides:       appcenter = %{version}-%{release}
-Obsoletes:      appcenter < 7.2.1-2
-
-URL:            https://github.com/elementary/appcenter
-Source0:        %url/archive/%{version}/appcenter-%{version}.tar.gz
-
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
-BuildRequires:  libappstream-glib
-BuildRequires:  meson
-BuildRequires:  vala
-
-BuildRequires:  appstream-vala
-
-BuildRequires:  pkgconfig(appstream) >= 0.10.0
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(flatpak)
-BuildRequires:  pkgconfig(gee-0.8)
-BuildRequires:  pkgconfig(granite) >= 6.0.0
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
-BuildRequires:  pkgconfig(json-glib-1.0)
-BuildRequires:  pkgconfig(libhandy-1)
-BuildRequires:  pkgconfig(libsoup-2.4)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(packagekit-glib2)
-BuildRequires:  pkgconfig(polkit-gobject-1)
-
-Requires:       PackageKit
-Requires:       hicolor-icon-theme
-
-%description
-AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
-
-
-%package        gnome-shell-search-provider
-Summary:        Software Center from elementary (gnome-shell search provider)
-
-Provides:       appcenter-gnome-shell-search-provider = %{version}-%{release}
-Obsoletes:      appcenter-gnome-shell-search-provider < 7.2.1-2
-
-BuildArch:      noarch
-
-Requires:       %{name} = %{version}-%{release}
-Requires:       gnome-shell
-
-Supplements:    (%{name} and gnome-shell)
-
-%description    gnome-shell-search-provider
-AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
-
-This package contains the gnome-shell search provider.
-
-
-%prep
-%autosetup -p1 -n appcenter-%version
-
-
-%build
-%meson -Dpayments=false -Dcurated=false -Dhide_upstream_distro_apps=false
-%meson_build
-
-
-%install
-%meson_install
-
-%find_lang %{appname}
-
-# remove empty hidden apps file
-rm -r %{buildroot}/%{_sysconfdir}/%{appname}/appcenter.hiddenapps
-
-# create autostart entry symlink
-mkdir -p %{buildroot}/%{_sysconfdir}/xdg/autostart/
-
-ln -s %{_datadir}/applications/%{appname}-daemon.desktop \
-    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
-
-
-%check
-desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}*.desktop
-
-appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
-
-
-%files -f %{appname}.lang
-%doc README.md
-%license COPYING
-
-%dir %{_sysconfdir}/%{appname}
-%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
-
-%{_bindir}/%{appname}
-
-%{_datadir}/applications/%{appname}*.desktop
-%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_datadir}/icons/hicolor/*/apps/%{appname}{,-symbolic}.svg
-%{_datadir}/metainfo/%{appname}.metainfo.xml
-%{_datadir}/polkit-1/actions/%{appname}.policy
-
-
-%files gnome-shell-search-provider
-%{_datadir}/gnome-shell/search-providers/%{appname}.search-provider.ini
-
-
-%changelog
-* Tue Jun 07 2022 Fabio Valentini <decathorpe@gmail.com> - 3.10.0-1
- Update to version 3.10.0.
-
-* Tue Dec 14 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.1-1
- Update to version 3.9.1.
-
-* Wed Nov 24 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.0-1
- Update to version 3.9.0.
-
-* Sat Oct 30 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.2-1
- Update to version 3.8.2.
-
-* Wed Oct 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-1
- Update to version 3.8.1.
-
-* Tue Sep 28 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.0-1
- Update to version 3.8.0.
-
-* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-3
- Mark flatpak sources in the UI.
-
-* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-2
- Hard-code Fedora instead of ubuntu repository names.
-
-* Tue Aug 31 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-1
- Update to version 3.7.1.
-
-* Fri Aug 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.0-1
- Update to version 3.7.0.
-
-* Tue Aug 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.3-1
- Update to version 3.6.3.
-
-* Wed Aug 11 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.2-1
- Update to version 3.6.2.
-
-* Thu Aug 05 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.1-1
- Update to version 3.6.1.
-
-* Fri Jul 16 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.0-1
- Update to version 3.6.0.
-
-* Fri Oct 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.1-1
- Update to version 3.5.1.
-
-* Wed Oct 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.0-1
- Update to version 3.5.0.
-
-* Fri Aug 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.2-1
- Update to version 3.4.2.
-
-* Thu Jul 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.1-1
- Update to version 3.4.1.
-
-* Thu May 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.0-1
- Update to version 3.4.0.
-
-* Thu Apr 30 2020 Fabio Valentini <decathorpe@gmail.com> - 3.3.0-1
- Update to version 3.3.0.
-
-* Thu Apr 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.4-1
- Update to version 3.2.4.
-
-* Thu Apr 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.3-1
- Update to version 3.2.3.
-
-* Mon Mar 23 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-1
- Update to version 3.2.2.
-
-* Fri Feb 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.1-1
- Update to version 3.2.1.
-
-* Fri Feb 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.1-1
- Update to version 3.1.1.
-
-* Wed Jan 02 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.0-1
- Update to version 3.1.0.
- Remove empty blacklist file.
-
-* Fri Nov 30 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-2
- Drop elementaryOS blacklist in favor of the version shipped with appcenter.
-
-* Thu Oct 25 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-1
- Update to version 3.0.1.
-
-* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-2
- Add missing autostart entry symlink for the daemon.
-
-* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-1
- Update to version 3.0.
- Add gnome-shell search provider sub-package.
- Explicitly disable payment system and curated applications.
- Update blacklist file to current version from elementaryOS.
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jun 13 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-2
- Rebuild for granite5 soname bump.
-
-* Thu Mar 08 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-1
- Update to version 0.2.9.
- Add patch to fix build with the newer vala and PackageKit on f28+.
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Jan 26 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.8-1
- Update to version 0.2.8.
-
-* Tue Nov 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.7-1
- Update to version 0.2.7.
-
-* Fri Nov 03 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-2
- Rebuild for granite soname bump.
-
-* Mon Sep 18 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-1
- Update to version 0.2.6.
-
-* Sat Aug 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.5-1
- Update to version 0.2.5.
- Include fedora-specific blacklist adapted from elementaryOS.
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jul 04 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.4-1
- Update to version 0.2.4.
-
-* Thu Jun 01 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.3-1
- Update to version 0.2.3.
-
-* Mon May 22 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.2-1
- Update to version 0.2.2.
-
-* Sat May 20 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.1-1
- Update to version 0.2.1.
-
-* Wed May 17 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2-1
- Update to version 0.2.
-
-* Thu Mar 16 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.4-1
- Update to version 0.1.4.
- Depend on generic icon again, since it _should_ work.
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 27 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-7
- Add patch to rename generic icon to something branded.
-
-* Wed Jan 25 2017 Fabio Valentini <decathorpe@gmail.com>
- Remove explicit BR: /usr/bin/pkgconfig.
-
-* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-6
- Explicitly depend on /usr/bin/pkg-config.
-
-* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-5
- Add missing scriptlets.
-
-* Sat Jan 21 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-4
- Include icon to fix appdata metadata generation.
-
-* Tue Jan 10 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-3
- Clean up spec file.
-
-* Sat Dec 24 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-2
- Enable libunity support.
-
-* Mon Dec 05 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-1
- Update to version 0.1.3.
-
-* Sun Nov 20 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-2
- Build out of tree.
-
-* Sat Oct 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-1
- Update to version 0.1.2.
-
-* Fri Oct 07 2016 Neal Gompa <ngompa13@gmail.com> - 0.1.1-4
- Add patch to support AppStream 0.10.0 in F25 (LP#1626398)
-
-* Thu Sep 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-3
- Mass rebuild.
-
-* Wed Sep 28 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-2
- Spec file cleanups.
-
-* Tue Sep 27 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-1
- Update to version 0.1.1.
-
-* Sat Sep 17 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-2
- Require PackageKit.
-
-* Thu Aug 18 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-1
- Update to version 0.1.
-
@@ -1 +0,0 @@
-rpm.version(gh("elementary/appcenter"));
@@ -5,13 +5,15 @@

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

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

+Patch0:         https://patch-diff.githubusercontent.com/raw/elementary/calendar/pull/758.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -19,8 +21,6 @@ BuildRequires:  pkgconfig(champlain-0.12)
 BuildRequires:  pkgconfig(libecal-2.0)
 BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(libhandy-1)
-# BuildRequires:  pkgconfig(libportal)
-BuildRequires:  pkgconfig(libportal-gtk3)
 BuildRequires:  folks-devel
 BuildRequires:  libgee-devel
 BuildRequires:  pkgconfig(geocode-glib-2.0)
@@ -69,17 +69,20 @@ This package contains the development files.


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

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


 %files -f %{appname}.lang
 %doc README.md
 %license COPYING

-%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop

 %{_bindir}/%{appname}

@@ -89,7 +92,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{appnam
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml

 %files devel
 %{_includedir}/%{name}/
@@ -5,8 +5,8 @@

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

 URL:            https://github.com/elementary/%{srcname}
@@ -90,7 +90,6 @@ This package contains the development headers.
 %{_datadir}/gtksourceview-4/styles/elementary-light.xml
 %{_datadir}/metainfo/io.elementary.code.metainfo.xml
 %{_datadir}/polkit-1/actions/%{appname}.policy
-%{_mandir}/man1/%{appname}.1.gz

 %files devel
 %{_includedir}/codecore.h
@@ -5,7 +5,7 @@

 Name:           elementary-files
 Summary:        File manager from elementary
-Version:        6.5.2
+Version:        6.4.0
 Release:        1%{?dist}
 License:        GPL-3.0

@@ -3,13 +3,14 @@

 Name:           elementary-greeter
 Summary:        LightDM Login Screen for the elementary desktop
-Version:        7.0.0
-Release:        1%{?dist}
+Version:        6.1.1
+Release:        3%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/greeter
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        40-%{appname}.conf
+Patch0:         https://github.com/elementary/greeter/compare/93bbca3..1b3879d.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -68,7 +69,7 @@ The elementary Greeter is a styled Login Screen for LightDM.


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


 %build
@@ -89,7 +90,8 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/


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


 %files -f %{appname}.lang
@@ -103,7 +105,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{appnam
 %{_sbindir}/%{appname}

 %{_datadir}/xgreeters/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml
 %{_datadir}/lightdm/lightdm.conf.d/40-%appname.conf


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

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

 URL:            https://github.com/elementary/icons
@@ -72,7 +72,7 @@ touch %{buildroot}/%{_datadir}/icons/elementary/icon-theme.cache
 %check
 # ignore validation until appstream-glib knows the "icon-theme" component type
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml || :
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml || :


 %transfiletriggerin -- %{_datadir}/icons/elementary
@@ -96,7 +96,7 @@ gtk-update-icon-cache --force %{_datadir}/icons/elementary &>/dev/null || :
 %{_datadir}/icons/elementary/cursor.theme
 %{_datadir}/icons/elementary/index.theme

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

 %files gimp-palette
 %{_datadir}/gimp/2.0/palettes/elementary.gpl
@@ -3,7 +3,7 @@


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

@@ -42,10 +42,6 @@ Provides:      %{name} = %{version}-%{release}
 %meson_install


-%check
-appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/%appname.metainfo.xml
-
-
 %files
 %license LICENSE
 %doc README.md
@@ -56,7 +52,7 @@ appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/%appname.meta

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


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

 Name:           elementary-onboarding
 Summary:        Onboarding app for new users
-Version:        7.2.0
-Release:        1%{?dist}
+Version:        7.1.0
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

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

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

@@ -25,7 +25,6 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite) >= 5.3.0
 BuildRequires:  pkgconfig(libgeoclue-2.0)
 BuildRequires:  pkgconfig(systemd)
-BuildRequires:  pkgconfig(fwupd)

 Requires:       xdg-desktop-portal

@@ -48,27 +47,25 @@ Requires:       xdg-desktop-portal

 %check
 desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}.desktop
+    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}.desktop

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


 %post
 %systemd_user_post %{appname}.xdg-desktop-portal.service
-%systemd_post %{appname}.check-for-firmware-updates.timer


 %preun
 %systemd_user_preun %{appname}.xdg-desktop-portal.service
-%systemd_preun %{appname}.check-for-firmware-updates.timer


 %files
 %license LICENSE
 %doc README.md

-%config(noreplace) %{_datadir}/applications/%{appname}.desktop
+%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}.desktop

 %{_bindir}/%{appname}

@@ -78,16 +75,10 @@ appstream-util validate-relax --nonet \
 %{_datadir}/dbus-1/interfaces/%{iface}.xml
 %{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.elementary.settings-daemon.service
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml
 %{_datadir}/xdg-desktop-portal/portals/%{appname}.portal

 %{_userunitdir}/%{appname}.xdg-desktop-portal.service
-%{_unitdir}/%{appname}.check-for-firmware-updates.service
-%{_unitdir}/%{appname}.check-for-firmware-updates.timer
-
-%{_sysconfdir}/xdg/autostart/%appname.desktop
-
-%{_datadir}/icons/hicolor/*/apps/%{appname}.svg


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

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

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

 Name:           gala
 Summary:        Gala window manager
-Version:        7.1.2
+Version:        7.1.1
 Release:        1%{?dist}
 License:        GPL-3.0-or-later

@@ -9,7 +9,7 @@
 Name:           switchboard-plug-a11y
 Summary:        Switchboard Accessibility plug
 Version:        2.3.0
-Release:        1%{?dist}
+Release:        5%{?dist}
 License:        GPL-3.0-or-later

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

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

@@ -9,7 +9,7 @@
 Name:           switchboard-plug-bluetooth
 Summary:        Switchboard Bluetooth plug
 Version:        2.3.6
-Release:        1%{?dist}
+Release:        4%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-bluetooth
@@ -9,7 +9,7 @@
 Name:           switchboard-plug-datetime
 Summary:        Switchboard Date & Time Plug
 Version:        2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

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

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

 URL:            https://github.com/elementary/switchboard-plug-keyboard
@@ -59,7 +59,7 @@ same time. Keyboard shortcuts are also part of this plug.

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


 %files -f %{plug_name}-plug.lang
@@ -67,8 +67,8 @@ appstream-util validate-relax --nonet \
 %license COPYING

 %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
-%{_datadir}/glib-2.0/schemas/keyboard.gschema.xml
-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml


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

 Name:           switchboard-plug-pantheon-shell
 Summary:        Switchboard Pantheon Shell plug
-Version:        6.5.0
-Release:        1%{?dist}
+Version:        6.4.0
+Release:        2%{?dist}
 License:        GPL-3.0

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

 Name:           switchboard-plug-security-privacy
 Summary:        Switchboard Security & Privacy Plug
-Version:        7.1.0
-Release:        1%{?dist}
+Version:        7.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

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

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

 URL:            https://github.com/elementary/switchboard-plug-sound
@@ -27,7 +27,6 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libcanberra)
 BuildRequires:  pkgconfig(libcanberra-gtk)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libpulse-mainloop-glib)
 BuildRequires:  pkgconfig(switchboard-2.0)

@@ -53,11 +52,12 @@ A sound plug for Switchboard.
 %find_lang %{plug_name}-plug

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml


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


 %files -f %{plug_name}-plug.lang
@@ -66,7 +66,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{plug_r

 %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so

-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml


 %changelog
@@ -6,7 +6,7 @@
 %global plug_name wallet
 %global plug_rdnn io.elementary.switchboard.wallet

-%global commit 50582fc7ee43a4b47647d04786dcf1d0eb45af36
+%global commit bfe73dfb95d9b46a0a34e0db35a178233c8552b0

 Name:           switchboard-plug-wallet
 Summary:        Switchboard Wallet Plug
@@ -6,7 +6,7 @@
 Name:           wingpanel-indicator-datetime
 Summary:        Datetime Indicator for wingpanel
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-datetime
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-network
 Summary:        Network Indicator for wingpanel
-Version:        7.0.2
-Release:        1%{?dist}
+Version:        7.0.1
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-network
@@ -5,7 +5,7 @@

 Name:           wingpanel-indicator-notifications
 Summary:        Notifications Indicator for wingpanel
-Version:        7.1.0
+Version:        7.0.0
 Release:        1%{?dist}
 License:        LGPL-2.0-or-later

@@ -62,7 +62,6 @@ appstream-util validate-relax --nonet \
 %{_libdir}/wingpanel/libnotifications.so

 %{_datadir}/metainfo/%{appname}.metainfo.xml
-%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml


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

 Name:           wingpanel-indicator-power
 Summary:        Power indicator for wingpanel
-Version:        6.2.1
-Release:        1%{?dist}
+Version:        6.2.0
+Release:        2%?dist
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-power
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-sound
 Summary:        Sound Indicator for wingpanel
-Version:        7.0.0
-Release:        1%{?dist}
+Version:        6.0.2
+Release:        2%?dist
 License:        GPL-3.0

 URL:            https://github.com/elementary/%{name}
@@ -50,12 +50,12 @@ A sound indicator for wingpanel.
 %find_lang sound-indicator

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml


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


 %files -f sound-indicator.lang
@@ -65,7 +65,7 @@ appstream-util validate-relax --nonet \
 %{_libdir}/wingpanel/libsound.so

 %{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.sound.gschema.xml
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml


 %changelog
@@ -6,12 +6,13 @@ launcher.}

 Name:           wingpanel
 Summary:        Stylish top panel
-Version:        3.0.5
-Release:        1%{?dist}
+Version:        3.0.3
+Release:        %autorelease
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:         https://github.com/elementary/wingpanel/compare/f8b98a5..0cbf289.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name:			xdg-desktop-portal-pantheon
-Version:		7.1.1
+Version:		7.1.0
 Release:		1%{?dist}
 Summary:		Pantheon XDG Desktop Portals
 License:		GPL-3.0
@@ -1,12 +1,17 @@
+%global forgeurl https://invent.kde.org/system/liquidshell
+%global commit 9b14b9766f5d8db2b81c9bc7d4163dc07534402c
+%global scm git
+%forgemeta
+
 Name:		kde-liquidshell
-Version:	1.9.0
+Version:	1.8.1
 Release:	%autorelease
 Summary:	Basic desktop shell using QtWidgets
 Provides:	liquidshell = %version

 License:	GPL-3.0
-URL:		https://invent.kde.org/system/liquidshell
-Source0:	https://download.kde.org/stable/liquidshell/liquidshell-%version.tar.xz
+URL:		%{forgeurl}
+Source0:	%{forgeurl}/-/archive/%{commit}/liquidshell-%{commit}.tar.gz

 BuildRequires:	cmake
 BuildRequires:	libappstream-glib
@@ -44,7 +49,7 @@ Recommends:	polkit-kde
 liquidshell is a basic Desktop Shell implemented using QtWidgets.

 %prep
-%autosetup -n liquidshell-%version
+%autosetup -n liquidshell-%{commit}

 %build
 %cmake_kf5 -DWITH_PACKAGEKIT=true
@@ -64,7 +69,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 %{_datadir}/knotifications5/liquidshell.notifyrc
 %{_metainfodir}/org.kde.liquidshell.appdata.xml
 %{_datadir}/xsessions/liquidshell-session.desktop
-%{_datadir}/locale/*/LC_MESSAGES/liquidshell.mo

 %changelog
 %autochangelog
@@ -1,2 +0,0 @@
-let html = get("https://download.kde.org/stable/liquidshell/");
-rpm.version(find(`>liquidshell-([.\d]+)\.tar\.xz</a>`, html, 1));
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit bf320e2d15282a466f32396486c42dbb577d3905
+%global commit 67591cf616063838590eda9a19d27a66e3081677
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit ed5564cbba53d1c4a3acfb53024db3a912083f59
+%global commit ced1769bb4984465a51c2f45c2bee5c05fb52987
 %forgemeta

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

 License:       GPLv3 AND LGPLv3
@@ -87,7 +87,6 @@ Lomiri, Previously Unity8 is a convergent desktop environment built with Qt.

 %package tests
 Summary: Test files for %{name}
-Requires: dbus-test-runner
 Requires: %{name}%{?_isa} = %{version}-%{release}

 %description tests
@@ -95,10 +94,6 @@ The %{name}-tests package contains test files for %{name}.

 %prep
 %autosetup -n lomiri-%commit -p1
-# Ubuntu specific, may have to be updated every background image change on Gnome or Ubuntu
-for i in $(grep -rl warty-final-ubuntu); do
-sed -i 's!warty-final-ubuntu.png!f38/default/f38-01-day.png!' $i
-done

 %build
 %cmake -DWerror=OFF -DDEB_HOST_MULTIARCH=%{_arch} -DCMAKE_INSTALL_LOCALSTATEDIR="%{_localstatedir}" -DDISPLAYED_DISTRO_NAME="Fedora" -DUSE_MIROIL=1
@@ -135,8 +130,6 @@ install -Dm644 data/test.sensors %{buildroot}%{_sysconfdir}/lomirisensors
 %{_libdir}/lomiri/qml/LightDM/
 %{_libdir}/lomiri/qml/Lomiri/
 %{_libdir}/lomiri/qml/Powerd/
-%{_libdir}/lomiri/qml/ProcessControl/libProcessControl-qml.so
-%{_libdir}/lomiri/qml/ProcessControl/qmldir
 %{_libdir}/lomiri/qml/ScreenshotDirectory/
 %{_libdir}/lomiri/qml/SessionBroadcast/
 %{_libdir}/lomiri/qml/UInput/
@@ -148,7 +141,6 @@ install -Dm644 data/test.sensors %{buildroot}%{_sysconfdir}/lomirisensors
 %{_datadir}/accountsservice/interfaces/com.lomiri.shell.AccountsService.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/interfaces/com.lomiri.shell.AccountsService.xml
-%{_datadir}/dbus-1/interfaces/com.lomiri.ProcessControl.xml
 %{_datadir}/lightdm/greeters/lomiri-greeter.desktop
 %{_datadir}/lightdm/lightdm.conf.d/51-lomiri-greeter.conf
 %dir %{_datadir}/lomiri
@@ -170,7 +162,6 @@ install -Dm644 data/test.sensors %{buildroot}%{_sysconfdir}/lomirisensors
 %{_sharedstatedir}/lomiri/version
 %{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-com.lomiri.wizard.pkla

-
 %files tests
 %{_bindir}/lomiri-mock-indicator-service
 %{_libdir}/lomiri/qml/mocks/
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "mate-tweak.spec"
-	}
-}
@@ -1,47 +0,0 @@
-%define debug_package %nil
-
-Name:		mate-tweak
-Version:	22.10.0
-Release:	1%?dist
-Summary:	Tweak tool for the MATE Desktop
-License:	GPL-2.0
-URL:		https://github.com/ubuntu-mate/mate-tweak
-Source0:	%url/archive/refs/tags/%version.tar.gz
-Requires:	python3
-BuildRequires:	python3dist(setuptools) rpm_macro(py3_build) intltool desktop-file-utils
-
-%description
-This is MATE Tweak, a fork of mintDesktop.
-
-%prep
-%autosetup
-python3 -m ensurepip
-python3 -m pip install distutils-extra-python
-
-%build
-%py3_build
-
-%install
-%py3_install
-
-%check
-desktop-file-validate %buildroot%_datadir/applications/*.desktop
-
-%files
-%doc README.md
-%license COPYING
-%_bindir/%name
-%_bindir/marco-{compton,xrender,picom,glx,xr_glx_hybrid,no-composite}
-%_prefix/lib/%name/
-%_datadir/locale/*/LC_MESSAGES/%name.mo
-%_mandir/man1/marco-{glx,no-composite,xr_glx_hybrid,xrender}.1.gz
-%_mandir/man1/%name.1.gz
-%_datadir/applications/%name.desktop
-%_datadir/applications/marco-{glx,no-composite,xr_glx_hybrid,xrender}.desktop
-%_datadir/polkit-1/actions/org.mate.%name.policy
-%ghost %_prefix/lib/python3.11/site-packages/__pycache__
-%ghost %_prefix/lib/python3.11/site-packages/setup.py
-%ghost %_prefix/lib/python3.11/site-packages/mate_tweak-%version-py%python3_version.egg-info/
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("ubuntu-mate/mate-tweak"));
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "intellij-idea-community.spec"
+	}
+}
@@ -0,0 +1,12 @@
+diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt
+--- a/platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt	(revision 7e0cfee10427cc87a372ef23d6bf083cc35fdb5e)
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt	(date 1670176639293)
+@@ -24,7 +24,7 @@
+   /**
+    * If {@code true} a separate *-no-jbr.tar.gz artifact without runtime will be produced.
+    */
+-  var buildTarGzWithoutBundledRuntime = false
+  var buildTarGzWithoutBundledRuntime = true
+ 
+   /**
+    * If {@code true}, the only *-no-jbr.tar.gz will be produced, no other binaries for Linux will be built.
@@ -0,0 +1,90 @@
+Name:			intellij-idea-community
+Version:		231.9161.38
+Release:		1%?dist
+Summary:		IDE for Java/Groovy/etc. with advanced refactoring features
+License:		Apache-2.0
+URL:			https://jetbrains.com/idea
+Source0:		https://github.com/JetBrains/intellij-community/archive/refs/tags/idea/%version.tar.gz
+Source1:		https://github.com/JetBrains/android/archive/refs/tags/idea/%version.tar.gz
+Source2:		https://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar
+Patch0:			enable-no-jdr.patch
+Requires:		giflib java-latest-openjdk python3 bash libdbusmenu fontconfig hicolor-icon-theme
+BuildRequires:	ant git java-latest-openjdk-devel maven
+
+%description
+Intellij IDEA is an IDE for Java, Groovy and other programming languages with
+advanced refactoring features.
+
+%prep
+%autosetup -p1
+tar xf %SOURCE1
+
+cat<<EOF > idea.desktop
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=IntelliJ IDEA Community Edition
+Comment=Develop with pleasure!
+Exec=/usr/bin/idea %f
+Icon=idea
+Terminal=false
+StartupNotify=true
+StartupWMClass=jetbrains-idea-ce
+Categories=Development;IDE;Java;
+EOF
+
+
+cat<<EOF > idea.sh
+#!/bin/sh
+if [ -z "$IDEA_JDK" ] ; then
+	IDEA_JDK="/usr/lib/jvm/java-17-openjdk/"
+fi
+# open-jfx location that should match the JDK version
+if [ -z "$IDEA_JFX" ] ; then
+	IDEA_JFX="/usr/lib/jvm/java-17-openjfx/"
+fi
+# classpath according to defined JDK/JFX
+if [ -z "$IDEA_CLASSPATH" ] ; then
+IDEA_CLASSPATH="${IDEA_JDK}/lib/*:${IDEA_JFX}/lib/*"
+fi
+
+exec env IDEA_JDK="$IDEA_JDK" IDEA_CLASSPATH="$IDEA_CLASSPATH" %_datadir/idea/bin/idea.sh "$@"
+EOF
+
+
+%build
+export MAVEN_REPOSITORY=%HOME/.m2/repository
+mvn install:install-file -Dfile=%SOURCE2 -DgroupId=junit -DartifactId=junit -Dversion=3.8.1 -Dpackaging=jar -DgeneratePom=true
+
+export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
+export PATH="/usr/lib/jvm/java-17-openjdk/bin:$PATH"
+
+./installers.cmd -Dintellij.build.use.compiled.classes=false -Dintellij.build.target.os=linux
+
+tar xf out/idea-ce/artifacts/ideaIC-%version-no-jbr.tar.gz -C .
+
+
+%install
+cd idea-IC-%version
+install -dm755 %buildroot%_datadir/{pixmaps,idea,icons/hicolor/scalable/apps}
+cp -dr --no-preserve='ownership' bin lib plugins %buildroot%_datadir/idea/
+ln -s %_datadir/idea/bin/idea.png %buildroot%_datadir/pixmaps/
+ln -s %_datadir/idea/bin/idea.svg %buildroot%_datadir/icons/hicolor/scalable/apps/
+install -Dm644 ../idea.desktop -t %buildroot%_datadir/applications/
+install -Dm755 ../idea.sh %buildroot/%_bindir/idea
+chmod +x %buildroot/%_bindir/idea
+echo %version > build.txt
+install -Dm644 build.txt -t %buildroot%_datadir/idea
+
+
+%files
+%doc README.md docs/
+%license idea-IC-%version/license
+%_datadir/pixmaps/idea.png
+%_datadir/icons/hicolor/scalable/apps/idea.svg
+%_datadir/applications/idea.desktop
+%_bindir/idea
+%_datadir/idea/
+
+%changelog
+%autochangelog
@@ -0,0 +1,6 @@
+let ver = gh_tag("JetBrains/intellij-community");
+let ver2 = gh_tag("JetBrains/android");
+if ver.starts_with("idea/") && ver == ver2 {
+	ver.remove("idea/");
+	rpm.version(ver);
+}
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "intellij-idea-ultimate.spec"
+	}
+}
@@ -0,0 +1,89 @@
+%global buildver 231.9161.38
+%global jbr_ver 17.0.6
+%global jbr_build aarch64-b469
+%global jbr_minor 82
+
+Name:		intellij-idea-ultimate
+Version:	2023.1.3
+Release:	1%?dist
+Summary:	IDE for Java/Groovy/etc. with advanced refactoring features
+License:	Unlicense
+URL:		https://jetbrains.com/idea
+Source0:	https://download.jetbrains.com/idea/ideaIU-%version.tar.gz
+Requires:	giflib libXtst libXrender
+Suggests:	%name-jre
+Recommends:	libdbusmenu java-latest-openjdk
+
+
+%ifarch aarch64
+Source1:	https://cache-redirector.jetbrains.com/intellij-jbr/jbr-%jbr_ver-linux-%jbr_build.%jbr_minor.tar.gz
+Source2:	https://github.com/JetBrains/intellij-community/raw/master/bin/linux/aarch64/fsnotifier
+%endif
+
+
+%description
+Intellij IDEA is an IDE for Java, Groovy and other programming languages with
+advanced refactoring features.
+
+
+%package jre
+Summary:	IDE for Java/Groovy/etc. with advanced refactoring features
+
+%description jre
+Intellij IDEA is an IDE for Java, Groovy and other programming languages with
+advanced refactoring features.
+
+
+%prep
+%autosetup -n idea-IU-%buildver
+
+# https://youtrack.jetbrains.com/articles/IDEA-A-48/JetBrains-IDEs-on-AArch64#linux
+%ifarch aarch64
+	tar xf %SOURCE1
+	tar xf %SOURCE2
+	cp -f fsnotifier bin/fsnotifier
+	chmod +x bin/fsnotifier
+%endif
+
+
+cat<<EOF > jetbrains-idea.desktop
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Intelligent Java IDE
+Exec=intellij-idea-ultimate-edition %u
+Icon=intellij-idea-ultimate-edition
+Terminal=false
+StartupWMClass=jetbrains-idea
+Type=Application
+Categories=Development;IDE;
+EOF
+
+
+%build
+
+%install
+install -d %buildroot%_bindir %buildroot%_datadir/%name
+mv * %buildroot%_datadir/%name
+# https://youtrack.jetbrains.com/issue/IDEA-185828
+chmod +x %buildroot%_datadir/%name/plugins/maven/lib/maven3/bin/mvn
+ln -s %_datadir/%name/bin/idea.sh %buildroot%_bindir/%name
+mkdir -p %buildroot%_datadir/applications %buildroot%_datadir/pixmaps
+install -Dm644 jetbrains-idea.desktop %buildroot%_datadir/applications/jetbrains-idea.desktop
+install -Dm644 %buildroot%_datadir/%name/bin/idea.svg %buildroot%_datadir/pixmaps/%name.svg
+
+# workaround FS#40934
+sed -i 's|lcd|on|' %buildroot/%name/bin/*.vmoptions
+
+mv jbr %buildroot%_datadir/%name
+
+%files
+%_datadir/%name
+%_bindir/%name
+%_datadir/applications/jetbrains-idea.desktop
+%_datadir/pixmaps/%name.svg
+
+%files jre
+%buildroot%_datadir/%name/jbr
+
+%changelog
+%autochangelog
@@ -2,7 +2,7 @@
 %global         debug_package %{nil}

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

@@ -46,28 +46,28 @@ 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
+cv76 = 13   # 0 oval dashed forward slash
+cv79 = 2    # 3 arched
+cv81 = 2    # 5 open contour
+cv83 = 1    # 7 straight
+cv84 = 3    # 8 two asymmetric circles
+cv88 = 2    # ~ tilde low
+cv89 = 2    # * asterisk five-pointed low
+cv90 = 1    # _ underscore right below baseline
+cv91 = 1    # ^ uptick high
+cv92 = 1    # ( parentheses normal slope
+cv93 = 2    # { braces curly
+cv94 = 1    # # column straight
+cv96 = 4    # @ three-fold, tall height
+cv97 = 2    # $ dollar strike through
+VXSE = 2    # ¢ cent strike through
+cv98 = 1    # % percent dots
+cv99 = 1    # | bar natural slope
+VXSA = 1    # ' single quote straight
+VXSB = 1    # ` grave/backtick straight
+VXSC = 1    # ? smooth
+cv87 = 2    # .:; square punctuation marks
+cv86 = 2    # ijäöü square diacretics

 [buildPlans.iosevka-fusion.variants.upright]
 cv26 = 3    # a double storey rounded
@@ -86,12 +86,12 @@ 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)
+cv72 = 3    # 1 serified with base
+cv73 = 1    # 2 straight
+cv75 = 3    # 4 semi-open contour
+cv77 = 3    # 6 straight
+cv80 = 3    # 9 straight
+cv89 = 2    # & et open top (ampersand)

 [buildPlans.iosevka-fusion.variants.italic]
 cv26 = 1    # a double storey straight
@@ -110,12 +110,12 @@ 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)
+cv72 = 2    # 1 serified no base
+cv73 = 2    # 2 curly
+cv75 = 1    # 4 closed contour crossing
+cv77 = 1    # 6 closed contour
+cv80 = 1    # 9 closed contour
+cv89 = 4    # & et open top toothed (ampersand)

 [buildPlans.iosevka-fusion.weights.thin]
 shape = 100
@@ -1,6 +1,6 @@
 let readme = get("https://raw.githubusercontent.com/sharanda/manrope/master/README.md");
 let ver = find("## Changelog\n- v (.+?) \\/", readme, 1);
-if ver != find("Version:\\s*([\\d.]+)\n", rpm.f, 1) {
+if ver != find("Version:\\s*([\\d.]+)\n" rpm.f, 1) {
 	let req = new_req("https://api.github.com/repos/sharanda/manrope/commits/HEAD");
 	let sha = req.get().json().sha;
 	rpm.global("commit", sha);
@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	0.42.1
+Version:	0.41.3
 Release:	1%{?dist}
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/sarasa-gothic-ttc-%version.7z
@@ -1,8 +1,8 @@
-%define osuresver 2023.1014.0
+%define osuresver 2023.707.0
 %global debug_package %{nil}

 Name:			osu-lazer
-Version:		2023.1008.1
+Version:		2023.621.0
 Release:		1%{?dist}
 Summary:		The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
 ExclusiveArch:	x86_64
@@ -1,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,11 +1,10 @@
 %global real_name prismlauncher
-%global nice_name PrismLauncher

-%global commit 7015b8f7b256588fe46476f77433e27ca4097bd5
+%global commit 12cd8a7bea991c2a8d4b59b1cfc9f7c246819fc9
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
+%global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f
 %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
-%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
+%global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38

 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -25,14 +24,26 @@
 %global min_qt_version 5.12
 %endif

-%global build_platform terra
+%global build_platform unknown
+
+%if 0%{?fedora}
+%global build_platform Fedora
+%endif
+
+%if 0%{?rhel}
+%global build_platform RedHat
+%endif
+
+%if 0%{?centos}
+%global build_platform CentOS
+%endif

 %if %{with qt6}
 Name:             prismlauncher-nightly
 %else
 Name:             prismlauncher-qt5-nightly
 %endif
-Version:          8.0^%{snapshot_info}
+Version:          7.1^%{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
@@ -42,7 +53,6 @@ Source0:          https://github.com/PrismLauncher/PrismLauncher/archive/%{commi
 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
@@ -64,9 +74,6 @@ BuildRequires:    cmake(Qt6Core5Compat)
 %endif

 BuildRequires:    pkgconfig(libcmark)
-%if 0%{fedora} < 38
-BuildRequires:    cmark
-%endif
 BuildRequires:    pkgconfig(scdoc)
 BuildRequires:    pkgconfig(zlib)

@@ -86,6 +93,8 @@ Recommends:       flite
 # Prism supports enabling gamemode
 Suggests:         gamemode

+Recommends:       terra-fractureiser-detector
+
 Conflicts:        %{real_name}
 Conflicts:        %{real_name}-qt5
 %if %{without qt6}
@@ -136,31 +145,27 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %check
 %ctest

+appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
+

 %files
 %doc README.md
 %license LICENSE COPYING.md
-%dir %{_datadir}/%{nice_name}
+%dir %{_datadir}/%{real_name}
 %{_bindir}/%{real_name}
-%{_datadir}/%{nice_name}/NewLaunch.jar
-%{_datadir}/%{nice_name}/JavaCheck.jar
-%{_datadir}/%{nice_name}/qtlogging.ini
+%{_datadir}/%{real_name}/NewLaunch.jar
+%{_datadir}/%{real_name}/JavaCheck.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}/PrismLauncher/qtlogging.ini
 %{_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

@@ -4,8 +4,5 @@ if filters.contains("nightly") {
 	let sha = req.get().json().sha;
 	rpm.global("commit", sha);
 	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.version(`${maj}.${min}^%{snapshot_info}`);
+	rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`);
 }
@@ -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,11 +1,10 @@
 %global real_name prismlauncher
-%global nice_name PrismLauncher

-%global commit 7015b8f7b256588fe46476f77433e27ca4097bd5
+%global commit 12cd8a7bea991c2a8d4b59b1cfc9f7c246819fc9
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
+%global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f
 %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
-%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
+%global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38

 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -25,14 +24,26 @@
 %global min_qt_version 5.12
 %endif

-%global build_platform terra
+%global build_platform unknown
+
+%if 0%{?fedora}
+%global build_platform Fedora
+%endif
+
+%if 0%{?rhel}
+%global build_platform RedHat
+%endif
+
+%if 0%{?centos}
+%global build_platform CentOS
+%endif

 %if %{with qt6}
 Name:             prismlauncher-nightly
 %else
 Name:             prismlauncher-qt5-nightly
 %endif
-Version:          8.0^%{snapshot_info}
+Version:          7.1^%{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
@@ -42,7 +53,6 @@ Source0:          https://github.com/PrismLauncher/PrismLauncher/archive/%{commi
 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
@@ -64,9 +74,6 @@ BuildRequires:    cmake(Qt6Core5Compat)
 %endif

 BuildRequires:    pkgconfig(libcmark)
-%if 0%{fedora} < 38
-BuildRequires:    cmark
-%endif
 BuildRequires:    pkgconfig(scdoc)
 BuildRequires:    pkgconfig(zlib)

@@ -83,6 +90,8 @@ Requires:         java-1.8.0-openjdk
 Recommends:       xrandr
 # libflite needed for using narrator in minecraft
 Recommends:       flite
+
+Recommends:       terra-fractureiser-detector
 # Prism supports enabling gamemode
 Suggests:         gamemode

@@ -136,31 +145,27 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %check
 %ctest

+appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
+

 %files
 %doc README.md
 %license LICENSE COPYING.md
-%dir %{_datadir}/%{nice_name}
+%dir %{_datadir}/%{real_name}
 %{_bindir}/%{real_name}
-%{_datadir}/%{nice_name}/NewLaunch.jar
-%{_datadir}/%{nice_name}/JavaCheck.jar
-%{_datadir}/%{nice_name}/qtlogging.ini
+%{_datadir}/%{real_name}/NewLaunch.jar
+%{_datadir}/%{real_name}/JavaCheck.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}/PrismLauncher/qtlogging.ini
 %{_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

@@ -4,8 +4,5 @@ if filters.contains("nightly") {
 	let sha = req.get().json().sha;
 	rpm.global("commit", sha);
 	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.version(`${maj}.${min}^%{snapshot_info}`);
+	rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`);
 }
@@ -1,5 +1,4 @@
 %global real_name prismlauncher
-%global nice_name PrismLauncher
 %bcond_with qt6

 # Change this variables if you want to use custom keys
@@ -15,15 +14,27 @@
 %global min_qt_version 5.12
 %endif

-%global build_platform terra
+%global build_platform unknown
+
+%if 0%{?fedora}
+%global build_platform Fedora
+%endif
+
+%if 0%{?rhel}
+%global build_platform RedHat
+%endif
+
+%if 0%{?centos}
+%global build_platform CentOS
+%endif

 %if %{with qt6}
 Name:             prismlauncher
 %else
 Name:             prismlauncher-qt5
 %endif
-Version:          7.2
-Release:          2%{?dist}
+Version:          7.1
+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
@@ -69,6 +80,7 @@ Recommends:       xrandr
 # libflite needed for using narrator in minecraft
 Recommends:       flite

+Recommends:       terra-fractureiser-detector
 # Prism supports enabling gamemode
 Suggests:         gamemode

@@ -112,27 +124,27 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %check
 %ctest

+appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
+

 %files
 %doc README.md
 %license LICENSE COPYING.md
-%dir %{_datadir}/%{nice_name}
+%dir %{_datadir}/%{real_name}
 %{_bindir}/prismlauncher
-%{_datadir}/%{nice_name}/NewLaunch.jar
-%{_datadir}/%{nice_name}/JavaCheck.jar
-%{_datadir}/%{nice_name}/qtlogging.ini
+%{_datadir}/%{real_name}/NewLaunch.jar
+%{_datadir}/%{real_name}/JavaCheck.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
+%{_datadir}/PrismLauncher/qtlogging.ini
 %{_mandir}/man?/prismlauncher.*
 %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml


 %changelog
-* 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

@@ -1,5 +1,4 @@
 %global real_name prismlauncher
-%global nice_name PrismLauncher
 %bcond_without qt6

 # Change this variables if you want to use custom keys
@@ -15,15 +14,27 @@
 %global min_qt_version 5.12
 %endif

-%global build_platform terra
+%global build_platform unknown
+
+%if 0%{?fedora}
+%global build_platform Fedora
+%endif
+
+%if 0%{?rhel}
+%global build_platform RedHat
+%endif
+
+%if 0%{?centos}
+%global build_platform CentOS
+%endif

 %if %{with qt6}
 Name:             prismlauncher
 %else
 Name:             prismlauncher-qt5
 %endif
-Version:          7.2
-Release:          2%{?dist}
+Version:          7.1
+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
@@ -69,6 +80,7 @@ Recommends:       xrandr
 # libflite needed for using narrator in minecraft
 Recommends:       flite

+Recommends:       terra-fractureiser-detector
 # Prism supports enabling gamemode
 Suggests:         gamemode

@@ -112,27 +124,27 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 %check
 %ctest

+appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
+

 %files
 %doc README.md
 %license LICENSE COPYING.md
-%dir %{_datadir}/%{nice_name}
+%dir %{_datadir}/%{real_name}
 %{_bindir}/prismlauncher
-%{_datadir}/%{nice_name}/NewLaunch.jar
-%{_datadir}/%{nice_name}/JavaCheck.jar
-%{_datadir}/%{nice_name}/qtlogging.ini
+%{_datadir}/%{real_name}/NewLaunch.jar
+%{_datadir}/%{real_name}/JavaCheck.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
+%{_datadir}/PrismLauncher/qtlogging.ini
 %{_mandir}/man?/prismlauncher.*
 %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml


 %changelog
-* 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

@@ -4,7 +4,7 @@

 # https://github.com/xyproto/env
 %global goipath         github.com/xyproto/env
-Version:                2.2.4
+Version:                2.0.0

 %gometa -f

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

 # https://github.com/xyproto/textoutput
 %global goipath         github.com/xyproto/textoutput
-Version:                1.15.10
+Version:                1.14.2

 %gometa -f

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

 # https://github.com/xyproto/vt100
 %global goipath         github.com/xyproto/vt100
-Version:                1.12.7
+Version:                1.11.5

 %gometa -f

@@ -1,5 +1,5 @@
 Name:		groovy-docs
-Version:	4.0.15
+Version:	4.0.13
 Release:	1%{?dist}
 Summary:	Documentation for the Groovy programming language
 URL:		https://groovy-lang.org/
@@ -1,2 +1,4 @@
-let html = get("https://groovy.apache.org/download.html");
-rpm.version(find(`onclick='window\.location\.href="https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/apache-groovy-sdk-([\d.]+)\.zip"'>`, html, 1));
+let ver = gh_tag("apache/groovy");
+ver.replace("GROOVY_", "");
+ver.replace("_", ".");
+rpm.version(ver);
@@ -1,5 +1,5 @@
 Name:			groovy
-Version:		4.0.15
+Version:		4.0.13
 Release:		1%{?dist}
 Summary:		A multi-faceted language for the Java platform
 BuildArch:		noarch
@@ -1,2 +1,4 @@
-let html = get("https://groovy.apache.org/download.html");
-rpm.version(find(`onclick='window\.location\.href="https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/apache-groovy-sdk-([\d.]+)\.zip"'>`, html, 1));
+let ver = gh_tag("apache/groovy");
+ver.replace("GROOVY_", "");
+ver.replace("_", ".");
+rpm.version(ver);
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-notifications
 Summary:    Ayatana Indicator Notifications Applet
-Version:    23.10.0
-Release:    1%{?dist}
+Version:    22.9.0
+Release:    %autorelease
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-notifications
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-session
 Summary:    Ayatana Indicator Session Applet
-Version:    23.10.0
+Version:    22.9.2
 Release:    1%{?dist}
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-session
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-sound
 Summary:    Ayatana Indicator Sound Applet
-Version:    23.10.0
-Release:    1%{?dist}
+Version:    22.9.2
+Release:    %autorelease
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-sound
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -2,7 +2,7 @@

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Name:           kotlin-native
-Version:        1.9.10
+Version:        1.9.0
 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.10
+Version:        1.9.0
 Release:        1%{?dist}
 Summary:        Statically typed programming language

@@ -3,7 +3,7 @@
 %bcond_with tests

 Name:           apparmor
-Version:        4.0.0
+Version:        3.1.6
 Release:        1%{?dist}
 Summary:        AppArmor userspace components

@@ -11,7 +11,7 @@ Summary:        AppArmor userspace components

 License:        GPL-2.0
 URL:            https://launchpad.net/apparmor
-Source0:        %{url}/%{baseversion}/%{version}-alpha2/+download/%{name}-%{version}~alpha2.tar.gz
+Source0:        %{url}/%{baseversion}/%{version}/+download/%{name}-%{version}.tar.gz
 Source1:        apparmor.preset
 Patch01:        0001-fix-avahi-daemon-authselect-denial-in-fedora.patch
 Patch02:        0001-All-current-versions-of-RHEL-and-Fedora-that-are-not.patch
@@ -138,7 +138,7 @@ confinement policies when running virtual hosts in the webserver by using the
 changehat abilities exposed through libapparmor.

 %prep
-%autosetup -p1 -n %{name}-%{version}~alpha2
+%autosetup -p1

 %build
 export PYTHON=%{__python3}
@@ -231,7 +231,6 @@ make -C utils check
 %dir %{_sysconfdir}/apparmor.d/
 %dir %{_sysconfdir}/apparmor.d/abi
 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/3.0
-%config(noreplace) %{_sysconfdir}/apparmor.d/abi/4.0
 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-outoftree-network
 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-vanilla
 %config(noreplace) %{_sysconfdir}/apparmor.d/php-fpm
@@ -268,7 +267,6 @@ make -C utils check
 %{_bindir}/aa-enabled
 %{_bindir}/aa-exec
 %{_bindir}/aa-features-abi
-%{_sbindir}/aa-load
 %{_sbindir}/aa-teardown
 %{_sbindir}/rcapparmor
 %{_unitdir}/apparmor.service
@@ -1,7 +1,7 @@
 %global debug_package %{nil}

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

@@ -1 +1 @@
-rpm.version(gh_tag("vietjtnguyen/argagg"));
+rpm.version(gh("vietjtnguyen/argagg"));
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "args-hxx.spec"
-	}
-}
@@ -1,53 +0,0 @@
-%define debug_package %nil
-
-Name:		args-hxx
-Version:	6.4.6
-Release:	1%?dist
-Summary:	A simple header-only C++ argument parser library
-License:	MIT
-URL:		https://github.com/Taywee/args
-Source0:	%url/archive/refs/tags/%version.tar.gz
-BuildRequires:	make doxygen gcc-c++ cmake
-
-%description
-A simple header-only C++ argument parser library. Supposed to be flexible and
-powerful, and attempts to be compatible with the functionality of the Python
-standard argparse library (though not necessarily the API).
-
-
-%package doc
-Summary:	Documentations for args-hxx
-
-%description doc
-%summary.
-
-
-%prep
-%autosetup -n args-%version
-
-%build
-%cmake
-%cmake_build
-make doc/man
-
-%install
-%cmake_install
-make installman DESTDIR=%buildroot%_prefix
-
-%files
-%_includedir/args.hxx
-/usr/lib/cmake/args/args-config-version.cmake
-/usr/lib/cmake/args/args-config.cmake
-%_libdir/pkgconfig/args.pc
-
-%files doc
-%_mandir/man3/args*
-%_mandir/man3/DoublesReader.3.gz
-%_mandir/man3/StringAssignable.3.gz
-%_mandir/man3/ToLowerReader.3.gz
-%_mandir/man3/conanfile_ArgsConan.3.gz
-%_mandir/man3/md_CONTRIBUTING.3.gz
-
-
-%changelog
-%autochangelog
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
madonuko	43c82bcee7	?	2025-12-23 19:03:15 +08:00
madomado	db9b19680f	Update intellij-ultimate-idea.spec Signed-off-by: madomado <wboy111@outlook.com>	2023-07-09 15:16:09 +08:00
madomado	527810c78f	Update intellij-ultimate-idea.spec Signed-off-by: madomado <wboy111@outlook.com>	2023-07-09 00:02:22 +08:00
madomado	c93f2b1ab2	Update intellij-ultimate-idea.spec Signed-off-by: madomado <wboy111@outlook.com>	2023-07-08 23:31:05 +08:00
madomado	96ab848b18	Update intellij-ultimate-idea.spec Signed-off-by: madomado <wboy111@outlook.com>	2023-07-08 22:44:33 +08:00
madomado	fd2612a0ca	Update intellij-ultimate-idea.spec Signed-off-by: madomado <wboy111@outlook.com>	2023-07-08 22:34:41 +08:00
madomado	7b0dcab59d	Update intellij-community-idea.spec Signed-off-by: madomado <wboy111@outlook.com>	2023-07-08 22:33:52 +08:00
madomado	537dbf0725	Merge branch 'f38' into w/idea	2023-07-08 21:58:13 +08:00
madomado	bc17a13461	Merge branch 'f38' into w/idea	2023-06-25 09:50:03 +08:00
windowsboy111	b1717aab74	test this	2023-06-22 19:00:57 +08:00
windowsboy111	6cd8535f0d	add: intellij-ultimate-idea	2023-06-22 18:49:36 +08:00
windowsboy111	42c1f68639	add: intellij-community-idea	2023-06-22 18:20:40 +08:00