add: stardust gravity (#2063 ) (#2106 )

* initial package for stardust-server * add missing build deps * move to stardust folder * inisital package for stardust-black-hole * RPM bug workaround stardust-black-hole.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Remove conflicts Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update anda/stardust/black-hole/update.rhai Co-authored-by: madomado <madonuko@outlook.com> Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update anda/stardust/black-hole/stardust-black-hole.spec Co-authored-by: madomado <madonuko@outlook.com> Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update anda/stardust/black-hole/stardust-black-hole.spec Co-authored-by: madomado <madonuko@outlook.com> Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update anda/stardust/black-hole/stardust-black-hole.spec Co-authored-by: madomado <madonuko@outlook.com> Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-black-hole.spec Add packager Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update anda.hcl Fix name Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-black-hole.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update update.rhai Fix name Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-black-hole.spec fix deps Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-black-hole.spec Fix files Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update update.rhai Remove if statement from Rhai Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update anda/stardust/black-hole/update.rhai Co-authored-by: madomado <madonuko@outlook.com> Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * fix directories issue * actually fix directories error * Initial package for stardust-atmosphere * WIP * initial package for stardust-gravity * Update stardust-gravity.spec Lock cargo install Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-gravity.spec Unify summaries Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --------- Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Co-authored-by: june-fish <git@june.fish> Co-authored-by: madomado <madonuko@outlook.com> (cherry picked from commit 937591bf10) Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
add: stardust-flatland (#2049 ) (#2098 )
2026-05-31 09:01:55 +00:00 · 2024-09-19 22:50:16 +08:00 · 2024-09-19 22:42:50 +08:00 · 2024-09-19 22:42:45 +08:00 · 2024-09-19 22:42:38 +08:00 · 2024-09-19 22:42:34 +08:00
464 changed files with 4603 additions and 14998 deletions
@@ -5,5 +5,6 @@ RUN useradd -m vscode
 RUN groupadd mock
 RUN usermod -aG mock vscode
 RUN echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode
-RUN curl -Lo /etc/yum.repos.d/terra.repo https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra.repo
-RUN dnf -y install git mock createrepo_c anda terra-mock-configs
+RUN dnf -y install git 'dnf-command(config-manager)' mock createrepo_c
+RUN dnf config-manager --add-repo='https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra.repo'
+RUN dnf -y install anda terra-mock-configs
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - el9
  pull_request:
    branches:
-      - frawhide
+      - el9
  merge_group:
    branches:
-      - frawhide
+      - el9
  workflow_dispatch:
  workflow_call:

@@ -23,7 +23,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:el9
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,11 +40,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["9"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:el${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -52,27 +52,27 @@ jobs:
        with:
          fetch-depth: 0

+      - name: Checkout latest Mock configs
+        uses: actions/checkout@v4
+        with:
+          repository: terrapkg/mock-configs
+          path: mock-configs
+
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: CI Setup Script
+      - name: Include custom build template instead of package default
        run: |
-          dir=$(dirname ${{ matrix.pkg.pkg }})
-          if [ -f $dir/ci_setup.rhai ]; then
-            anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai
-          fi
-
-      - name: Install Build Dependencies
-        run: |
-          dir=$(dirname ${{ matrix.pkg.pkg }})
-          dnf5 builddep -y ${dir}/*.spec
+          cp -v mock-configs/el9.tpl /etc/mock/templates/
+          cp -v mock-configs/epel9.tpl /etc/mock/templates/

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

      - name: Build with Andaman (alternate arch)
-        if: matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib']
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c terra-${{ matrix.version }}-i386
+        if: |
+          matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib']
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-i386.cfg

      - name: Generating artifact name
        id: art
@@ -95,7 +95,7 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/*
+            terra-el${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
        if: github.event_name == 'push'
@@ -103,7 +103,7 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/*
+            terra-el${{ matrix.version }}-source anda-build/rpm/srpm/*

      - name: Notify Madoguchi (Success)
        if: success() && github.event_name == 'push'
@@ -7,52 +7,65 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["9"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
+      image: docker.io/library/almalinux:${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: el${{ matrix.version }}
+          fetch-depth: 1
+
      - name: Install repositories
        run: |
-          dnf5 install -y --setopt=install_weak_deps=False curl wget git-core openssl-devel cargo podman fuse-overlayfs
-          dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/tools/buildsys/{anda,subatomic}/*.spec
+          dnf install -y 'dnf-command(config-manager)'
+          dnf config-manager --set-enabled crb
+          dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${{ matrix.version }}.noarch.rpm
+          dnf install -y mock wget git-core openssl-devel cargo podman fuse-overlayfs rpm-build mock
+          dnf builddep -y anda/{terra/{mock-configs,srpm-macros},tools/buildsys/subatomic}/*.spec
+
+      - name: Vendor Go
+        run: |
+          rm /usr/bin/go
+          curl -L https://go.dev/dl/go1.22.6.linux-${{ matrix.arch == 'aarch64' && 'arm64' || 'amd64' }}.tar.gz -o go.tar.gz
+          tar xf go.tar.gz go/bin/go
+          cp go/bin/go /usr/local/bin/

      - name: Install Anda
        run: cargo install anda

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

      - name: Build anda-srpm-macros
-        run: anda build -rrpmbuild anda/terra/srpm-macros/pkg
+        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.arch }}.cfg anda/terra/srpm-macros/pkg --rpm-builder=rpmbuild

      - name: Build Subatomic
-        run: anda build -rrpmbuild anda/tools/buildsys/subatomic/pkg
+        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.arch }}.cfg anda/tools/buildsys/subatomic/pkg --rpm-builder=rpmbuild
      - name: Install Subatomic
-        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+        run: dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm

+      - name: Install Build Dependencies for Andaman
+        run: dnf builddep -y anda/tools/buildsys/anda/*.spec
      - name: Build Andaman
-        run: anda build -rrpmbuild anda/tools/buildsys/anda/pkg
+        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.arch }} anda/tools/buildsys/anda/pkg --rpm-builder=rpmbuild

      - name: Upload packages to subatomic
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
+            terra-el${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
        if: github.event_name == 'push'
@@ -60,4 +73,4 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+            terra-el${{ matrix.version }}-source anda-build/rpm/srpm/*
@@ -44,12 +44,12 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["9"]
        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:el${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -57,18 +57,22 @@ jobs:
        with:
          fetch-depth: 0

+      - name: Checkout latest Mock configs
+        uses: actions/checkout@v4
+        with:
+          repository: terrapkg/mock-configs
+          path: mock-configs
+
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: CI Setup Script
+      - name: Include custom build template instead of package default
        run: |
-          dir=${{ matrix.pkg }}
-          if [ -f $dir/ci_setup.rhai ]; then
-            anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai
-          fi
+          cp -v mock-configs/el9.tpl /etc/mock/templates/
+          cp -v mock-configs/epel9.tpl /etc/mock/templates/

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

      - name: Generating artifact name
        id: art
@@ -76,7 +80,6 @@ jobs:
          NAME=${{ matrix.pkg }}-${{ matrix.arch }}-${{ matrix.version }}
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT
-          echo "labels=$(anda run andax/get_proj_label.rhai -l project=anda/${{ matrix.pkg }}anda.hcl)" >> $GITHUB_OUTPUT

      - uses: actions/upload-artifact@v4
        with:
@@ -91,14 +94,14 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ fromJson(steps.art.outputs.labels)['extra'] && '-extras' }} anda-build/rpm/rpms/*
+            terra-el${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ fromJson(steps.art.outputs.labels)['extra'] && '-extras' }}-source anda-build/rpm/srpm/*
+            terra-el${{ matrix.version }}-source anda-build/rpm/srpm/*

      - name: Notify Madoguchi (Success)
        if: success()
@@ -11,11 +11,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["9"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:el${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -23,23 +23,22 @@ jobs:
        with:
          fetch-depth: 0

+      - name: Checkout latest Mock configs
+        uses: actions/checkout@v4
+        with:
+          repository: terrapkg/mock-configs
+          path: mock-configs
+
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: CI Setup Script
+      - name: Include custom build template instead of package default
        run: |
-          dir=$(dirname ${{ matrix.pkg.pkg }})
-          if [ -f $dir/ci_setup.rhai ]; then
-            anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai
-          fi
-
-      - name: Install Build Dependencies
-        run: |
-          dir=$(dirname ${{ matrix.pkg.pkg }})
-          dnf5 builddep -y ${dir}/*.spec
+          cp -v mock-configs/el9.tpl /etc/mock/templates/
+          cp -v mock-configs/epel9.tpl /etc/mock/templates/

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

      - name: Generating artifact name
        id: art
@@ -61,14 +60,15 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/*
+            terra-el${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
+        if: github.event_name == 'push'
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/*
+            terra-el${{ matrix.version }}-source anda-build/rpm/srpm/*

      - name: Notify Madoguchi (Success)
        if: success()
@@ -0,0 +1,22 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - frawhide
+  pull_request:
+    branches:
+      - frawhide
+  merge_group:
+    branches:
+      - frawhide
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/terrapkg/builder:frawhide
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Lint spec files
+        run: rpmlint $(find anda -type f -name "*.spec" -type f)
@@ -7,7 +7,7 @@ export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":
 if [[ $1 == false ]]; then
 	d=${p/\%v/?}
 	d=${d/\%r/?}
-	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra-el$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
 	exit 0
 fi

@@ -17,5 +17,5 @@ for f in anda-build/rpm/rpms/*; do
 	r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@")
 	d=${p/\%v/$v}
 	d=${d/\%r/$r}
-	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terra-el$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
 done
@@ -1,54 +0,0 @@
-name: Update per branch
-on:
-  schedule:
-    - cron: "*/30 * * * *"
-  workflow_dispatch:
-
-jobs:
-  autoupdate:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        branch:
-          - frawhide
-          - f40
-          - f41
-          - el10
-    container:
-      image: ghcr.io/terrapkg/builder:frawhide
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ matrix.branch }}
-          fetch-depth: 0
-          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
-
-      - name: Install SSH signing key & Set up git repository
-        run: |
-          mkdir -p ${{ runner.temp }}
-          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
-          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-
-      - name: Run Update
-        run: |
-          nbranch="${{ matrix.branch }}"
-          [ "$nbranch" = 'frawhide' ] && nbranch='f42'
-          anda update --filters updbranch=1 --labels branch=${{ matrix.branch }},nbranch=$nbranch
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RUST_BACKTRACE: full
-
-      - name: Save
-        run: |
-          if [[ `git status --porcelain` ]]; then
-            git config user.name "Raboneko"
-            git config user.email "raboneko@fyralabs.com"
-            git config gpg.format "ssh"
-            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump(branch): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
-            git commit -S -a -m "$msg"
-            git push -u origin --all
-          fi
@@ -3,10 +3,7 @@ name: Push comps updates
 on:
  push:
    branches:
-      - frawhide
-      - f41
-      - f40
-      - el10
+      - el9
    paths:
      - comps.xml
  workflow_dispatch:
@@ -21,8 +18,7 @@ jobs:
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
-          ver=${branch/f/}
          subatomic-cli upload-comps \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            "terra${ver}" comps.xml
+            "terra-${branch}" comps.xml
@@ -25,10 +25,9 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Nightly Update
-        run: anda update --filters nightly=1
+        run: anda update -vv --filters nightly=1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RUST_BACKTRACE: full

      - name: Save
        run: |
@@ -39,15 +38,16 @@ 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"
-            git format-patch HEAD^
            copy_over () {
+              git format-patch HEAD^
              git checkout $1
              git apply *.patch || true
-              git add anda
+              rm *.patch
+              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f39 || true
            copy_over f40 || true
            copy_over f41 || true
-            copy_over el10 || true
            git push -u origin --all
          fi
@@ -1,53 +0,0 @@
-name: Weekly Update
-on:
-  schedule:
-    - cron: "0 0 * * 0"
-  workflow_dispatch:
-
-jobs:
-  autoupdate:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/terrapkg/builder:frawhide
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
-
-      - name: Install SSH signing key & Set up git repository
-        run: |
-          mkdir -p ${{ runner.temp }}
-          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
-          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-
-      - name: Run Weekly Update
-        run: anda update --filters weekly=1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RUST_BACKTRACE: full
-
-      - name: Save
-        run: |
-          if [[ `git status --porcelain` ]]; then
-            git config user.name "Raboneko"
-            git config user.email "raboneko@fyralabs.com"
-            git config gpg.format "ssh"
-            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump(weekly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
-            git commit -S -a -m "$msg"
-            git format-patch HEAD^
-            copy_over () {
-              git checkout $1
-              git apply *.patch || true
-              git add anda
-              git commit -S -a -m "$msg"
-            }
-            copy_over f40 || true
-            copy_over f41 || true
-            copy_over el10 || true
-            git push -u origin --all
-          fi
@@ -25,7 +25,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: anda update --excludes nightly=1 --excludes weekly=1 --excludes updbranch=1
+        run: anda update -vv --filters nightly=0
        env:
          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full
@@ -39,15 +39,16 @@ 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"
-            git format-patch HEAD^
            copy_over () {
+              git format-patch HEAD^
              git checkout $1
              git apply *.patch || true
-              git add anda
+              rm *.patch
+              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f39 || true
            copy_over f40 || true
            copy_over f41 || true
-            copy_over el10 || true
            git push -u origin --all
          fi
@@ -1 +0,0 @@
-https://fyralabs.com/funding.json
@@ -1,7 +1,9 @@
 # Contributing

-First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please [join our chats](https://wiki.ultramarine-linux.org/en/community/community/).
+First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q).

- [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
- [FAQ](https://developer.fyralabs.com/terra/faq)
- [Policy](https://developer.fyralabs.com/terra/policy)
+## Documentations
+
+* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
+* [FAQ](https://developer.fyralabs.com/terra/faq)
+* [Policy](https://developer.fyralabs.com/terra/policy)
@@ -1,37 +1,22 @@
 # Terra Sources

+[![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39)
 [![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40)
-[![Repository status](https://repology.org/badge/repository-big/terra_41.svg?header=Terra+41)](https://repology.org/repository/terra_41)
 [![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)

 Terra is a rolling-release Fedora repository for all the software you need.
 With Terra, you can install the latest packages knowing that quality and security are assured.

-See the introduction at [our website](https://terra.fyralabs.com).
-
 This monorepo contains the package manifests for all packages in Terra.

 ## Installation
-
 ```bash
-sudo dnf install --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' terra-release
-```
-
-If you are using immutable/atomic editions of Fedora, run the following commands instead:
-
-```bash
-curl -fsSL https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo | pkexec tee /etc/yum.repos.d/terra.repo
-sudo rpm-ostree install terra-release
+sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release
 ```
+You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.

 ## Documentation
-
-Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/).
+Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/). Alternatively, the GitHub Wiki contains older versions of the documentations.

 ## Questions?
-
-Feel free to reach out by [joining our community](https://wiki.ultramarine-linux.org/en/community/community/). We're always happy to help!
-
- [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
- [FAQ](https://developer.fyralabs.com/terra/faq)
- [Policy](https://developer.fyralabs.com/terra/policy)
+Feel free to reach out on [Discord](https://discord.gg/5fdPuxTg5Q). We're always happy to help!
@@ -1,14 +1,14 @@
-%global xurl https://files.pythonhosted.org/packages/ef/fa/6c86371d0e3b71129d2a79e63fc3fdc17733c9ebbf77345c62caad8c9fca/anki-24.11-cp39-abi3-manylinux_2_28_x86_64.whl
-%global aurl https://files.pythonhosted.org/packages/58/6e/9f2d4853a83e57cea48ccae3bc2d887bf7c0550042185e156bab23f524bf/anki-24.11-cp39-abi3-manylinux_2_31_aarch64.whl
-%global qurl https://files.pythonhosted.org/packages/40/3c/b70ef91f1dad8248332971c0cbb2922277512789cadc33cb16233e360a56/aqt-24.11-py3-none-any.whl
+%global xurl https://files.pythonhosted.org/packages/51/5f/6f52b958fe38a36a0799c01fbd56a742ebdfcf41f89438dbee998b8ce692/anki-24.06.3-cp39-abi3-manylinux_2_28_x86_64.whl
+%global aurl https://files.pythonhosted.org/packages/df/bb/b0bfbc6a06a598b0b614d18dd8c4f40827828649f9742f1f44a4e44d6a2c/anki-24.06.3-cp39-abi3-manylinux_2_31_aarch64.whl
+%global qurl https://files.pythonhosted.org/packages/21/2a/d8e22a9521be04ef29a30d21a2c3008783ab03b6f07cc14696a040f747a4/aqt-24.06.3-py3-none-any.whl

 Name:			anki-bin
-Version:		24.11
+Version:		24.06.3
 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-pip rpm_macro(fdupes) cargo
+BuildRequires:	python3-pip cargo
 Requires:		python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
 Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
 Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
@@ -50,8 +50,6 @@ cp -r ./{_aqt,anki*,aqt*} %buildroot/usr/lib/python3*/site-packages/

 rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2trash,waitress-serve}

-%fdupes %buildroot%_libdir/python*/site-packages/_aqt/data/
-

 %files
 %license LICENSE
@@ -1,10 +1,10 @@
 Name:           anki-qt5
-Version:        24.11
+Version:        24.06.3
 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-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks
 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 python3-orjson mpv python3-qt5-webengine
@@ -46,8 +46,6 @@ chmod 755 %{buildroot}%{_bindir}/anki
 find %{buildroot} -iname __pycache__ | xargs -r rm -rf
 find %{buildroot} -iname direct_url.json | xargs -r rm -rf

-%fdupes %_libdir/python*/site-packages/_aqt/data/
-

 %files
 %license LICENSE*
@@ -1,10 +1,10 @@
 Name:           anki
-Version:        24.11
+Version:        24.06.3
 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-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks
 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
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
@@ -30,7 +30,6 @@ git checkout %{version}
 %build
 export RELEASE=1
 export PYTHONPATH=%_libdir/python3/dist-packages
-cargo update
 mold -run ./tools/build


@@ -51,9 +50,6 @@ find %{buildroot} -iname direct_url.json | xargs -r rm -rf

 chmod 755 %{buildroot}%{_bindir}/anki

-%fdupes %_libdir/python*/site-packages/_aqt/data/
-
-
 %files
 %license LICENSE*
 %doc README*
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "armcord-bin.spec"
+	}
+}
@@ -0,0 +1,78 @@
+%define debug_package %nil
+%global _build_id_links none
+
+%ifarch x86_64
+%global src ArmCord-%version-linux-x64
+%elifarch aarch64
+%global src ArmCord-%version-linux-arm64
+%elifarch armv7l
+%global src ArmCord-%version-linux-armv7l
+%endif
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/armcord/.*\\.so
+
+Name:			armcord-bin
+Version:		3.2.7
+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
+Source0:		%url/releases/download/v%version/%src.tar.gz
+Source1:		armcord.png
+Source2:		https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
+Requires:		electron xdg-utils
+ExclusiveArch:	x86_64 aarch64 armv7l
+Conflicts:		armcord
+BuildRequires:	add-determinism
+
+%description
+ArmCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+%autosetup -n %src
+
+cat <<EOF > .armcord.desktop
+[Desktop Entry]
+Name=ArmCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=%_bindir/armcord
+Icon=armcord
+Categories=Network;InstantMessaging;
+StartupWMClass=armcord
+Keywords=discord;armcord;vencord;shelter;electron;
+EOF
+
+%build
+
+%install
+mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/armcord %buildroot%_docdir/%name
+cp -a * %buildroot%_datadir/armcord/
+ln -s %_datadir/armcord/armcord %buildroot%_bindir/armcord
+chmod +x -R %buildroot%_datadir/armcord/*
+chmod 755 %buildroot%_datadir/armcord/armcord
+install -Dm644 .armcord.desktop %buildroot%_datadir/applications/ArmCord.desktop
+install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/armcord.png
+install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
+
+%files
+%doc README.md
+%_datadir/armcord
+%_bindir/armcord
+%_datadir/applications/ArmCord.desktop
+%_datadir/pixmaps/armcord.png
+
+%changelog
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
+- Remove libnotify dependency.
+- Fix desktop entry.
+- Set as noarch package because there are not binary files.
+- Use /usr/share/ instead of /opt/
+
+* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh("ArmCord/ArmCord"));
@@ -1,6 +1,6 @@
 project pkg {
 	arches = ["x86_64"]
 	rpm {
-		spec = "legcord.spec"
+		spec = "armcord.spec"
 	}
 }
@@ -0,0 +1,70 @@
+%define debug_package %nil
+
+Name:		armcord
+Version:	3.2.7
+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
+Packager:	madonuko <mado@fyralabs.com>
+Requires:	electron xdg-utils
+BuildRequires:	git-core add-determinism pnpm
+Conflicts:	armcord-bin
+BuildArch:	noarch
+
+%description
+ArmCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+rm -rf *
+git clone %url .
+git checkout v%version
+
+cat <<EOF > armcord.desktop
+[Desktop Entry]
+Name=ArmCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=/usr/bin/armcord
+Icon=armcord
+Categories=Network;InstantMessaging;
+StartupWMClass=armcord
+Keywords=discord;armcord;vencord;shelter;electron;
+EOF
+
+
+%build
+pnpm install --no-frozen-lockfile
+pnpm run packageQuick
+
+
+%install
+install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/armcord/app.asar
+
+install -Dm755 %SOURCE1 %buildroot/usr/bin/armcord
+install -Dm644 armcord.desktop %buildroot/usr/share/applications/ArmCord.desktop
+install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png
+
+%files
+%doc README.md
+%license license.txt
+/usr/bin/armcord
+/usr/share/applications/ArmCord.desktop
+/usr/share/pixmaps/armcord.png
+/usr/share/armcord/app.asar
+
+%changelog
+* Mon Aug 26 2024 madonuko <mado@fyralabs.com> - 3.3.0-1
+- Update to license.txt
+
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
+- Remove libnotify dependency.
+- Fix desktop entry.
+- Set as noarch package because there are not binary files.
+
+* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh("ArmCord/ArmCord"));
@@ -8,7 +8,7 @@ for background device management, as well as a GUI to expertly customize your se
 %global __brp_mangle_shebangs %{nil}

 Name:           coolercontrol
-Version:        1.4.5
+Version:        1.4.0
 Release:        1%?dist
 Summary:        Cooling device control for Linux
 License:        GPL-3.0-or-later
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.552
+Version:        0.0.462
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -1 +1,3 @@
-rpm.version(get("https://discord.com/api/canary/updates?platform=linux").json().name);
+let html = get("https://discordapp.com/api/download/canary?platform=linux&format=tar.gz");
+let newver = find("https://dl-canary\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
+rpm.version(newver);
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary
-Version:        0.0.552
+Version:        0.0.462
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -1 +1,3 @@
-rpm.version(get("https://discord.com/api/canary/updates?platform=linux").json().name);
+let html = get("https://discordapp.com/api/download/canary?platform=linux&format=tar.gz");
+let newver = find("https://dl-canary\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
+rpm.version(newver);
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.78
+Version:        0.0.61
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -1 +1,3 @@
-rpm.version(get("https://discord.com/api/stable/updates?platform=linux").json().name);
+let html = get("https://discordapp.com/api/download?platform=linux&format=tar.gz");
+let newver = find("https://dl\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
+rpm.version(newver);
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb-openasar
-Version:        0.0.124
+Version:        0.0.96
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -1 +1,3 @@
-rpm.version(get("https://discord.com/api/ptb/updates?platform=linux").json().name);
+let html = get("https://discordapp.com/api/download/ptb?platform=linux&format=tar.gz");
+let newver = find("https://dl-ptb\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
+rpm.version(newver);
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.124
+Version:        0.0.96
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -1 +1,3 @@
-rpm.version(get("https://discord.com/api/ptb/updates?platform=linux").json().name);
+let html = get("https://discordapp.com/api/download/ptb?platform=linux&format=tar.gz");
+let newver = find("https://dl-ptb\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
+rpm.version(newver);
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.78
+Version:		0.0.61
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1 +1,3 @@
-rpm.version(get("https://discord.com/api/stable/updates?platform=linux").json().name);
+let html = get("https://discordapp.com/api/download?platform=linux&format=tar.gz");
+let newver = find("https://dl\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
+rpm.version(newver);
@@ -1,5 +1,5 @@
-%global commit 0adf894b4519824682b6e0886fa1c6853c9b7344
-%global commit_date 20250102
+%global commit 5d0131a00c52b791cad3543e33017c28e021cb92
+%global commit_date 20240727
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision
@@ -9,14 +9,14 @@ Summary:        UI for building, configuring and running Monado, the open source
 License:        AGPL-3.0-or-later
 URL:            https://gitlab.com/gabmus/envision/
 Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
+BuildRequires:  meson ninja-build cargo
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gio-2.0) >= 2.66
 BuildRequires:  pkgconfig(gtk4) >= 4.10.0
 BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
 BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel-engine
+BuildRequires:  openssl-devel
 BuildRequires:  openxr-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.12.1
+Version:		0.7.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "fontviewer.spec"
-  }
-}
@@ -1,43 +0,0 @@
-%global commit d530f26d60dc105e44fdc8ac7f30a2f667bc1e4f
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20241224
-
-Name:           fontviewer
-Version:        %{commit_date}.git~%{shortcommit}
-Release:        1%?dist
-Summary:        View and install fonts
-
-License:        GPL-2.0
-URL:            https://github.com/chocolateimage/%{name}
-Source0:        %{url}/archive/%{commit}.tar.gz
-
-BuildRequires:  gcc-c++
-BuildRequires:  meson
-BuildRequires:  pkgconfig(cairomm-1.0)
-BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(gtkmm-3.0)
-
-Requires:       gtk3 fontconfig
-
-Packager:       sadlerm <sad_lerm@hotmail.com>
-
-%description
-A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer
-
-%prep
-%autosetup -n %{name}-%{commit} -p1
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
@@ -1,5 +0,0 @@
-# rpm.global("commit", gh_commit("chocolateimage/fontviewer"));
-# if rpm.changed() {
-#    rpm.release();
-#    rpm.global("commit_date", date());
-# }
@@ -5,9 +5,9 @@
 %global pure_protobuf_version 2.0.0

 Name:           komikku
-Version:        1.67.0
+Version:        1.51.1
 %forgemeta
-Release:        1%?dist
+Release:        %autorelease
 Summary:        A manga reader for GNOME

 BuildArch:      noarch
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "legcord-bin.spec"
-	}
-}
@@ -1,95 +0,0 @@
-%define debug_package %nil
-%global _build_id_links none
-
-%ifarch x86_64
-%global src LegCord-%version-linux-x64
-%elifarch aarch64
-%global src LegCord-%version-linux-arm64
-%elifarch armv7l
-%global src LegCord-%version-linux-armv7l
-%endif
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
-
-Name:			legcord-bin
-Version:		1.0.6
-Release:		1%?dist
-License:		OSL-3.0
-Summary:		Custom lightweight Discord client designed to enhance your experience
-URL:			https://github.com/LegCord/LegCord
-Group:			Applications/Internet
-Source0:		%url/releases/download/v%version/%src.zip
-Source1:		legcord.png
-Source2:		https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
-Requires:		xdg-utils
-BuildRequires:  unzip
-ExclusiveArch:	x86_64 aarch64 armv7l
-Conflicts:		legcord
-BuildRequires:	add-determinism
-Obsoletes:      armcord < 3.3.2-1
-
-%description
-LegCord is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-mkdir legcord
-cd legcord
-unzip %SOURCE0
-
-cat <<EOF > .legcord.desktop
-[Desktop Entry]
-Name=LegCord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=%_bindir/legcord
-Icon=legcord
-Categories=Network;InstantMessaging;
-StartupWMClass=legcord
-Keywords=discord;armcord;legcord;vencord;shelter;electron;
-EOF
-
-%build
-
-%install
-cd legcord
-mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
-cp -a * %buildroot%_datadir/legcord/
-ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
-ln -s %_datadir/legcord %buildroot%_datadir/armcord
-chmod +x -R %buildroot%_datadir/legcord/*
-chmod 755 %buildroot%_datadir/legcord/legcord
-install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop
-install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png
-install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
-
-# HACK: rpm bug for unability to replace existing files on system.
-%pre
-if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
-  echo "Found old %_datadir/armcord directory, removing…"
-  rm -rf %_datadir/armcord
-fi
-
-%files
-%doc README.md
-%_datadir/legcord
-%_datadir/armcord
-%_bindir/legcord
-%_datadir/applications/LegCord.desktop
-%_datadir/pixmaps/legcord.png
-
-%changelog
-* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
- Rename to LegCord.
-
-* Sat Jun 17 2023 madonuko <mado@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
- Use /usr/share/ instead of /opt/
-
-* Sat May 6 2023 madonuko <mado@fyralabs.com> - 3.1.7-1
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("LegCord/LegCord"));
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "legcord-bin.spec"
-	}
-}
@@ -1,96 +0,0 @@
-%define debug_package %nil
-%global _build_id_links none
-
-%ifarch x86_64
-%global src LegCord-%version-linux-x64
-%elifarch aarch64
-%global src LegCord-%version-linux-arm64
-%elifarch armv7l
-%global src LegCord-%version-linux-armv7l
-%endif
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
-
-Name:			legcord-bin
-Version:		1.0.6
-Release:		1%?dist
-License:		OSL-3.0
-Summary:		Custom lightweight Discord client designed to enhance your experience
-URL:			https://github.com/LegCord/LegCord
-Group:			Applications/Internet
-Source0:		%url/releases/download/v%version/%src.zip
-Source1:		legcord.png
-Source2:		https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
-Requires:		xdg-utils
-BuildRequires:  unzip
-ExclusiveArch:	x86_64 aarch64 armv7l
-Conflicts:		legcord
-Conflicts:		legcord-nightly
-BuildRequires:	add-determinism
-Obsoletes:      armcord < 3.3.2-1
-
-%description
-LegCord is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-mkdir legcord
-cd legcord
-unzip %SOURCE0
-
-cat <<EOF > .legcord.desktop
-[Desktop Entry]
-Name=LegCord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=%_bindir/legcord
-Icon=legcord
-Categories=Network;InstantMessaging;
-StartupWMClass=legcord
-Keywords=discord;armcord;legcord;vencord;shelter;electron;
-EOF
-
-%build
-
-%install
-cd legcord
-mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
-cp -a * %buildroot%_datadir/legcord/
-ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
-ln -s %_datadir/legcord %buildroot%_datadir/armcord
-chmod +x -R %buildroot%_datadir/legcord/*
-chmod 755 %buildroot%_datadir/legcord/legcord
-install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop
-install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png
-install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
-
-# HACK: rpm bug for unability to replace existing files on system.
-%pre
-if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
-  echo "Found old %_datadir/armcord directory, removing…"
-  rm -rf %_datadir/armcord
-fi
-
-%files
-%doc README.md
-%_datadir/legcord
-%_datadir/armcord
-%_bindir/legcord
-%_datadir/applications/LegCord.desktop
-%_datadir/pixmaps/legcord.png
-
-%changelog
-* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
- Rename to LegCord.
-
-* Sat Jun 17 2023 madonuko <mado@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
- Use /usr/share/ instead of /opt/
-
-* Sat May 6 2023 madonuko <mado@fyralabs.com> - 3.1.7-1
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("LegCord/LegCord"));
@@ -1,9 +0,0 @@
-project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "legcord-nightly.spec"
-	}
-	labels {
-		nightly = 1
-	}
-}
@@ -1,91 +0,0 @@
-%global commit b070545d1289e66a02eff10aa2bf5f440eb16aeb
-%global commit_date 20250101
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%define debug_package %nil
-
-Name:		legcord-nightly
-Version:	%commit_date.%shortcommit
-Release:	1%?dist
-License:	OSL-3.0
-Summary:	Custom lightweight Discord client designed to enhance your experience
-URL:		https://github.com/LegCord/LegCord
-Group:		Applications/Internet
-Source0:  %url/archive/%commit/legcord-%commit.tar.gz
-Source1:	launch.sh
-Packager:	Owen <owen@fyralabs.com>
-Requires:	electron xdg-utils
-Provides:   armcord-nightly
-Obsoletes:  armcord < 3.3.2-1
-Conflicts:	legcord-bin
-Conflicts:	legcord
-BuildArch:	noarch
-BuildRequires:  anda-srpm-macros pnpm
-
-%description
-legcord is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-%autosetup -n Legcord-%commit
-
-cat <<EOF > legcord.desktop
-[Desktop Entry]
-Name=LegCord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=/usr/bin/legcord
-Icon=legcord
-Categories=Network;InstantMessaging;
-StartupWMClass=legcord
-Keywords=discord;armcord;legcord;vencord;shelter;electron;
-EOF
-
-
-%build
-pnpm install --no-frozen-lockfile
-pnpm run packageQuick
-
-
-%install
-install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar
-
-install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord
-install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop
-install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png
-
-ln -s %_datadir/legcord %buildroot%_datadir/armcord
-
-# HACK: rpm bug for unability to replace existing files on system.
-%pre
-if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
-  echo "Found old %_datadir/armcord directory, removing…"
-  rm -rf %_datadir/armcord
-fi
-
-%files
-%doc README.md
-%license license.txt
-/usr/bin/legcord
-/usr/share/applications/LegCord.desktop
-/usr/share/pixmaps/legcord.png
-/usr/share/legcord/app.asar
-/usr/share/armcord
-
-%changelog
-* Fri Nov 22 2024 owen <owen@fyralabs.com> - 1.0.2-2
- Add nightly package.
-
-* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
- Rename to LegCord.
-
-* Mon Aug 26 2024 madonuko <mado@fyralabs.com> - 3.3.0-1
- Update to license.txt
-
-* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
-
-* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
- Initial package
@@ -1,5 +0,0 @@
-rpm.global("commit", gh_commit("Legcord/Legcord"));
-if rpm.changed() {
-  rpm.release();
-  rpm.global("commit_date", date());
-}
@@ -1,13 +0,0 @@
-#!/bin/sh
-electron=/usr/bin/electron
-
-CONFIG=${XDG_CONFIG_HOME:-~/.config}
-FLAGS="$CONFIG/armcord-flags.conf"
-
-# Allow users to override command-line options
-if [ -f "$FLAGS" ]; then
-  USER_FLAGS="$(cat "$FLAGS")"
-fi
-
-# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted
-"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@"
@@ -1,88 +0,0 @@
-%define debug_package %nil
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
-
-Name:		legcord
-Version:	1.0.6
-Release:	1%?dist
-License:	OSL-3.0
-Summary:	Custom lightweight Discord client designed to enhance your experience
-URL:		https://github.com/LegCord/LegCord
-Group:		Applications/Internet
-Source1:	launch.sh
-Packager:	madonuko <mado@fyralabs.com>
-Requires:	electron xdg-utils
-Provides:   armcord
-Obsoletes:  armcord < 3.3.2-1
-Conflicts:	legcord-bin
-Conflicts:	legcord-nightly
-BuildArch:	noarch
-BuildRequires:  anda-srpm-macros pnpm
-
-%description
-legcord is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-%git_clone %url v%version
-
-cat <<EOF > legcord.desktop
-[Desktop Entry]
-Name=Legcord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=/usr/bin/legcord
-Icon=legcord
-Categories=Network;InstantMessaging;
-StartupWMClass=legcord
-Keywords=discord;armcord;legcord;vencord;shelter;electron;
-EOF
-
-
-%build
-pnpm install --no-frozen-lockfile
-pnpm run packageQuick
-
-
-%install
-install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar
-
-install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord
-install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop
-install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png
-
-ln -s %_datadir/legcord %buildroot%_datadir/armcord
-
-# HACK: rpm bug for unability to replace existing files on system.
-%pre
-if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
-  echo "Found old %_datadir/armcord directory, removing…"
-  rm -rf %_datadir/armcord
-fi
-
-%files
-%doc README.md
-%license license.txt
-/usr/bin/legcord
-/usr/share/applications/LegCord.desktop
-/usr/share/pixmaps/legcord.png
-/usr/share/legcord/app.asar
-/usr/share/armcord
-
-%changelog
-* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
- Rename to LegCord.
-
-* Mon Aug 26 2024 madonuko <mado@fyralabs.com> - 3.3.0-1
- Update to license.txt
-
-* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
-
-* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("LegCord/LegCord"));
@@ -1,7 +1,7 @@
-%global commit 50042f5ee094a36e38f9ea809408e0b5cbf3b874
+%global commit 3c7b6db205c027d3c4f12285719367792e471b57
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250101
-%global ver 0.39.0
+%global commit_date 20240725
+%global ver 0.38.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -42,7 +42,6 @@ BuildRequires:  pkgconfig(libavutil) >= 57.24.100
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcdio_paranoia)
-BuildRequires:  pkgconfig(libdisplay-info)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.19
@@ -183,6 +182,7 @@ sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
    -Dvdpau-gl-x11=enabled \
    -Dvdpau=enabled \
    -Dvector=enabled \
+    -Dvulkan-interop=disabled \
    -Dvulkan=enabled \
    -Dwayland=enabled \
    -Dwerror=false \
@@ -1,11 +0,0 @@
--- a/desktop/packages/linux/rs.ruffle.Ruffle.desktop
-+++ b/desktop/packages/linux/rs.ruffle.Ruffle.desktop
-@@ -47,7 +47,7 @@ Comment[zh_CN]=播放 Flash 游戏和动画
- Comment[zh_TW]=播放 Flash 遊戲和動畫
- Comment=Play Flash games & movies
- Icon=rs.ruffle.Ruffle
-Exec=ruffle %u
-+Exec=ruffle_desktop %u
- MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie
- Categories=AudioVideo;Player;Graphics;Viewer;VectorGraphics;Game
- Keywords[ar]=الفلاش;swf;مشغل;محاكي;رَسْت
@@ -1,4 +1,4 @@
-%global ver 2025-01-02
+%global ver 2024-07-29
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -14,10 +14,9 @@ Summary:        A Flash Player emulator written in Rust
 License:        Apache-2.0 OR MIT
 URL:            https://ruffle.rs/
 Source0:        https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%ver.tar.gz
-Patch0:         desktop_file_patch.diff
 Provides:       ruffle
 BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros mold
+BuildRequires:  anda-srpm-macros
 BuildRequires:  gcc-c++ cmake java
 BuildRequires:  java-latest-openjdk-headless
 BuildRequires:  pkgconfig(alsa)
@@ -33,23 +32,35 @@ Packager:       madonuko <mado@fyralabs.com>
 %license LICENSE.md
 %license LICENSE.dependencies
 %_bindir/ruffle_desktop
-%_datadir/applications/rs.ruffle.Ruffle.desktop
-%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
-%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
+%_datadir/applications/ruffle_desktop.desktop
+%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg

 %prep
-%autosetup -n ruffle-nightly-%ver -p1
+%autosetup -n ruffle-nightly-%ver
 %cargo_prep_online

+cat<<EOF > ruffle_desktop.desktop
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Ruffle Desktop
+Comment=%summary
+Exec=%_bindir/ruffle_desktop
+Icon=ruffle_desktop
+Terminal=false
+StartupNotify=false
+Categories=Application;
+MimeType=application/x-shockwave-flash;
+EOF
+
 %build
 %{cargo_license_online} > LICENSE.dependencies

 %install
 cd desktop
 %cargo_install
-install -Dm644 packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
-install -Dm644 packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop
-install -Dm644 packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
+install -Dm644 assets/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg
+install -Dm644 ../ruffle_desktop.desktop %buildroot%_datadir/applications/ruffle_desktop.desktop

 %changelog
 * Mon Jul 29 2024 madonuko <mado@fyralabs.com>
@@ -13,8 +13,8 @@
 %global crate sccache

 Name:           rust-sccache
-Version:        0.9.0
-Release:        1%?dist
+Version:        0.8.1
+Release:        %autorelease
 Summary:        Ccache-like tool

 License:        Apache-2.0
@@ -23,13 +23,14 @@ Source:         %{crates_source}
 # Automatically generated patch to strip dependencies and normalize metadata
 Patch:          sccache-fix-metadata-auto.diff

+ExclusiveArch:  %{rust_arches}
+
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  anda-srpm-macros
 BuildRequires:  openssl-devel
 BuildRequires:  gcc
 BuildRequires:  perl
 BuildRequires:  rust-packaging
-BuildRequires:  mold

 %global _description %{expand:
 Sccache is a ccache-like tool. It is used as a compiler wrapper and
@@ -47,7 +48,6 @@ License:        MIT

 %files       -n %{crate}
 %license LICENSE
-#license LICENSE.dependencies
 %doc CODE_OF_CONDUCT.md
 %doc README.md
 %{_bindir}/sccache
@@ -68,9 +68,6 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.

 %files          devel
-%license %{crate_instdir}/LICENSE
-%doc %{crate_instdir}/CODE_OF_CONDUCT.md
-%doc %{crate_instdir}/README.md
 %{crate_instdir}/

 %package     -n %{name}+default-devel
@@ -474,7 +471,6 @@ use the "webdav" feature of the "%{crate}" crate.
 %endif

 %install
-rm -rf .git || true
 %if %{with dist_server}
 %cargo_install -f dist-server
 %else
@@ -0,0 +1,16 @@
+--- sccache-0.8.1/Cargo.toml	1970-01-01T00:00:01+00:00
+++ sccache-0.8.1/Cargo.toml	2024-07-10T16:31:31.705674+00:00
+@@ -403,13 +403,3 @@
+ [target."cfg(unix)".dependencies.daemonize]
+ version = "0.5"
+ 
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = [
+-    "fileapi",
+-    "handleapi",
+-    "stringapiset",
+-    "winnls",
+-    "processenv",
+-    "std",
+-]
@@ -6,7 +6,7 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.4
+Version:	1.5.3
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
@@ -4,17 +4,13 @@
 # do not strip binaries
 %define __strip /bin/true

-# do not perform compression in cpio
-%define _source_payload w0.ufdio
-%define _binary_payload w19.zstdio
-
 # Exclude private libraries
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		0.22.3
-Release:		1%?dist
+Version:		0.19.2
+Release:		4%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
@@ -1,50 +0,0 @@
-Name:           WoeUSB-ng
-Version:        0.2.12
-Release:        1%?dist
-Summary:        Simple tool that enable you to create your own usb stick with Windows installer
-License:        GPL-3.0-only
-Requires:       parted dosfstools ntfsprogs p7zip p7zip-plugins xdg-utils grub2-tools
-URL:            https://github.com/WoeUSB/WoeUSB-ng
-Source:         https://github.com/WoeUSB/WoeUSB-ng/archive/refs/tags/v%version.tar.gz
-Patch0:         https://patch-diff.githubusercontent.com/raw/WoeUSB/WoeUSB-ng/pull/79.patch
-BuildArch:      noarch
-BuildRequires:  python3-devel python3-installer
-
-%global _description %{expand:
-WoeUSB-ng is a simple tool that enable you to create your own usb stick windows installer from an iso image or a real DVD. This is a rewrite of original WoeUSB.}
-
-%description %_description
-
-%prep
-%autosetup -p1
-
-
-%generate_buildrequires
-%pyproject_buildrequires
-
-
-%build
-%pyproject_wheel
-
-
-%install
-%pyproject_install
-%pyproject_save_files WoeUSB
-install -Dpm644 miscellaneous/WoeUSB-ng.desktop %buildroot%_datadir/applications/WoeUSB-ng.desktop
-install -Dpm644 miscellaneous/com.github.woeusb.woeusb-ng.policy %buildroot%_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy
-
-
-%check
-#pyproject_check_import
-
-
-%files -f %{pyproject_files}
-%_bindir/woeusb
-%_bindir/woeusbgui
-%_datadir/applications/WoeUSB-ng.desktop
-%_iconsdir/hicolor/scalable/apps/woeusb-logo.png
-%_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy
-
-
-%changelog
-%autochangelog
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "WoeUSB-ng.spec"
-    }
-}
@@ -1 +0,0 @@
-rpm.version(gh_tag("WoeUSB/WoeUSB-ng"));
@@ -5,8 +5,8 @@
 %global pnpm npx pnpm@%{pnpm_version}

 Name:           youtube-music
-Version:        3.7.1
-Release:        1%?dist
+Version:        3.5.1
+Release:        1%{?dist}
 Summary:        YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
 Source1:        youtube-music.desktop
 License:        MIT
@@ -1,43 +0,0 @@
-From e351a28f9a5e2b50bbec938f001a753d418fe39b Mon Sep 17 00:00:00 2001
-From: everyx <lunt.luo@gmail.com>
-Date: Tue, 24 Dec 2024 13:40:52 +0800
-Subject: [PATCH 1/3] fix desktop
-
---
- AppDir/zen.desktop | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/AppDir/zen.desktop b/AppDir/zen.desktop
-index 4a79413..1d5521c 100644
--- a/AppDir/zen.desktop
-+++ b/AppDir/zen.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Zen Browser
- Comment=Experience tranquillity while browsing the web without people tracking you!
-Exec=zen %u
-Icon=zen
-+Exec=/usr/lib/zen-browser/zen %u
-+Icon=zen-browser
- Type=Application
- MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
- StartupWMClass=zen-beta
-@@ -15,12 +15,12 @@ Actions=new-window;new-private-window;profilemanager;
- 
- [Desktop Action new-window]
- Name=Open a New Window
-Exec=zen %u
-+Exec=/usr/lib/zen-browser/zen %u
- 
- [Desktop Action new-private-window]
- Name=Open a New Private Window
-Exec=zen --private-window %u
-+Exec=/usr/lib/zen-browser/zen --private-window %u
- 
- [Desktop Action profilemanager]
- Name=Open the Profile Manager
-Exec=zen --ProfileManager %u
-+Exec=/usr/lib/zen-browser/zen --ProfileManager %u
-- 
-2.47.1
-
@@ -1,39 +0,0 @@
-From e0581daf3013acfcc2d14e375cf7bc6734f11a9f Mon Sep 17 00:00:00 2001
-From: everyx <lunt.luo@gmail.com>
-Date: Tue, 24 Dec 2024 13:42:16 +0800
-Subject: [PATCH 2/3] download lang packs withou git clone
-
---
- scripts/download-language-packs.sh | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh
-index 7fa7047..ca8d00e 100644
--- a/scripts/download-language-packs.sh
-+++ b/scripts/download-language-packs.sh
-@@ -1,16 +1,16 @@
- 
-set -ex
-+# set -ex
- 
- CURRENT_DIR=$(pwd)
- 
-git config --global init.defaultBranch main
-git config --global fetch.prune true
-+# git config --global init.defaultBranch main
-+# git config --global fetch.prune true
- 
- cd $CURRENT_DIR
- 
-cd ./l10n
-git clone https://github.com/mozilla-l10n/firefox-l10n
-cd $CURRENT_DIR
-+# cd ./l10n
-+# git clone https://github.com/mozilla-l10n/firefox-l10n
-+# cd $CURRENT_DIR
- 
- update_language() {
-   langId=$1
-- 
-2.47.1
-
@@ -1,40 +0,0 @@
-From 9151fb64184efae829f0acf4c6dd1a632dff3b65 Mon Sep 17 00:00:00 2001
-From: everyx <lunt.luo@gmail.com>
-Date: Tue, 24 Dec 2024 13:43:04 +0800
-Subject: [PATCH 3/3] donnot disable system extensions
-
---
- ...ble-extensions-in-system-directories.patch | 21 +++++++++++++++++++
- 1 file changed, 21 insertions(+)
- create mode 100644 src/browser/app/profile/Don-t-auto-disable-extensions-in-system-directories.patch
-
-diff --git a/src/browser/app/profile/Don-t-auto-disable-extensions-in-system-directories.patch b/src/browser/app/profile/Don-t-auto-disable-extensions-in-system-directories.patch
-new file mode 100644
-index 0000000..544fe6f
--- /dev/null
-+++ b/src/browser/app/profile/Don-t-auto-disable-extensions-in-system-directories.patch
-@@ -0,0 +1,21 @@
-+From: Mike Hommey <mh@glandium.org>
-+Date: Fri, 17 Feb 2012 17:47:15 +0100
-+Subject: Don't auto-disable extensions in system directories
-+
-+---
-+ browser/app/profile/firefox.js | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-+index 5066b56..964b931 100644
-+--- a/browser/app/profile/firefox.js
-++++ b/browser/app/profile/firefox.js
-+@@ -56,7 +56,7 @@ pref("extensions.systemAddon.update.enabled", true);
-+ 
-+ // Disable add-ons that are not installed by the user in all scopes by default.
-+ // See the SCOPE constants in AddonManager.sys.mjs for values to use here.
-+-pref("extensions.autoDisableScopes", 15);
-++pref("extensions.autoDisableScopes", 3);
-+ // Scopes to scan for changes at startup.
-+ pref("extensions.startupScanScopes", 0);
-+ 
-- 
-2.47.1
-
@@ -1,13 +0,0 @@
-diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py
-index df3f39f548..0e3e454d63 100644
--- a/python/mozboot/mozboot/bootstrap.py
-+++ b/python/mozboot/mozboot/bootstrap.py
-@@ -281,7 +281,7 @@ class Bootstrapper(object):
-                 full_distribution_name=False
-             )
- 
-            if dist_id in FEDORA_DISTROS:
-+            if True:
-                 cls = CentOSFedoraBootstrapper
-                 args["distro"] = dist_id
-             elif dist_id in DEBIAN_DISTROS:
@@ -1,27 +0,0 @@
-*** engine/python/mozboot/mozboot/bootstrap.py  2025-01-04 18:11:05.917961573 +0800
--- engine/python/mozboot/mozboot/bootstrap.py  2025-01-04 18:12:07.050496890 +0800
-***************
-*** 645,666 ****
-              self._write_default_mozconfig(raw_mozconfig)
-  
-      def _validate_python_environment(self, topsrcdir):
-         valid = True
-         pip3 = to_optional_path(which("pip3"))
-         if not pip3:
-             print("ERROR: Could not find pip3.", file=sys.stderr)
-             self.instance.suggest_install_pip3()
-             valid = False
-         if not valid:
-             print(
-                 "ERROR: Your Python installation will not be able to run "
-                 "`mach bootstrap`. `mach bootstrap` cannot maintain your "
-                 "Python environment for you; fix the errors shown here, and "
-                 "then re-run `mach bootstrap`.",
-                 file=sys.stderr,
-             )
-             sys.exit(1)
- 
-          mach_site = MachSiteManager.from_environment(
-              topsrcdir,
-              lambda: os.path.normpath(get_state_dir(True, topsrcdir=topsrcdir)),
--- 645,650 ----
@@ -1,71 +0,0 @@
-diff --git a/python/mozboot/mozboot/centosfedora.py b/python/mozboot/mozboot/centosfedora.py
-index 37aa0e8eaa..76ce818fce 100644
--- a/python/mozboot/mozboot/centosfedora.py
-+++ b/python/mozboot/mozboot/centosfedora.py
-@@ -19,62 +19,13 @@ class CentOSFedoraBootstrapper(LinuxBootstrapper, BaseBootstrapper):
-         self.dist_id = dist_id
- 
-     def install_packages(self, packages):
-        if self.version >= 33 and "perl" in packages:
-            packages.append("perl-FindBin")
-        # watchman is not available on centos/rocky
-        if self.distro in ("centos", "rocky", "oracle"):
-            packages = [p for p in packages if p != "watchman"]
-        self.dnf_install(*packages)
-+        pass
- 
-     def upgrade_mercurial(self, current):
-        if current is None:
-            self.dnf_install("mercurial")
-        else:
-            self.dnf_update("mercurial")
-+        pass
- 
-     def dnf_install(self, *packages):
-        if which("dnf"):
-
-            def not_installed(package):
-                # We could check for "Error: No matching Packages to list", but
-                # checking `dnf`s exit code is sufficent.
-                # Ideally we'd invoke dnf with '--cacheonly', but there's:
-                # https://bugzilla.redhat.com/show_bug.cgi?id=2030255
-                is_installed = subprocess.run(
-                    ["dnf", "list", "--installed", package],
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT,
-                )
-                if is_installed.returncode not in [0, 1]:
-                    stdout = is_installed.stdout
-                    raise Exception(
-                        f'Failed to determine whether package "{package}" is installed: "{stdout}"'
-                    )
-                return is_installed.returncode != 0
-
-            packages = list(filter(not_installed, packages))
-            if len(packages) == 0:
-                # avoid sudo prompt (support unattended re-bootstrapping)
-                return
-
-            command = ["dnf", "install"]
-        else:
-            command = ["yum", "install"]
-
-        if self.no_interactive:
-            command.append("-y")
-        command.extend(packages)
-
-        self.run_as_root(command)
-+        pass
- 
-     def dnf_update(self, *packages):
-        if which("dnf"):
-            command = ["dnf", "update"]
-        else:
-            command = ["yum", "update"]
-
-        if self.no_interactive:
-            command.append("-y")
-        command.extend(packages)
-
-        self.run_as_root(command)
-+        pass
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "zen-browser.spec"
-    }
-}
@@ -1,242 +0,0 @@
-# ? https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zen-browser
-# ? https://github.com/zen-browser/desktop/blob/dev/.github/workflows/linux-release-build.yml
-
-%global ver 1.0.2-b.5
-%global ff_l10n_commit 78f030ac17c17fdbf66b212ec7b11b3c7291a7da
-%global ff_ver 133.0.3
-%global langs (zh-CN zh-TW ja)
-
-Name:           zen-browser
-Version:        %(echo %ver | sed 's/-/./g')
-Release:        1%?dist
-Summary:        Experience tranquillity while browsing the web without people tracking you
-License:        MPL-2.0
-URL:            https://zen-browser.app
-%dnl Source0:        https://github.com/zen-browser/desktop/archive/refs/tags/%ver.tar.gz
-Source1:        https://github.com/mozilla-l10n/firefox-l10n/archive/%ff_l10n_commit.tar.gz
-Source2:        https://archive.mozilla.org/pub/firefox/releases/%ff_ver/source/firefox-%ff_ver.source.tar.xz
-Patch1:         0001-fix-desktop.zen.patch
-Patch2:         0002-download-lang-packs-withou-git-clone.zen.patch
-Patch3:         0003-do-not-disable-system-extensions.zen.patch
-Patch4:         0004-assume-fedora.zen.patch
-Patch5:         0005-pip3.zen.patch
-Patch6:         0006-no-dnf-yum.zen.patch
-Packager:       madonuko <mado@fyralabs.com>
-BuildRequires:  git anda-srpm-macros vips-devel nodejs-npm nodejs
-BuildRequires:  ncurses-devel ncurses
-BuildRequires:  rsync cbindgen clang-devel clang diffutils imake mold llvm llvm-devel nasm
-BuildRequires:  wasi-libc-devel yasm
-BuildRequires:  xorg-x11-server-Xvfb dbus-daemon
-BuildRequires:  findutils libxml2 m4 make perl perl-FindBin
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(nspr)
-
-%description
-%summary.
-
-%{lua:
-  function mysplit(inputstr, sep)
-    if sep == nil then
-      sep = "%s"
-    end
-    local t = {}
-    for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
-      table.insert(t, str)
-    end
-    return t
-  end
-
-  local slangs = rpm.expand("%langs")
-  local langs = mysplit(slangs:sub(2, (#slangs)-1), " ")
-  for k, lang in pairs(langs) do
-    print("%package langpack-" .. lang .. "\n")
-    print("Summary: Language pack for Zen Browser ("..lang..")\n")
-    print(rpm.expand("Requires: zen-browser = %version-%release\n"))
-    print(rpm.expand("Supplements: langpacks-"..lang:gsub("-", "_").." = %version-%release\n\n"))
-    print("BuildArch: noarch\n")
-    print("%description langpack-"..lang.."\n")
-    print("Language pack for Zen Browser ("..lang..")\n\n")
-    print("%files langpack-"..lang.."\n")
-    print("/usr/lib/zen/browser/extensions/langpack-"..lang.."@firefox.mozilla.org.xpi\n")
-  end
-}
-
-%prep
-%git_clone https://github.com/zen-browser/desktop %ver
-git config user.name "Raboneko"
-git config user.email "raboneko@fyralabs.com"
-git config --add safe.directory $(pwd)/..
-export MOZBUILD_STATE_PATH=$(pwd)/.mozbuild
-# I don't know why but it seems like we need to use this
-# or else it would use another python version
-export PYENV_ROOT="$(pwd)/.pyenv"
-export PATH="$PYENV_ROOT/bin:$PATH"
-export PYENV_VERSION=3.11
-curl https://pyenv.run | bash
-pyenv install $PYENV_VERSION
-eval "$(pyenv init -)"
-tar xf %{S:1}
-rm -rf l10n/firefox-l10n
-mv firefox-l10n-%ff_l10n_commit firefox-l10n
-mv firefox-l10n l10n/
-%autopatch -p1 -M3
-# use the --enable-jack option to keep in sync with the official repository of Firefox
-sed -i 's/--enable-pulseaudio/--enable-jack/g' configs/linux/mozconfig
-
-# prepare deps
-yes | npx pnpm config set store-dir $(pwd)/pnpm-store
-npx pnpm i --frozen-lockfile
-
-npx pnpm surfer ci --brand beta --display-version %ver
-install -Dvm644 %SOURCE2 -t ./.surfer/engine
-npx pnpm surfer download
-npx pnpm surfer import
-
-# bootstrap
-%patch 5
-cd engine
-%patch 4 -p1
-%patch 6 -p1
-export SURFER_PLATFORM="linux"
-git commit -a -m "tmp"
-
-python3.11 -m ensurepip
-python3.11 ./mach --no-interactive bootstrap --application-choice browser
-cd ..
-
-%build
-export PATH="$PATH:$(pwd)/bin/"
-export SURFER_PLATFORM="linux"
-export MOZBUILD_STATE_PATH=$(pwd)/.mozbuild
-cat > mozconfig <<END
-# # sccache
-# mk_add_options 'export RUSTC_WRAPPER=sccache'
-# mk_add_options 'export CCACHE_CPP2=yes'
-# ac_add_options --with-ccache=sccache
-
-# ac_add_options --enable-application=browser
-# Incompatible with surfer, disable this configuration
-mk_add_options MOZ_OBJDIR/%_builddir/desktop/obj
-
-ac_add_options --prefix=%_prefix
-# ac_add_options --enable-release
-# ac_add_options --enable-hardening
-# ac_add_options --enable-optimize
-# ac_add_options --enable-rust-simd
-ac_add_options --enable-linker=mold
-# ac_add_options --disable-install-strip
-# ac_add_options --disable-elf-hack
-# It seems to be overwritten by surfer internal mozconfg, let's keep it for now
-ac_add_options --disable-bootstrap
-ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot
-
-# Branding
-# ac_add_options --enable-official-branding
-# ac_add_options --enable-update-channel=release
-# ac_add_options --with-distribution-id=org.archlinux
-# ac_add_options --with-unsigned-addon-scopes=app,system
-ac_add_options --allow-addon-sideload
-# export MOZILLA_OFFICIAL=1
-export MOZ_APP_REMOTINGNAME=%name
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-
-# Features
-# ac_add_options --enable-alsa
-# ac_add_options --enable-jack
-# ac_add_options --enable-crashreporter
-ac_add_options --disable-updater
-# ac_add_options --disable-tests
-END
-
-export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip
-export MOZBUILD_STATE_PATH="$(pwd)/mozbuild"
-MOZ_BUILD_DATE="$(date -u${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH} +%%Y%%m%%d%%H%%M%%S)"
-export MOZ_BUILD_DATE
-# export MOZ_BUILD_PRIORITY=normal
-export MOZ_NOSPAM=1
-# malloc_usable_size is used in various parts of the codebase
-CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
-CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
-
-# Breaks compilation since https://bugzilla.mozilla.org/show_bug.cgi?id=1896066
-CFLAGS="${CFLAGS/-fexceptions/}"
-CXXFLAGS="${CXXFLAGS/-fexceptions/}"
-
-# LTO needs more open files
-ulimit -n 4096
-
-export PYENV_ROOT="$(pwd)/.pyenv"
-export PATH="$PYENV_ROOT/bin:$PATH"
-export PYENV_VERSION=3.11
-eval "$(pyenv init -)"
-export SURFER_COMPAT="$CARCH"
-export SURFER_PLATFORM=linux
-export ZEN_RELEASE=1
-
-npx pnpm surfer bootstrap
-
-dbus-run-session \
-  xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" \
-  npx pnpm surfer build #--skip-patch-check
-
-echo %ff_ver > engine/browser/config/version.txt
-_languages=%langs
-for _lang in "${_languages[@]}"; do
-  python3.11 engine/mach build "merge-$_lang"
-  python3.11 engine/mach build "langpack-$_lang"
-done
-
-%install
-DESTDIR=%buildroot engine/mach install
-ln -srvf %buildroot/usr/lib/zen %buildroot/usr/lib/zen-bin
-ln -srvf %buildroot/usr/lib/zen %buildroot%_bindir/zen
-install -Dvm644 AppDir/distribution/*.json -t %buildroot/usr/lib/zen/distribution
-
-export _vendorjs=%buildroot/usr/lib/zen/browser/defaults/preferences/vendor.js
-install -Dvm644 /dev/stdin "$_vendorjs" <<END
-// Use LANG environment variable to choose locale
-pref("intl.locale.requested", "");
-
-// Use system-provided dictionaries
-pref("spellchecker.dictionary_path", "/usr/share/hunspell");
-
-// Enable extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-
-// TODO: Enable GNOME Shell search provider
-// pref("browser.gnome-search-provider.enabled", true);
-END
-
-export _distini=%buildroot/usr/lib/zen/distribution/distribution.ini
-install -Dvm644 /dev/stdin "$_distini" <<END
-[Global]
-id=terra
-version=1.0
-about=Zen Browser (Terra)
-
-[Preferences]
-app.distributor=terra
-app.distributor.channel=zen-browser
-END
-
-for i in 16 32 48 64 128; do
-install -d %buildroot%_iconsdir/hicolor/${i}x${i}/apps
-ln -srvf \
-  "%buildroot/usr/lib/zen/browser/chrome/icons/default/default${i}.png" \
-  "%buildroot%_iconsdir/hicolor/${i}x${i}/apps/zen-browser.png"
-done
-install -Dm0644 docs/assets/zen-black.svg %buildroot%_iconsdir/hicolor/scalable/apps/%name.svg
-install -Dvm644 docs/assets/zen-black.svg %buildroot%_iconsdir/hicolor/symbolic/apps/%name-symbolic.svg
-
-install -Dvm644 AppDir/*.desktop %buildroot%_datadir/applications/%name.desktop
-
-_languages=%langs
-for _lang in "${_languages[@]}"; do
-  install -Dvm644 obj/dist/linux-*/xpi/zen-%ff_ver.$_lang.langpack.xpi \
-    "%buildroot/usr/lib/zen/browser/extensions/langpack-%_lang@firefox.mozilla.org.xpi"
-done
@@ -1,114 +1,114 @@
-Name:           budgie-extras
-Version:        1.8.0
-Release:        2%{?dist}
+Name:		budgie-extras
+Version:	1.8.0
+Release:	1%{?dist}

-License:        GPL-3.0
-Summary:        Additional Budgie Desktop enhancements for user experience
-URL:            https://ubuntubudgie.org/
+License:	GPL-3.0
+Summary:	Additional Budgie Desktop enhancements for user experience
+URL:		https://ubuntubudgie.org/

-Source0:        https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
-Patch0:         0001-fix-weathershow-desktop-widget-icon-path.patch
+Source0:	https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
+Patch0: 0001-fix-weathershow-desktop-widget-icon-path.patch

-BuildRequires:  rpm_macro(fdupes)
-BuildRequires:  cmake
-BuildRequires:  meson
-BuildRequires:  vala
-BuildRequires:  intltool
+BuildRequires:	cmake
+BuildRequires:	meson
+BuildRequires:	vala
+BuildRequires:	intltool

-BuildRequires:  pkgconfig(budgie-1.0)
-BuildRequires:  pkgconfig(gee-0.8)
-BuildRequires:  pkgconfig(gnome-settings-daemon)
-BuildRequires:  pkgconfig(json-glib-1.0)
-BuildRequires:  pkgconfig(keybinder-3.0)
-BuildRequires:  pkgconfig(libgnome-menu-3.0)
-BuildRequires:  pkgconfig(libnm)
-BuildRequires:  pkgconfig(libnma)
-BuildRequires:  pkgconfig(libnotify)
-BuildRequires:  pkgconfig(libsoup-2.4)
-BuildRequires:  pkgconfig(libwnck-3.0)
+BuildRequires:	pkgconfig(budgie-1.0)
+BuildRequires:	pkgconfig(gee-0.8)
+BuildRequires:	pkgconfig(gnome-settings-daemon)
+BuildRequires:	pkgconfig(json-glib-1.0)
+BuildRequires:	pkgconfig(keybinder-3.0)
+BuildRequires:	pkgconfig(libgnome-menu-3.0)
+BuildRequires:	pkgconfig(libnm)
+BuildRequires:	pkgconfig(libnma)
+BuildRequires:	pkgconfig(libnotify)
+BuildRequires:	pkgconfig(libsoup-2.4)
+BuildRequires:	pkgconfig(libwnck-3.0)

-BuildRequires:  pkgconfig(appstream)
-BuildRequires:  pkgconfig(granite)
-BuildRequires:  pkgconfig(libhandy-1)
-BuildRequires:  pkgconfig(zeitgeist-2.0)
+BuildRequires:	pkgconfig(appstream)
+BuildRequires:	pkgconfig(granite)
+BuildRequires:	pkgconfig(libhandy-1)
+BuildRequires:	pkgconfig(zeitgeist-2.0)

-Requires:       budgie-applet-app-launcher
-Requires:       budgie-applet-applications-menu
-Requires:       budgie-applet-brightness-controller
-Requires:       budgie-applet-clockworks
-Requires:       budgie-applet-countdown
-Requires:       budgie-applet-dropby
-Requires:       budgie-applet-fuzzyclock
-Requires:       budgie-applet-hotcorners
-Requires:       budgie-applet-kangaroo
-Requires:       budgie-applet-keyboard-autoswitch
-Requires:       budgie-applet-network-manager
-Requires:       budgie-applet-quickchar
-Requires:       budgie-applet-quicknote
-Requires:       budgie-applet-recentlyused
-Requires:       budgie-applet-rotation-lock
-Requires:       budgie-applet-showtime
-Requires:       budgie-applet-takeabreak
-Requires:       budgie-applet-visualspace
-Requires:       budgie-applet-wallstreet
-Requires:       budgie-applet-weathershow
-Requires:       budgie-applet-window-shuffler
-Requires:       budgie-applet-workspace-stopwatch
-Requires:       budgie-applet-wpreviews
-Requires:       budgie-applet-wswitcher
+Requires:	budgie-applet-applications-menu
+Requires:	budgie-applet-weathershow
+
+Requires:	budgie-applet-app-launcher
+Requires:	budgie-applet-brightness-controller
+Requires:	budgie-applet-clockworks
+Requires:	budgie-applet-countdown
+Requires:	budgie-applet-dropby
+Requires:	budgie-applet-fuzzyclock
+Requires:	budgie-applet-hotcorners
+Requires:	budgie-applet-kangaroo
+Requires:	budgie-applet-keyboard-autoswitch
+Requires:	budgie-applet-network-manager
+Requires:	budgie-applet-quickchar
+Requires:	budgie-applet-quicknote
+Requires:	budgie-applet-recentlyused
+Requires:	budgie-applet-rotation-lock
+Requires:	budgie-applet-showtime
+Requires:	budgie-applet-takeabreak
+Requires:	budgie-applet-visualspace
+Requires:	budgie-applet-wallstreet
+Requires:	budgie-applet-window-shuffler
+Requires:	budgie-applet-workspace-stopwatch
+Requires:	budgie-applet-wpreviews
+Requires:	budgie-applet-wswitcher
 # Fix for https://github.com/UbuntuBudgie/budgie-extras/issues/233, don't know how stenstorp did not notice this
-Requires:       xinput
+Requires:   xinput

 %description
 This is part of a suite of python3 and Vala based applets for the Budgie
 Desktop that provide additional user orientated capabilities.
 The applets can be used individually or as a set.

-%package        common
-Requires:       budgie-desktop
-Summary:        Shared component of budgie-extras applets
-BuildArch:      noarch
-%description	  common
+%package	common
+Requires:	budgie-desktop
+Summary:	Shared component of budgie-extras applets
+BuildArch:	noarch
+%description	common
 The shared component provides for capabilities that are utilised between
 budgie-extra applets.

-%package        daemon
-Summary:        Manages keyboard shortcuts
-Requires:       budgie-extras-common
-%description    daemon
+%package	daemon
+Summary:	Manages keyboard shortcuts
+Requires:	budgie-extras-common
+%description	daemon
 This on logon process manages keyboard shortcuts delivered via .bde files for
 various extras-plugins.

 %package -n	budgie-applet-app-launcher
-Requires:       budgie-extras-common
-Summary:        Applet to provide an alternative means to launch applications
+Requires:	budgie-extras-common
+Summary:	Applet to provide an alternative means to launch applications
 %description -n	budgie-applet-app-launcher
 The app-launcher applet allows the ability to add favorite apps to the
 panel as well as finding and launching applications.  The list of
 applications listed can be easily configured to be visible or hidden.

 %package -n	budgie-applet-applications-menu
-Requires:       budgie-extras-common
-Summary:        Lightweight and stylish app launcher
+Requires:	budgie-extras-common
+Summary:	Lightweight and stylish app launcher
 %description -n	budgie-applet-applications-menu
 %{summary}

 %package -n	budgie-applet-brightness-controller
-Requires:       budgie-extras-common
-Summary:        A Budgie Desktop applet for productivity
+Requires:	budgie-extras-common
+Summary:	A Budgie Desktop applet for productivity
 %description -n	budgie-applet-brightness-controller
 %{summary}

 %package -n	budgie-applet-clockworks
-Requires:       budgie-extras-common
-Summary:        Applet to display clock across multiple time zones
+Requires:	budgie-extras-common
+Summary:	Applet to display clock across multiple time zones
 %description -n	budgie-applet-clockworks
 The Clockworks applet displays the current time across multiple
 time zones.

 %package -n	budgie-applet-countdown
-Requires:       budgie-extras-common
-Summary:        Applet providing a countdown capability on the Budgie Desktop
+Requires:	budgie-extras-common
+Summary:	Applet providing a countdown capability on the Budgie Desktop
 %description -n	budgie-applet-countdown
 The Countdown applet provides the user the ability to start an
 action when the countdown reaches 0 seconds. Actions include flashing
@@ -116,8 +116,8 @@ an icon in the panel, opening a notification window, sounding a
 bell or running a custom command.

 %package -n	budgie-applet-dropby
-Requires:       budgie-extras-common
-Summary:        Applet to popup when a USB device is connected
+Requires:	budgie-extras-common
+Summary:	Applet to popup when a USB device is connected
 %description -n	budgie-applet-dropby
 The DropBy applet pops up in the panel when connecting a usb device.
 The applet subsequently offers the option(s) to mount, unmount/eject
@@ -125,29 +125,29 @@ and in case of a flash drive, to make a local copy of the drive's
 content. The info shows the free space on the volume.

 %package -n	budgie-applet-fuzzyclock
-Requires:       budgie-extras-common
-Summary:        Shows the time in a Fuzzy Way
+Requires:	budgie-extras-common
+Summary:	Shows the time in a Fuzzy Way
 %description -n	budgie-applet-fuzzyclock
 %{summary}

 %package -n	budgie-applet-hotcorners
-Requires:       budgie-extras-common
-Summary:        Applet providing hotcorners capabilities for the Budgie Desktop
+Requires:	budgie-extras-common
+Summary:	Applet providing hotcorners capabilities for the Budgie Desktop
 %description -n	budgie-applet-hotcorners
 The hotcorners applet allow user defined commands to be executed
 when the mouse cursor is pushed into a corner of the main desktop.

 %package -n	budgie-applet-kangaroo
-Requires:       budgie-extras-common
-Summary:        Applet to allow quick file-browsing
+Requires:	budgie-extras-common
+Summary:	Applet to allow quick file-browsing
 %description -n	budgie-applet-kangaroo
 The kangaroo applet allows for quick & easy browsing, across
 (possibly) many directory layers, without having to do a single mouse
 click.

 %package -n	budgie-applet-keyboard-autoswitch
-Requires:       budgie-extras-common
-Summary:        Applet adding the ability to set a different keyboard layout per application
+Requires:	budgie-extras-common
+Summary:	Applet adding the ability to set a different keyboard layout per application
 %description -n	budgie-applet-keyboard-autoswitch
 The Keyboard Auto Switcher applet provides the user the ability to set
 a different keyboard layout per application. Exceptions to the default
@@ -155,51 +155,50 @@ layout can be set by simply choosing a different layout using the
 Keyboard Layout applet.

 %package -n	budgie-applet-network-manager
-Requires:       budgie-extras-common
-Summary:        A fork of Wingpanel Network Indicator, ported to budgie desktop
+Requires:	budgie-extras-common
+Summary:	A fork of Wingpanel Network Indicator, ported to budgie desktop
 %description -n	budgie-applet-network-manager
 %{summary}

 %package -n	budgie-applet-quickchar
-Requires:       budgie-extras-common
-Requires:       budgie-extras-daemon
-Summary:        A mini-app to quickly choose and insert equivalents of ascii characters
+Requires:	budgie-extras-common
+Summary:	A mini-app to quickly choose and insert equivalents of ascii characters
 %description -n	budgie-applet-quickchar
 QuickChar is a mini-app to quickly choose and insert equivalents of ascii
 characters. QuickChar is activated via the Budgie Menu.

 %package -n	budgie-applet-quicknote
-Requires:       budgie-extras-common
-Summary:        Applet providing simple notes capability for the Budgie Desktop
+Requires:	budgie-extras-common
+Summary:	Applet providing simple notes capability for the Budgie Desktop
 %description -n	budgie-applet-quicknote
 The quicknote applet allows a user to record a text based note.
 The applet supports multiple undo and redo capabilities.

 %package -n	budgie-applet-recentlyused
-Requires:       budgie-extras-common
-Summary:        Applet displays files recently accessed for the Budgie Desktop
+Requires:	budgie-extras-common
+Summary:	Applet displays files recently accessed for the Budgie Desktop
 %description -n	budgie-applet-recentlyused
 The recentlyused applet displays the users files that have been opened
 or created within a configurable period of time.

 %package -n	budgie-applet-rotation-lock
-Requires:       budgie-extras-common
-Summary:        Applet to lock or unlock the screen rotation
+Requires:	budgie-extras-common
+Summary:	Applet to lock or unlock the screen rotation
 %description -n	budgie-applet-rotation-lock
 The Rotation Lock applet provides the user an easy way to lock or
 unlock the screen rotation.

 %package -n	budgie-applet-showtime
-Requires:       budgie-extras-common
-Summary:        Applet displaying date and time on the Budgie Desktop
+Requires:	budgie-extras-common
+Summary:	Applet displaying date and time on the Budgie Desktop
 %description -n	budgie-applet-showtime
 The ShowTime applet is a digital desktop clock, showing time and/or
 date.  Text color of both the displayed time and date can be set
 separately from the applet's menu

 %package -n	budgie-applet-takeabreak
-Requires:       budgie-extras-common
-Summary:        A pomodoro-like applet, to make sure to take regular breaks from working
+Requires:	budgie-extras-common
+Summary:	A pomodoro-like applet, to make sure to take regular breaks from working
 %description -n	budgie-applet-takeabreak
 Budgie TakeaBreak is a pomodoro- like applet, to make sure to take regular
 breaks from working. Options from Budgie Settings include turning the screen
@@ -208,36 +207,35 @@ time. The applet can be accessed quickly from the panel to temporarily switch
 it off.

 %package -n	budgie-applet-visualspace
-Requires:       budgie-extras-common
-Summary:        Shows the current workspace(s), as bullet(s)
+Requires:	budgie-extras-common
+Summary:	Shows the current workspace(s), as bullet(s)
 %description -n	budgie-applet-visualspace
 Budgie VisualSpace shows the current workspace(s), as bullet(s). The applet
 includes a menu to navigate to either one of the windows or their
 corresponding workspace.

 %package -n	budgie-applet-wallstreet
-Requires:       budgie-extras-common
-Summary:        A mini-app to switch wallpapers on regular intervalls
+Requires:	budgie-extras-common
+Summary:	A mini-app to switch wallpapers on regular intervalls
 %description -n	budgie-applet-wallstreet
 Budgie WallStreet is a mini-app to switch wallpapers on regular intervalls.

 %package -n	budgie-applet-weathershow
-Requires:       budgie-extras-common
-Summary:        Applet to display the weather and forecast
+Requires:	budgie-extras-common
+Summary:	Applet to display the weather and forecast
 %description -n	budgie-applet-weathershow
 The weathershow applet displays daily and three hourly weather
 forecasts on both the desktop and a Popover.

 %package -n	budgie-applet-window-shuffler
-Requires:       budgie-extras-common
-Requires:       budgie-extras-daemon
-Summary:        Budgie Window Shuffler
+Requires:	budgie-extras-common
+Summary:	Budgie Window Shuffler
 %description -n	budgie-applet-window-shuffler
 %{summary}

 %package -n	budgie-applet-workspace-stopwatch
-Requires:       budgie-extras-common
-Summary:        An applet to keep track of usage per workspace
+Requires:	budgie-extras-common
+Summary:	An applet to keep track of usage per workspace
 %description -n	budgie-applet-workspace-stopwatch
 Workspace Timer Applet is an applet to keep track of usage per workspace, e.g.
 to find out how much minutes/hours were actually spent on a job. Workspaces can
@@ -247,16 +245,14 @@ onworkspace switch/clicking the icon for popup or else every 30 seconds. Time
 during suspend is automatically retracted from a workspace' time.

 %package -n	budgie-applet-wpreviews
-Requires:       budgie-extras-common
-Requires:       budgie-extras-daemon
+Requires:	budgie-extras-common
 Summary:	Applet providing window previews capabilities for the Budgie Desktop
 %description -n	budgie-applet-wpreviews
 The Previews applet shows an overview of windows in an expose like way.

 %package -n	budgie-applet-wswitcher
-Requires:       budgie-extras-common
-Requires:       budgie-extras-daemon
-Summary:        An applet to show a different wallpaper on each of the workspaces
+Requires:	budgie-extras-common
+Summary:	An applet to show a different wallpaper on each of the workspaces
 %description -n	budgie-applet-wswitcher
 Budgie Wallpaper Workspace Switcher is an application (applet) to show a
 different wallpaper on each of the workspaces. Usage is simple: add the applet
@@ -277,8 +273,6 @@ workspaces.
 # Remove absolute symlink and replace with relative symlink
 rm -f %{buildroot}%{_bindir}/quickchar

-%fdupes %_libdir/budgie-desktop/plugins/budgie-weathershow/weather_icons
-
 %post

 %{__ln_s} -fv %{_bindir}/quickchar %{_libdir}/quickchar/quickchar
@@ -14,7 +14,6 @@ Patch1:         gtk-extents.patch
 Patch2:         focus-prevention-disable.patch

 Conflicts:     compiz
-BuildRequires: rpm_macro(fdupes)
 BuildRequires: libX11-devel
 BuildRequires: libdrm-devel
 BuildRequires: libXcursor-devel
@@ -104,9 +103,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 mkdir -p %{buildroot}%{_datadir}/compiz/icons/hicolor/{scalable/{apps,\
 categories},22x22/{categories,devices,mimetypes}}

-%fdupes %buildroot%_datadir/glib-2.0/schemas/
-%fdupes %buildroot%_datadir/ccsm/icons/hicolor/scalable/apps/
-

 %files -f compiz.lang
 %doc AUTHORS README NEWS
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "ctwm.spec"
-	}
-}
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=CTWM
-Comment=Claude's Tab Window Manager
-TryExec=ctwm
-Exec=ctwm
-Type=Xsession
-Encoding=UTF-8
@@ -1,55 +0,0 @@
-Summary: Lightweight window manager with virtual workspaces
-Name: ctwm
-Version: 4.1.0
-Release: 1%?dist
-URL: https://ctwm.org
-BuildRequires: libjpeg-turbo-devel libX11-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXrandr-devel cmake gcc m4
-Source0: https://www.ctwm.org/dist/%{name}-%{version}.tar.xz
-Source1: %{name}.desktop
-License: MIT
-Requires: m4 
-# Derived from RPMSphere's packaging
-
-%description
-CTWM is a window manager based on TWM (with virtual workspaces added).
-
-%prep
-%setup -q
-
-%build
-%cmake
-%cmake_build
-
-%install
-%cmake_install
-%{__install} -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/%{name}.desktop
-
-%files
-%doc README.md CHANGES.md
-%license COPYRIGHT
-%{_bindir}/%{name}
-%{_mandir}/man1/%{name}*
-%{_datadir}/xsessions/%{name}.desktop
-%{_datadir}/ctwm
-%{_datadir}/doc/ctwm/ctwm.1.html
-%{_datadir}/examples/ctwm/system.ctwmrc
-
-%changelog
-* Tue Dec 17 2024 Owen Zimmerman <owen@fyralabs.com>
- Add .desktop and .rhai file, fix dependancies, and switch to .tar.xz source (smaller download)
-* Thu Jun 27 2024 Jaiden Riordan <jade@fyralabs.com> - 4.1.0
- Rewrite for Terra, Thanks RPMSphere
-* Tue Dec 24 2019 Wei-Lun Chao <bluebat@member.fsf.org> - 4.0.3
- Rebuilt for Fedora
-* Sat Apr  9 2011 Agnelo de la Crotche <agnelo@unixversal.com>
- package for openSUSE 11.3/11.4
-* Thu Feb 16 2006 Richard Levitte <richard@levitte.org>
- Release ctwm 3.8a.
-* Wed May  4 2005 Rudolph T Maceyko <rm55@pobox.com>
- Tweaks.  Added all .ctwmrc files as well as sound and VMS docs.
-* Wed May  4 2005 Richard Levitte <richard@levitte.org>
- Changed some directory specifications to RedHat-ish standards.
-* Tue May  3 2005 Richard Levitte <richard@levitte.org>
- Received the original from Johan Vromans. Adjusted it to become
-  an official .spec file.
-  
@@ -1 +0,0 @@
-rpm.version(find("<p>Current release: ([\\d.]+)</p>", get("https://www.ctwm.org/download.html"), 1));
@@ -11,16 +11,15 @@ URL:            https://github.com/fthx/appmenu-is-back
 BuildArch:      noarch

 Source0:        https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz
-Patch0:         https://github.com/fthx/appmenu-is-back/compare/v2..703a31acf900eb7bcab3462baeefa815ec7f13ab.patch

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

 %description
 This extension brings back the app menu in the top panel, for GNOME 45 and later.

 %prep
-%autosetup -n appmenu-is-back-%{version} -p1
+%autosetup -n appmenu-is-back-%{version}

 %install
 install -Dm644 metadata.json %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/metadata.json
@@ -0,0 +1,34 @@
+From 3f8b19139bf3f13b4285fd9d949cb5460a0909df Mon Sep 17 00:00:00 2001
+From: Carl George <carl@george.computer>
+Date: Fri, 25 Jun 2021 22:26:50 -0500
+Subject: [PATCH] Remove schema handling from transpile.sh
+
+---
+ scripts/transpile.sh | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/scripts/transpile.sh b/scripts/transpile.sh
+index e619a8c..8977c29 100755
+--- a/scripts/transpile.sh
+++ b/scripts/transpile.sh
+@@ -15,8 +15,6 @@ transpile() {
+ 
+ rm -rf _build
+ 
+-glib-compile-schemas schemas &
+-
+ # Transpile to JavaScript
+ 
+ for proj in ${PROJECTS}; do
+@@ -30,7 +28,7 @@ wait
+ 
+ # Convert JS to GJS-compatible scripts
+ 
+-cp -r metadata.json icons schemas *.css _build &
+cp -r metadata.json icons *.css _build &
+ 
+ for src in $(find target -name '*.js'); do
+     dest=$(echo "$src" | sed s#target#_build#g)
+-- 
+2.31.1
+
@@ -0,0 +1,18 @@
+[org.gnome.desktop.wm.keybindings]
+close = ['<Alt>F4', '<Super>q']
+maximize = []
+minimize = []
+move-to-monitor-down = []
+move-to-monitor-left = []
+move-to-monitor-right = []
+move-to-monitor-up = []
+move-to-workspace-down = []
+move-to-workspace-left = []
+move-to-workspace-right = []
+move-to-workspace-up = []
+switch-to-workspace-down = ['<Primary><Super>Down', '<Primary><Super>KP_Down', '<Primary><Super>j']
+switch-to-workspace-left = []
+switch-to-workspace-right = []
+switch-to-workspace-up = ['<Primary><Super>Up', '<Primary><Super>KP_Up', '<Primary><Super>k']
+toggle-maximized = ['<Super>m']
+unmaximize = []
@@ -0,0 +1,7 @@
+[org.gnome.mutter:GNOME]
+attach-modal-dialogs = false
+workspaces-only-on-primary = false
+
+[org.gnome.mutter.keybindings]
+toggle-tiled-left = ['<Primary><Super>Left', '<Primary><Super>KP_Left', '<Primary><Super>h']
+toggle-tiled-right = ['<Primary><Super>Right', '<Primary><Super>KP_Right', '<Primary><Super>l']
@@ -0,0 +1,2 @@
+[org.gnome.mutter.wayland.keybindings]
+restore-shortcuts = []
@@ -0,0 +1,6 @@
+[org.gnome.settings-daemon.plugins.media-keys]
+email = ['<Super>e']
+home = ['<Super>f']
+screensaver = ['<Super>Escape']
+www = ['<Super>b']
+rotate-video-lock-static = ['XF86RotationLockToggle']
@@ -0,0 +1,18 @@
+[org.gnome.shell.keybindings]
+open-application-menu = []
+shift-overview-down = []
+shift-overview-up = []
+switch-to-application-1 = []
+switch-to-application-2 = []
+switch-to-application-3 = []
+switch-to-application-4 = []
+switch-to-application-5 = []
+switch-to-application-6 = []
+switch-to-application-7 = []
+switch-to-application-8 = []
+switch-to-application-9 = []
+toggle-message-tray = ['<Super>v']
+
+[org.gnome.shell.overrides]
+attach-modal-dialogs = false
+workspaces-only-on-primary = false
@@ -0,0 +1,8 @@
+project pkg {
+    rpm {
+        spec = "terra-gnome-shell-extension-pop-shell.spec"
+    }
+    labels {
+        nightly = "1"
+    }
+}
@@ -0,0 +1,90 @@
+# from Fedora upstream
+%global extension   pop-shell
+%global uuid        %{extension}@system76.com
+%global commit      cfa0c55e84b7ce339e5ce83832f76fee17e99d51
+%global shortcommit %{lua:print(macros.commit:sub(1,7))}
+%global commit_date 20240404
+%global ver         1.2.0
+
+Name:           terra-gnome-shell-extension-%{extension}
+Version:        %{ver}^%commit_date.%{shortcommit}
+Release:        1%?dist
+Summary:        GNOME Shell extension for advanced tiling window management
+License:        GPL-3.0-only
+URL:            https://github.com/pop-os/shell
+BuildArch:      noarch
+
+Source0:        %{url}/archive/%{commit}/%{extension}-%{shortcommit}.tar.gz
+Source1:        50_org.gnome.desktop.wm.keybindings.%{extension}.gschema.override
+Source2:        50_org.gnome.mutter.%{extension}.gschema.override
+Source3:        50_org.gnome.mutter.wayland.%{extension}.gschema.override
+Source4:        50_org.gnome.settings-daemon.plugins.media-keys.%{extension}.gschema.override
+Source5:        50_org.gnome.shell.%{extension}.gschema.override
+# downstream-only
+Patch0:         0001-Remove-schema-handling-from-transpile.sh.patch
+
+BuildRequires:  typescript >= 3.8
+BuildRequires:  make
+
+Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
+Recommends:     gnome-extensions-app
+Recommends:     %{name}-shortcut-overrides = %{version}-%{release}
+Provides:       %{extension} = %{version}-%{release}
+
+
+%description
+Pop Shell is a keyboard-driven layer for GNOME Shell which allows for quick and
+sensible navigation and management of windows.  The core feature of Pop Shell
+is the addition of advanced tiling window management - a feature that has been
+highly sought within our community.  For many - ourselves included - i3wm has
+become the leading competitor to the GNOME desktop.
+
+
+%package shortcut-overrides
+Summary:        Shortcut overrides for %{name}
+
+
+%description shortcut-overrides
+Shortcut overrides for %{name}.
+
+
+%prep
+%autosetup -p 1 -n shell-%{commit}
+
+
+%build
+%make_build compile
+
+
+%install
+# install main extension files
+%make_install
+
+# install the schema file
+install -D -p -m 0644 \
+    schemas/org.gnome.shell.extensions.%{extension}.gschema.xml \
+    %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml
+
+# install the gnome-control-center keybindings
+install -d -m 0755 %{buildroot}%{_datadir}/gnome-control-center/keybindings
+install -p -m 0644 keybindings/*.xml %{buildroot}%{_datadir}/gnome-control-center/keybindings/
+
+# install the schema override files
+install -d -m 0755 %{buildroot}%{_datadir}/glib-2.0/schemas
+install -p -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{buildroot}%{_datadir}/glib-2.0/schemas/
+
+
+%files
+%license LICENSE
+%doc README.md
+%{_datadir}/gnome-shell/extensions/%{uuid}
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml
+%{_datadir}/gnome-control-center/keybindings/*.xml
+
+
+%files shortcut-overrides
+%{_datadir}/glib-2.0/schemas/*.%{extension}.gschema.override
+
+
+%changelog
+%autochangelog
@@ -1,6 +1,7 @@
 if filters.contains("nightly") {
-  rpm.global("commit", gh_commit("Ultramarine-Linux/duet-quirks"));
+  rpm.global("commit", gh_commit("pop-os/shell"));
  if rpm.changed() {
+    rpm.global("ver", gh("pop-os/shell"));
    rpm.release();
    rpm.global("commit_date", date());
  }
@@ -1,6 +1,6 @@
 Name:		kde-liquidshell
-Version:	1.10.0
-Release:	1%?dist
+Version:	1.9.0
+Release:	%autorelease
 Summary:	Basic desktop shell using QtWidgets
 Provides:	liquidshell = %version

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

-%global commit f79594dd01d4ff4d7e86ac7bf70d1c371d6d9e4e
+%global commit 4f1c08054b1f975176375f615cf9d2470f7ec7ed
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "lightdm-kde-greeter.spec"
-    }
-}
@@ -1,92 +0,0 @@
-%global commit c3f01539e3b036ae940e678f5739b37ca0300ce2
-
-Name:           lightdm-kde-greeter
-Version:        6.0.2
-Release:        1%?dist
-Summary:        Login screen using the LightDM framework
-License:        GPL-3.0-or-later
-URL:            https://invent.kde.org/plasma/%name
-Source0:        %url/-/archive/v%version.tar.gz
-Packager:       madonuko <mado@fyralabs.com>
-BuildRequires:  gcc gcc-c++ mold
-BuildRequires:  cmake extra-cmake-modules
-BuildRequires:  cmake(Qt6Core5Compat)
-BuildRequires:  cmake(Qt6ShaderTools)
-BuildRequires:  cmake(Qt6Qml)
-BuildRequires:  cmake(KF6IconThemes)
-BuildRequires:  cmake(KF6KCMUtils)
-BuildRequires:  cmake(KF6Package)
-BuildRequires:  cmake(KF6ConfigWidgets)
-BuildRequires:  cmake(KF6I18n)
-BuildRequires:  cmake(KF6Auth)
-BuildRequires:  cmake(KF6NetworkManagerQt)
-BuildRequires:  cmake(Plasma)
-BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(liblightdm-gobject-1)
-BuildRequires:  systemd-rpm-macros
-Requires: lightdm
-Requires: plasma-workspace-qml
-Requires: polkit
-Provides: lightdm-greeter
-
-%description
-%summary.
-
-
-%prep
-# why the heck do you torture me for godsake.
-%autosetup -n %name-v%version-%commit
-sed 's/sbin/bin/' -i greeter/CMakeLists.txt
-
-
-%build
-export LDFLAGS="$LDFLAGS -fuse-ld=mold"
-%cmake_kf6 \
-	-DGREETER_WAYLAND_SESSIONS_FIRST=ON \
-	-DGREETER_IMAGES_DIR=%_sharedstatedir/%name/images \
-	-DBUILD_TESTING=OFF
-%cmake_build
-
-
-%install
-%cmake_install
-
-%find_lang kcm_lightdm           --with-kde
-%find_lang lightdm_kde_greeter   --with-kde
-%find_lang lightdm_theme_userbar --with-kde
-
-# FIXME: why does it installs to the wrong dir
-mv %buildroot/%name %buildroot%_datadir/
-mkdir -p %buildroot%_sharedstatedir/%name
-
-%post
-%systemd_user_post %name-wifikeeper.service
-
-%preun
-%systemd_user_preun %name-wifikeeper.service
-
-%postun
-%systemd_user_postun_with_restart %name-wifikeeper.service
-
-
-%files -f kcm_lightdm.lang -f lightdm_kde_greeter.lang -f lightdm_theme_userbar.lang
-%doc README.md
-%license COPYING.GPL3
-%config(noreplace) %_sysconfdir/lightdm/%name.conf
-%dir %_sharedstatedir/%name
-%_bindir/%name
-%_bindir/lightdm-kde-greeter-rootimage
-%_bindir/lightdm-kde-greeter-wifikeeper
-%_datadir/applications/kcm_lightdm.desktop
-%_datadir/dbus-1/system-services/org.kde.kcontrol.kcmlightdm.service
-%_datadir/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf
-%_datadir/polkit-1/actions/org.kde.kcontrol.kcmlightdm.policy
-%_datadir/xgreeters/lightdm-kde-greeter.desktop
-%_datadir/%name/
-%_kf6_libexecdir/kauth/kcmlightdmhelper
-%_qt6_plugindir/plasma/kcms/systemsettings/kcm_lightdm.so
-%_userunitdir/lightdm-kde-greeter-wifikeeper.service
-
-%changelog
-* Tue Dec 24 2024 madonuko <mado@fyralabs.com> - 6.0.1-1
- Initial package
@@ -1,5 +0,0 @@
-let v = gitlab_tag("invent.kde.org", "2512");
-rpm.version(v);
-if rpm.changed() {
-    rpm.global("commit", get(`https://invent.kde.org/api/v4/projects/2512/repository/tags/${v}`).json().commit.id);
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`rpm.version(find("<p>Current release: ([\\d.]+)</p>", get("https://www.ctwm.org/download.html"), 1));`