bump: gradle

suppress failures for x86_64-specific commands

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 2e846d06cf)

Co-authored-by: madomado <madonuko@outlook.com>

.github/workflows/autobuild.yml

@@ -6,13 +6,13 @@ on:
     paths:
       - anda/**
     branches:
-      - f39
+      - f38
   pull_request:
     branches:
-      - f39
+      - f38
   merge_group:
     branches:
-      - f39
+      - f38
   workflow_dispatch:
   workflow_call:
 
@@ -23,13 +23,13 @@ jobs:
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Set workspace as safe
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Generate build matrix
@@ -40,15 +40,15 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["39"]
+        version: ["38"]
       fail-fast: false
-    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up git repository
@@ -68,13 +68,10 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          path: anda-build/rpm/rpms/*
 
       - name: Upload packages to subatomic
         if: github.event_name == 'push'
@@ -84,14 +81,6 @@ jobs:
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ 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 }}-source anda-build/rpm/srpm/*
-
       - name: Notify Madoguchi (Success)
         if: success() && github.event_name == 'push'
         run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}

.github/workflows/bootstrap.yml

@@ -7,55 +7,71 @@ jobs:
   bootstrap:
     strategy:
       matrix:
-        version: ["39"]
+        version: ["38"]
         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: fedora:38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
-      - name: Install repositories
-        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs
-
-      - name: Install Anda
-        run: cargo install anda
-
-      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v3
         with:
-          ref: f${{ matrix.version }}
+          go-version: "^1.19"
+
+      - name: Install repositories
+        run: |
+          sudo dnf install -y dnf-plugins-core
+          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+          sudo dnf install -y mock createrepo_c rpm-build gcc curl wget git-core openssl-devel
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install Anda
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: anda
+
+
+      - uses: actions/checkout@v3
+        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 -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg -p rpm
       - name: Install terra-mock-configs
-        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
-
-      - name: Build anda-srpm-macros
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/terra/srpm-macros/pkg
+        run: sudo dnf install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
 
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/subatomic
+          set-safe-directory: true
+          fetch-depth: 1
+      
       - name: Build Subatomic
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/subatomic/pkg
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
       - name: Install Subatomic
-        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+        run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+
+
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/anda
+          fetch-depth: 1
 
       - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm
 
-      - name: Upload packages to subatomic
+
+      - name: Upload to Subatomic
         run: |
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ 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 }}-source anda-build/rpm/srpm/*

.github/workflows/build.yml

@@ -5,57 +5,32 @@ on:
       packages:
         description: "Packages to Build"
         required: true
-      custom_builder:
-        description: "Custom Builder"
-        required: false
-        default: ""
-      architecture:
-        description: "Architecture"
-        required: false
-        default: all
-        type: string
-    
-
 
 jobs:
   parse:
     outputs:
       pkgs: ${{ steps.parsing.outputs.pkgs }}
-      builder: ${{ inputs.custom_builder }}
-      arch: ${{ steps.parsing.outputs.arch }}
     runs-on: "ubuntu-latest"
     steps:
       - name: Parse Input
         id: parsing
-        run: |
-            echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
-            echo "builder=${{ inputs.custom_builder }}" >> $GITHUB_OUTPUT
-            arch="${{ inputs.architecture }}"
-            # Convert to json array using jq
-            # if arch is not all, convert to array
-            if [ "$arch" != "all" ]; then
-              # jq, array with single element as string
-               arch=$(echo $arch | sed 's/,/\n/g')
-               echo "arch=$(echo $arch | jq -Rs 'split("\n")' | jq 'map(select(length > 0))' | jq -c .)" >> $GITHUB_OUTPUT
-            else
-               echo "arch=$(echo '["aarch64", "x86_64"]' | jq -c .)" >> $GITHUB_OUTPUT
-            fi
+        run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
 
   build:
     needs: parse
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["39"]
-        arch: ${{ fromJson(needs.parse.outputs.arch) }}
+        version: ["38"]
+        arch: ["x86_64", "aarch64"]
       fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up git repository
@@ -63,7 +38,7 @@ jobs:
 
       - name: Cache buildroot
         id: br-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: /var/cache
           key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
@@ -78,13 +53,10 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          path: anda-build/rpm/rpms/*
 
       - name: Upload packages to subatomic
         run: |
@@ -93,16 +65,9 @@ jobs:
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ 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 }}-source anda-build/rpm/srpm/*
-
       - name: Notify Madoguchi (Success)
-        if: success()
+        if: success() && github.event_name == 'push'
         run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
       - name: Notify Madoguchi (Failure)
-        if: cancelled() || failure()
+        if: ( cancelled() || failure() ) && github.event_name == 'push'
         run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}

.github/workflows/json-build.yml

@@ -11,15 +11,15 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(inputs.packages) }}
-        version: ["39"]
+        version: ["38"]
       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:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up git repository
@@ -27,7 +27,7 @@ jobs:
 
       - name: Cache buildroot
         id: br-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: /var/cache
           key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
@@ -42,13 +42,10 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          path: anda-build/rpm/rpms/*
 
       - name: Upload packages to subatomic
         run: |
@@ -57,17 +54,9 @@ jobs:
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ 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 }}-source anda-build/rpm/srpm/*
-
       - name: Notify Madoguchi (Success)
-        if: success()
+        if: success() && github.event_name == 'push'
         run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
       - name: Notify Madoguchi (Failure)
-        if: cancelled() || failure()
+        if: ( cancelled() || failure() ) && github.event_name == 'push'
         run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}

.github/workflows/lint.yml

@@ -3,20 +3,20 @@ name: Lint
 on:
   push:
     branches:
-      - f39
+      - f38
   pull_request:
     branches:
-      - f39
+      - f38
   merge_group:
     branches:
-      - f39
+      - f38
 jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Lint spec files
         run: rpmlint $(find anda -type f -name "*.spec" -type f)

.github/workflows/sync.yml.bak

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

.github/workflows/update-comps.yml

@@ -3,7 +3,6 @@ name: Push comps updates
 on:
   push:
     branches:
-      - f39
       - f38
       - f37
     paths:
@@ -14,9 +13,9 @@ jobs:
   update-comps:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Push to subatomic
         run: |
           branch=${{ github.ref_name }}

.github/workflows/update-nightly.yml

@@ -8,11 +8,11 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -46,8 +46,7 @@ jobs:
               git add *
               git commit -S -a -m "$msg"
             }
-            copy_over f38 || true
-            copy_over f40 || true
-            copy_over frawhide || true
+            copy_over f37 || true
+            copy_over f39 || true
             git push -u origin --all
           fi

.github/workflows/update.yml

@@ -8,11 +8,11 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -47,8 +47,7 @@ jobs:
               git add *
               git commit -S -a -m "$msg"
             }
-            copy_over f38 || true
-            copy_over f40 || true
-            copy_over frawhide || true
+            copy_over f37 || true
+            copy_over f39 || true
             git push -u origin --all
           fi

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Contributing
 
-First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documentation](https://developer.fyralabs.com/terra), our guidelines may be found there. See the links below:
+First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documention](https://github.com/terrapkg/packages/wiki), our guidelines may be found there. See the links below:
 
-* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
-* [FAQ](https://developer.fyralabs.com/terra/faq)
-* [Policy](https://developer.fyralabs.com/terra/policy)
+* [Contribution Guide](https://github.com/terrapkg/packages/wiki/Contribute)
+* [FAQ](https://github.com/terrapkg/packages/wiki/FAQ)
+* [Policy](https://github.com/terrapkg/packages/wiki/Policy)

SECURITY.md

@@ -3,7 +3,7 @@
 ## Our Process
 
 Fyra Labs is committed to ensuring user security and privacy.
-As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://developer.fyralabs.com/terra/faq#technical-details).
+As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://github.com/terrapkg/packages/wiki/FAQ#technical-details).
 
 As a part of Fyra Labs's transparency measures, we will publicize details of any known breaches. This information will include, but will not be limited to:
 * Affected users, infrastructure, and data.
@@ -11,7 +11,7 @@ As a part of Fyra Labs's transparency measures, we will publicize details of any
 * An in-depth explanation of how the breach occurred, including relevant security vulnerabilities.
 * How Fyra Labs will better protect user data in the future, ensuring our commitment to security and privacy.
 
-We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs), [Fedi](https://fedi.fyralabs.com/@hq), and [Discord](https://discord.gg/5fdPuxTg5Q).
+We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs) and [Discord](https://discord.gg/5fdPuxTg5Q).
 
 ## Reporting a Vulnerability
 

anda/apps/anki-bin/anki-bin.spec

@@ -1,5 +1,5 @@
 Name:			anki-bin
-Version:		24.06.3
+Version:		24.04.1
 Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5

anda/apps/anki-qt5/anki-qt5.spec

@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        24.06.3
+Version:        24.04.1
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -22,7 +22,7 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %version
-%patch 1 -p1
+%patch1 -p1
 
 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
 

anda/apps/anki/anki.spec

@@ -1,5 +1,5 @@
 Name:           anki
-Version:        24.06.3
+Version:        24.04.1
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -20,10 +20,8 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.
 
 %prep
-rm -rf *
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
-%patch 0 -p1
 
 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki
 

anda/apps/armcord-bin/armcord-bin.spec

@@ -26,7 +26,6 @@ Source2:		https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
 Requires:		electron xdg-utils
 ExclusiveArch:	x86_64 aarch64 armv7l
 Conflicts:		armcord
-BuildRequires:	add-determinism
 
 %description
 ArmCord is a custom client designed to enhance your Discord experience

anda/apps/armcord/armcord.spec

@@ -9,7 +9,7 @@ URL:		https://github.com/ArmCord/ArmCord
 Group:		Applications/Internet
 Source1:	launch.sh
 Requires:	electron xdg-utils
-BuildRequires:	nodejs-npm git add-determinism
+BuildRequires:	nodejs-npm git
 Conflicts:	armcord-bin
 BuildArch:	noarch
 
@@ -18,7 +18,6 @@ ArmCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.
 
 %prep
-rm -rf *
 git clone %url .
 git checkout v%version
 

anda/apps/discord-canary-openasar/discord-canary-openasar.spec

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

anda/apps/discord-canary/discord-canary.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-canary
-Version:        0.0.452
+Version:        0.0.407
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com

anda/apps/discord-openasar/discord-openasar.spec

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

anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec

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

anda/apps/discord-ptb/discord-ptb.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-ptb
-Version:        0.0.94
+Version:        0.0.86
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com

anda/apps/discord/discord.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:			discord
-Version:		0.0.59
+Version:		0.0.54
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com

anda/apps/envision/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "envision.spec"
-    }
-}

anda/apps/envision/envision.spec

@@ -1,46 +0,0 @@
-%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
-%global commit_date 20240703
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name:           envision
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
-License:        AGPL-3.0-or-later
-URL:            https://gitlab.com/gabmus/envision/
-Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
-BuildRequires:  pkgconfig(glib-2.0) >= 2.66
-BuildRequires:  pkgconfig(gio-2.0) >= 2.66
-BuildRequires:  pkgconfig(gtk4) >= 4.10.0
-BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel-engine
-BuildRequires:  libappstream-glib
-BuildRequires:  desktop-file-utils
-BuildRequires:  glib2-devel
-Recommends:     android-tools
-
-%description
-%summary.
-
-%prep
-%autosetup -n envision-%commit
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/envision
-%_datadir/applications/org.gabmus.envision.desktop
-%_datadir/envision/
-%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
-%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
-%_metainfodir/org.gabmus.envision.appdata.xml

anda/apps/envision/update.rhai

@@ -1,5 +0,0 @@
-rpm.global("commit", gitlab_commit("gitlab.com", "46446166", "main"));
-if rpm.changed() {
-	rpm.global("commit_date", date());
-	rpm.release();
-}

anda/apps/mpv/mpv-nightly.spec

@@ -1,6 +1,6 @@
-%global commit f470b63a04767ada809ae7d0c69c8f9ac4c80628
+%global commit 943a50b300a081bb223325295040846fe435a861
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240712
+%global commit_date 20240504
 %global ver v0.38.0
 
 Name:           mpv-nightly

anda/apps/mugshot/anda.hcl

@@ -1,6 +0,0 @@
-project pkg {
-    arches = ["x86_64"]
-    rpm {
-        spec = "mugshot.spec"
-    }
-}

anda/apps/mugshot/mugshot.spec

@@ -1,62 +0,0 @@
-%global app org.bluesabre.Mugshot
-%global _description %{expand:
-Mugshot is a lightweight user configuration utility for Linux designed for simplicity and ease of
-use. Quickly update your personal profile and sync your updates across applications.}
-
-
-Name:           python-mugshot
-Version:        0.4.3
-Release:        1%?dist
-Summary:        User Management Utility for Linux
-License:        GPL-3.0
-URL:            https://github.com/bluesabre/mugshot
-Source0:        %url/archive/refs/tags/mugshot-%version.tar.gz
-BuildArch:      noarch
-BuildRequires:  python3-devel
-BuildRequires:  python3-pip
-BuildRequires:  python3-distutils-extra
-BuildRequires:  python3-wheel
-BuildRequires:  python3-setuptools
-BuildRequires:  glib2
-BuildRequires:  desktop-file-utils
-BuildRequires:  libappstream-glib
-
-%description %_description
-
-%package -n mugshot
-Requires:       util-linux-user
-Requires:       python3-cairo
-Requires:       python3-pexpect
-Requires:       python3-gobject
-Summary:        User Management Utility for Linux
-
-%description -n mugshot %_description
-
-%prep
-%autosetup -n mugshot-mugshot-%version
-
-%build
-%pyproject_wheel
-
-%install
-%pyproject_install
-%pyproject_save_files -L 'mugshot*'
-install -Dm644 data/glib-2.0/schemas/%{lower:%app}.gschema.xml %buildroot%_datadir/glib-2.0/schemas/
-
-%find_lang mugshot
-
-%check
-#pyproject_check_import
-desktop-file-validate %buildroot%_datadir/applications/%app.desktop
-appstream-util validate-relax --nonet %buildroot%_metainfodir/mugshot.appdata.xml
-
-%files -n mugshot -f %{pyproject_files} -f mugshot.lang
-%doc README.md NEWS
-%license COPYING
-%_bindir/mugshot
-%_datadir/glib-2.0/schemas/%{lower:%app}.gschema.xml
-%_datadir/applications/%app.desktop
-%_datadir/mugshot/
-%_metainfodir/mugshot.appdata.xml
-%_mandir/man1/mugshot.1.gz
-%_iconsdir/hicolor/*/apps/mugshot.svg

anda/apps/mugshot/update.rhai

@@ -1,3 +0,0 @@
-let v = gh("bluesabre/mugshot");
-v.crop(8);
-rpm.version(v);

anda/apps/vencord-desktop/vencord-desktop.spec

@@ -6,7 +6,7 @@
 
 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.3
+Version:	1.5.2
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed

anda/apps/voicevox/voicevox.spec

@@ -1,6 +1,6 @@
 %global nodev 20.12.2
 %global npmv 10.5.0
-%global ver 0.19.2
+%global ver 0.19.1
 %define debug_package %nil
 %global _build_id_links none
 

anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-capnet-assist
 Summary:        Captive Portal Assistant for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.4.4
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/capnet-assist
@@ -21,13 +21,10 @@ BuildRequires:  pkgconfig(gcr-ui-3)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
 BuildRequires:  pkgconfig(webkit2gtk-4.1)
-BuildRequires:  pkgconfig(gcr-4)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(webkitgtk-6.0)
 BuildRequires:  fdupes
 
 Requires:       NetworkManager

anda/desktops/elementary/elementary-photos/elementary-photos.spec

@@ -5,13 +5,16 @@
 
 Name:           elementary-photos
 Summary:        Photo manager and viewer from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.8.0
+Release:        2%?dist
 License:        LGPL-2.0-or-later
 
 URL:            https://github.com/elementary/photos
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
+# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits)
+Patch0:         https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -19,7 +22,6 @@ BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 BuildRequires:  fdupes
 BuildRequires:  git-core
-BuildRequires:  cmake
 
 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
 BuildRequires:  pkgconfig(geocode-glib-2.0)
@@ -41,8 +43,6 @@ BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
-BuildRequires:  pkgconfig(libportal)
-BuildRequires:  pkgconfig(libportal-gtk3)
 
 Requires:       hicolor-icon-theme
 
@@ -53,6 +53,7 @@ Foundation.
 
 %prep
 %autosetup -n %{srcname}-%{version} -N
+git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git
 
 
 %build
@@ -74,10 +75,10 @@ desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}.viewer.desktop
+    %{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
@@ -91,11 +92,11 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/%{appname}/
 
 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/applications/%{appname}.viewer.desktop
+%{_datadir}/applications/%{appname}-viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/icons/hicolor/*/apps/%{appname}.viewer.svg
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
+%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %changelog

anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-shortcut-overlay
 Summary:        Native, OS-wide shortcut overlay
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.0.1
+Release:        %autorelease
 License:        GPL-3.0
 
 URL:            https://github.com/elementary/shortcut-overlay
@@ -49,7 +49,7 @@ desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
@@ -59,7 +59,7 @@ appstream-util validate-relax --nonet \
 %{_bindir}/%{appname}
 
 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %changelog

anda/desktops/elementary/elementary-sideload/elementary-sideload.spec

@@ -3,8 +3,8 @@
  
 Name:           elementary-sideload
 Summary:        Sideload flatpaks on Pantheon
-Version:        6.2.2
-Release:        1%?dist
+Version:        6.2.1
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
  
 URL:            https://github.com/elementary/sideload

anda/desktops/elementary/gala/gala.spec

@@ -3,9 +3,8 @@
 Name:           gala
 Summary:        Gala window manager
 Version:        7.1.3
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
-Epoch:          1
 
 URL:            https://github.com/elementary/gala
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -36,7 +35,7 @@ BuildRequires:  pkgconfig(mutter-clutter-13)
 BuildRequires:  pkgconfig(mutter-cogl-13)
 BuildRequires:  pkgconfig(mutter-cogl-pango-13)
 
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 # gala provides a generic icon (apps/multitasking-view)
 Requires:       hicolor-icon-theme
@@ -62,7 +61,7 @@ This package contains the shared libraries.
 
 %package        devel
 Summary:        Gala window manager development files
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.

anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec

@@ -18,12 +18,10 @@ BuildRequires:  vala >= 0.34.1
 BuildRequires:  fdupes
 
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(polkit-agent-1)
 BuildRequires:  pkgconfig(polkit-gobject-1)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
-BuildRequires:  pkgconfig(gtk4)
 
 %description
 An agent for Polkit authorization designed for Pantheon.
@@ -52,7 +50,7 @@ desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
@@ -64,7 +62,7 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/policykit-1-pantheon/
 
 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %changelog

anda/desktops/elementary/pantheon-tweaks/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "pantheon-tweaks.spec"
+	}
+}

anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec

@@ -0,0 +1,37 @@
+Name:			pantheon-tweaks
+Version:		2.0.2
+Release:		1%?dist
+Summary:		A system settings panel for the Pantheon desktop environment
+License:		GPL-3.0
+URL:			https://github.com/pantheon-tweaks/pantheon-tweaks
+Source0:		%{url}/archive/refs/tags/%{version}.tar.gz
+BuildRequires:	vala switchboard-devel pkgconfig(gee-0.8) pkgconfig(glib-2.0)
+BuildRequires:	granite-devel >= 6.0.0 pkgconfig(gtk+-3.0) meson vala
+Requires:		gtk3 granite
+
+%description
+A system settings panel for the Pantheon Desktop that
+lets you easily and safely customise your desktop's appearance.
+
+%prep
+%autosetup
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%files
+%doc README.md
+%license COPYING
+/usr/lib64/switchboard/personal/libpantheon-tweaks.so
+%{_datadir}/icons/hicolor/32x32/categories/preferences-desktop-tweaks.svg
+%{_datadir}/locale/*/LC_MESSAGES/pantheon-tweaks-plug.mo
+%{_datadir}/metainfo/pantheon-tweaks.metainfo.xml
+
+
+%changelog
+* Tue Jan 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.0.4-1
+- Initial package

anda/desktops/elementary/pantheon-tweaks/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("pantheon-tweaks/pantheon-tweaks"));

anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec

@@ -2,20 +2,16 @@
 
 %global plug_type personal
 %global plug_name pantheon-tweaks
-%global app io.github.pantheon_tweaks.pantheon-tweaks
 
 Name:           switchboard-plug-tweaks
 Summary:        Switchboard Tweaks Plug
 Version:        2.0.2
-Release:        2%?dist
+Release:        1%?dist
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/pantheon-tweaks/pantheon-tweaks
 Source0:        %{url}/archive/%{version}/%{plug_name}-%{version}.tar.gz
 
-Provides:       pantheon-tweaks = %version-%release
-Obsoletes:      pantheon-tweaks < 2.0.2-2
-
 BuildRequires:  gcc
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -26,7 +22,7 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite) >= 6.0.0
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(switchboard-2.0)
 
 Requires:       switchboard%{?_isa}
 
@@ -67,22 +63,28 @@ de trabalho.
 %install
 %meson_install
 
-%find_lang %{plug_name}
+%find_lang %{plug_name}-plug
 
 # remove the specified stock icon from metainfo (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %buildroot%_metainfodir/%app.metainfo.xml
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml
 
 %check
-appstream-util validate-relax --nonet %buildroot%_metainfodir/%app.metainfo.xml
+appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml
 
 
-%files -f %{plug_name}.lang
+%files -f %{plug_name}-plug.lang
 %license COPYING
 %doc README.md
 %doc AUTHORS
 %doc CONTRIBUTORS
 
-%_bindir/pantheon-tweaks
-%_datadir/applications/%app.desktop
-%_iconsdir/hicolor/*/apps/%app.svg
-%_metainfodir/io.github.pantheon_tweaks.pantheon-tweaks.metainfo.xml
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+
+%{_datadir}/metainfo/%{plug_name}.metainfo.xml
+%{_datadir}/icons/hicolor/*/categories/preferences-*.svg
+
+
+%changelog
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Repackaged for Terra

anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec

@@ -4,11 +4,11 @@
 
 %global plug_type hardware
 %global plug_name wacom
-%global plug_rdnn io.elementary.settings.wacom
+%global plug_rdnn io.elementary.switchboard.wacom
 
 Name:           switchboard-plug-wacom
 Summary:        Switchboard Wacom Plug
-Version:        8.0.0
+Version:        1.0.1
 Release:        1%?dist
 License:        GPL-3.0-or-later
 
@@ -25,7 +25,7 @@ BuildRequires:  pkgconfig(libwacom)
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xi)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  switchboard-devel
 
 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -45,18 +45,22 @@ Supplements:    switchboard%{?_isa}
 %install
 %meson_install
 
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug
 
 
 %check
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
-%files -f %{plug_rdnn}.lang
+%files -f %{plug_name}-plug.lang
 %doc README.md
 %license COPYING
 
-%{_libdir}/switchboard-3/%{plug_type}/lib%{plug_name}.so
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
 
-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.0.1-1
+- Initial package.

anda/desktops/elementary/switchboard/switchboard.spec

@@ -1,5 +1,5 @@
 %global srcname switchboard
-%global appname io.elementary.settings
+%global appname io.elementary.switchboard
 
 Name:           switchboard
 Summary:        Modular Desktop Settings Hub
@@ -16,10 +16,12 @@ BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
 
-BuildRequires:  pkgconfig(granite-7)
-BuildRequires:  pkgconfig(gtk4)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  fdupes sassc
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(granite) >= 5.4.0
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libhandy-1) >= 0.83.0
+BuildRequires:  fdupes
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -90,7 +92,7 @@ appstream-util validate-relax --nonet \
 
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_iconsdir}/hicolor/*/apps/%{appname}.svg
+%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
 %{_datadir}/metainfo/%{appname}.appdata.xml
 
 %files libs
@@ -100,14 +102,19 @@ appstream-util validate-relax --nonet \
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/*
 
-%{_libdir}/lib%{name}-3.so.0
-%{_libdir}/lib%{name}-3.so.2.0
+%{_libdir}/lib%{name}-2.0.so.0
+%{_libdir}/lib%{name}-2.0.so.2.0
 
 %files devel
-%{_includedir}/%{name}-3/
+%{_includedir}/%{name}-2.0/
 
-%{_libdir}/lib%{name}-3.so
-%{_libdir}/pkgconfig/%{name}-3.pc
+%{_libdir}/lib%{name}-2.0.so
+%{_libdir}/pkgconfig/%{name}-2.0.pc
 
-%{_datadir}/vala/vapi/%{name}-3.deps
-%{_datadir}/vala/vapi/%{name}-3.vapi
+%{_datadir}/vala/vapi/%{name}-2.0.deps
+%{_datadir}/vala/vapi/%{name}-2.0.vapi
+
+
+%changelog
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.0.2-1
+- Repackaged for Terra

anda/desktops/elementary/wingpanel/wingpanel.spec

@@ -9,7 +9,6 @@ Summary:        Stylish top panel
 Version:        3.0.5
 Release:        1%{?dist}
 License:        GPL-2.0-or-later
-Epoch:          1
 
 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -33,7 +32,7 @@ BuildRequires:  pkgconfig(mutter-clutter-13)
 BuildRequires:  pkgconfig(mutter-cogl-13)
 BuildRequires:  pkgconfig(mutter-cogl-pango-13)
 
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 # wingpanel ayatana appindicator support was abandoned by upstream
 # wingpanel-indicator-ayatana-2.0.3-10.fc32 retired for fedora 33+
@@ -44,8 +43,8 @@ Obsoletes:      wingpanel-indicator-ayatana < 2.0.3-11
 
 %package        libs
 Summary:        Stylish top panel (shared library)
-Enhances:       %{name} = %{epoch}:%{version}-%{release}
-Enhances:       %{name}-devel = %{epoch}:%{version}-%{release}
+Enhances:       %{name} = %{version}-%{release}
+Enhances:       %{name}-devel = %{version}-%{release}
 
 %description    libs %{common_description}
 
@@ -54,7 +53,7 @@ This package contains the shared library.
 
 %package        devel
 Summary:        Stylish top panel (development files)
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description    devel %{common_description}
 

anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec

@@ -1,13 +1,13 @@
 # from Fedora upstream
 %global extension   pop-shell
 %global uuid        %{extension}@system76.com
-%global commit      9418d0a9af7c9b30b61ac3eeb5ca432a3ad3e651
+%global commit      9a30c5bd49c373896410852d6477596ac4c43bd3
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global commit_date 20240401
+%global commit_date 240218
 %global ver         1.2.0
 
 Name:           terra-gnome-shell-extension-%{extension}
-Version:        %{ver}^%commit_date.%{shortcommit}
+Version:        %{ver}^%{shortcommit}
 Release:        1%?dist
 Summary:        GNOME Shell extension for advanced tiling window management
 License:        GPL-3.0-only

anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec

@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/
 
-%global commit b4b16f61f1d69c994701f149e54335c40b9b201d
+%global commit d3cc4aad003b8f5d4d24a6e20237797966a74fb4
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}

anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec

@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078
+%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
 %forgemeta
 
 Name:           lomiri-app-launch

anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai

@@ -1,5 +1,4 @@
 rpm.version(gitlab_tag("19057685"));
 if rpm.changed() {
-	rpm.global("commit", gitlab_commit("19057685", "main"));
-	rpm.release();
+	rpm.global("commit", gitlab_commit("19057685"));
 }

anda/devs/codium-marketplace/anda.hcl

@@ -1,6 +0,0 @@
-project pkg {
-    arches = ["x86_64"]
-    rpm {
-        spec = "codium-marketplace.spec"
-    }
-}

anda/devs/codium-marketplace/codium-marketplace.spec

@@ -1,47 +0,0 @@
-# ref: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vscodium-marketplace
-
-Name:       codium-marketplace
-Version:    1.65.0
-Release:    1%?dist
-Summary:    Enable vscode marketplace in vscodium
-License:    MIT
-BuildArch:  noarch
-URL:        https://marketplace.visualstudio.com/vscode
-Requires:   codium sed
-
-%description
-This package replaces the default marketplace (https://open-vsx.org/)
-to the official one used by vscode.
-
-%install
-touch dummy
-install -Dm644 dummy %buildroot/tmp/terra-codium-marketplace-dummy-file
-
-%posttrans
-if [ $1 -gt 1 ]; then  # update/install
-  sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
-    -e '/^[[:blank:]]*"cacheUrl/d' \
-    -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
-    -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
-    -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
-    /usr/share/codium/resources/app/product.json || true
-fi
-
-%preun
-sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/open-vsx.org\/vscode\/gallery",/' \
-  -e '/^[[:blank:]]*"cacheUrl/d' \
-  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/open-vsx.org\/vscode\/item"/' \
-  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
-  -e '/^[[:blank:]]*"documentationUrl/i\  "linkProtectionTrustedDomains": ["https://open-vsx.org"],' \
-  /usr/share/codium/resources/app/product.json || true
-
-%triggerin -- codium
-sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
-  -e '/^[[:blank:]]*"cacheUrl/d' \
-  -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
-  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
-  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
-  /usr/share/codium/resources/app/product.json || true
-
-%files
-/tmp/terra-codium-marketplace-dummy-file

anda/devs/codium/codium.spec

@@ -12,7 +12,7 @@
 %endif
 
 Name:			codium
-Version:		1.91.1.24193
+Version:		1.89.1.24130
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -28,8 +28,6 @@ VSCodium is a new choice of tool that combines the simplicity of a code editor
 with what developers need for the core edit-build-debug cycle.
 
 %prep
-mkdir stuff
-cd stuff
 tar xf %SOURCE0
 
 cat <<EOF > vscodium-bin-uri-handler.desktop
@@ -72,7 +70,6 @@ EOF
 %build
 
 %install
-cd stuff
 mkdir -p %buildroot%_datadir/doc/%name/ %buildroot%_datadir/licenses/%name
 install -Dm644 %SOURCE1 %buildroot%_docdir/%name/
 install -Dm644 %SOURCE2 %buildroot%_datadir/licenses/%name/

anda/devs/flutter/flutter.spec

@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.22.2
+Version:		3.22.1
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause

anda/devs/rgbds/terra-rgbds.spec

@@ -1,6 +1,6 @@
 Name:		terra-rgbds
-Version:	0.8.0
-Release:	1%?dist
+Version:	0.7.0
+Release:	1%{?dist}
 Summary:	A development package for the Game Boy, including an assembler
 
 # See LICENSE for details

anda/devs/zed/nightly/anda.hcl

@@ -1,9 +0,0 @@
-project pkg {
-  rpm {
-    spec = "zed-nightly.spec"
-  }
-  labels {
-    nightly = 1
-    large = 1
-  }
-}

anda/devs/zed/nightly/update.rhai

@@ -1,9 +0,0 @@
-if filters.contains("nightly") {
-  rpm.global("commit", gh_commit("zed-industries/zed"));
-  if rpm.changed() {
-    let v = find("\nversion = \"([.\\d]+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1);
-    rpm.global("ver", v);
-    rpm.global("commit_date", date());
-    rpm.release();
-  }
-}

anda/devs/zed/nightly/zed-nightly.spec

@@ -1,97 +0,0 @@
-%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240619
-%global ver 0.142.0
-
-%bcond_without check
-
-# Exclude input files from mangling
-%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-
-%global crate zed
-%global app_id dev.zed.Zed-Nightly
-
-Name:           zed-nightly
-Version:        %ver^%commit_date.%shortcommit
-Release:        1%?dist
-Summary:        Zed is a high-performance, multiplayer code editor
-
-License:        MIT
-URL:            https://zed.dev/
-Source0:        https://github.com/zed-industries/zed/archive/%{commit}.zip
-
-Conflicts:      zed
-Provides:       zed
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  gcc
-BuildRequires:  g++
-BuildRequires:  clang
-BuildRequires:  mold
-BuildRequires:  alsa-lib-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  wayland-devel
-BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
-BuildRequires:  libzstd-devel
-BuildRequires:  perl-FindBin
-BuildRequires:  perl-IPC-Cmd
-BuildRequires:  perl-File-Compare
-BuildRequires:  perl-File-Copy
-BuildRequires:  perl-lib
-BuildRequires:  vulkan-loader
-
-%description
-Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
-
-%prep
-%autosetup -n %{crate}-%{commit} -p1
-%cargo_prep_online
-
-export DO_STARTUP_NOTIFY="true"
-export APP_ID="%app_id"
-export APP_ICON="%app_id"
-export APP_NAME="Zed Nightly"
-export APP_CLI="zed"
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
-export ZED_RELEASE_CHANNEL=nightly
-export BRANDING_LIGHT="#e9aa6a"
-export BRANDING_DARK="#1a5fb4"
-
-echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
-envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
-
-envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
-
-%build
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
-echo "nightly" > crates/zed/RELEASE_CHANNEL
-
-%cargo_build -- --package zed --package cli
-script/generate-licenses
-
-%install
-install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
-install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
-
-install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
-install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
-
-install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%files
-%{_libexecdir}/zed-editor
-%{_bindir}/zed
-%{_datadir}/applications/%app_id.desktop
-%{_datadir}/pixmaps/%app_id.png
-%{_metainfodir}/%app_id.metainfo.xml
-%license assets/licenses.md
-
-%changelog
-%autochangelog

anda/devs/zed/preview/anda.hcl

@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-    spec = "zed-preview.spec"
-  }
-  labels {
-    large = 1
-  }
-}

anda/devs/zed/preview/update.rhai

@@ -1,14 +0,0 @@
-let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
-for release in releases {
-  if !release.prerelease {
-    continue;
-  }
-  let tag = release.tag_name;
-  tag.pop(4); // remove the "-pre" suffix
-  tag.crop(1); // remove "v"
-  rpm.global("ver", tag);
-  break;
-  if rpm.changed() {
-    rpm.release();
-  }
-}

anda/devs/zed/preview/zed-preview.spec

@@ -1,91 +0,0 @@
-%bcond_without check
-%global debug_package %{nil}
-%global ver 0.144.2
-
-%global crate zed
-%global app_id dev.zed.Zed-Preview
-
-Name:           zed-preview
-Version:        %ver
-Release:        pre1%?dist
-Summary:        Zed is a high-performance, multiplayer code editor
-
-License:        MIT
-URL:            https://zed.dev/
-Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}-pre.tar.gz
-
-Conflicts:      zed
-Provides:       zed
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  gcc
-BuildRequires:  g++
-BuildRequires:  clang
-BuildRequires:  mold
-BuildRequires:  alsa-lib-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  wayland-devel
-BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
-BuildRequires:  libzstd-devel
-BuildRequires:  perl-FindBin
-BuildRequires:  perl-IPC-Cmd
-BuildRequires:  perl-File-Compare
-BuildRequires:  perl-File-Copy
-BuildRequires:  perl-lib
-BuildRequires:  vulkan-loader
-
-%description
-Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
-
-%prep
-%autosetup -n %{crate}-%{ver}-pre -p1
-%cargo_prep_online
-
-export DO_STARTUP_NOTIFY="true"
-export APP_ID="%app_id"
-export APP_ICON="%app_id"
-export APP_NAME="Zed Preview"
-export APP_CLI="zed"
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
-export ZED_RELEASE_CHANNEL=preview
-export BRANDING_LIGHT="#99c1f1"
-export BRANDING_DARK="#1a5fb4"
-
-echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
-envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
-
-envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
-
-%build
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
-echo "preview" > crates/zed/RELEASE_CHANNEL
-
-%cargo_build -- --package zed --package cli
-script/generate-licenses
-
-%install
-install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
-install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
-
-install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
-install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
-
-install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%files
-%{_libexecdir}/zed-editor
-%{_bindir}/zed
-%{_datadir}/applications/%app_id.desktop
-%{_datadir}/pixmaps/%app_id.png
-%{_metainfodir}/%app_id.metainfo.xml
-%license assets/licenses.md
-
-%changelog
-%autochangelog

anda/devs/zed/stable/anda.hcl

@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-    spec = "zed.spec"
-  }
-  labels {
-    large = 1
-  }
-}

anda/devs/zed/stable/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("zed-industries/zed"));

anda/devs/zed/stable/zed.spec

@@ -1,93 +0,0 @@
-%bcond_without check
-
-# Exclude input files from mangling
-%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-
-%global crate zed
-%global app_id dev.zed.Zed
-
-Name:           zed
-Version:        0.143.7
-Release:        1%?dist
-Summary:        Zed is a high-performance, multiplayer code editor
-
-License:        MIT
-URL:            https://zed.dev/
-Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{version}.tar.gz
-
-Conflicts:      zed
-Provides:       zed
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  gcc
-BuildRequires:  g++
-BuildRequires:  clang
-BuildRequires:  mold
-BuildRequires:  alsa-lib-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  wayland-devel
-BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
-BuildRequires:  libzstd-devel
-BuildRequires:  perl-FindBin
-BuildRequires:  perl-IPC-Cmd
-BuildRequires:  perl-File-Compare
-BuildRequires:  perl-File-Copy
-BuildRequires:  perl-lib
-BuildRequires:  vulkan-loader
-BuildRequires:  libcurl-devel
-
-%description
-Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
-
-%prep
-%autosetup -n %{crate}-%{version} -p1
-%cargo_prep_online
-
-export DO_STARTUP_NOTIFY="true"
-export APP_ID="%app_id"
-export APP_ICON="%app_id"
-export APP_NAME="Zed Editor"
-export APP_CLI="zed"
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra."
-export ZED_RELEASE_CHANNEL=stable
-export BRANDING_LIGHT="#e9aa6a"
-export BRANDING_DARK="#1a5fb4"
-
-echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
-envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
-
-envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
-
-%build
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra."
-echo "stable" > crates/zed/RELEASE_CHANNEL
-
-%cargo_build -- --package zed --package cli
-script/generate-licenses
-
-%install
-install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
-install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
-
-install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
-install -Dm644 crates/zed/resources/app-icon.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
-
-install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%files
-%{_libexecdir}/zed-editor
-%{_bindir}/zed
-%{_datadir}/applications/%app_id.desktop
-%{_datadir}/pixmaps/%app_id.png
-%{_metainfodir}/%app_id.metainfo.xml
-%license assets/licenses.md
-
-%changelog
-%autochangelog

anda/docker/containerd/containerd.spec

@@ -7,7 +7,7 @@
 
 # https://github.com/containerd/containerd
 %global goipath         github.com/containerd/containerd
-Version:                1.7.19
+Version:                1.7.17
 
 %gometa
 

anda/docker/moby-buildx/moby-buildx.spec

@@ -1,7 +1,7 @@
 %define debug_package %nil
 
 Name:           moby-buildx
-Version:        0.16.0
+Version:        0.14.1
 Release:        1%?dist
 Summary:        Docker CLI plugin for extended build capabilities with BuildKit
 

anda/docker/moby-compose/moby-compose.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           moby-compose
-Version:        2.28.1
+Version:        2.27.1
 Release:        1%?dist
 Summary:        Define and run multi-container applications with Docker
 

anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec

@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	1.0.15
+Version:	1.0.13
 Release:	1%?dist
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/Sarasa-TTC-%version.7z

anda/games/osu-lazer/osu-lazer.spec

@@ -1,9 +1,9 @@
-%define osuresver 2024.705.0
+%define osuresver 2024.517.0
 %global debug_package %{nil}
 %define __strip /bin/true
 
 Name:			osu-lazer
-Version:		2024.625.2
+Version:		2024.521.2
 Release:		1%?dist
 Summary:		The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
 ExclusiveArch:	x86_64

anda/games/prismlauncher-nightly/prismlauncher-nightly.spec

@@ -1,11 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher
 
-%global commit 5f345cedea44ec0037e684436d1bcd94e1ae5b95
+%global commit bfac12604e9cd0884987ca89f34a455cf16c543c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
+%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
+%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
 
-%global commit_date 20240710
+%global commit_date 20240501
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 %bcond_without qt6
@@ -38,6 +40,8 @@ Group:            Amusements/Games
 URL:              https://prismlauncher.org/
 Source0:          https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz
 Source1:          https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz
+Source2:          https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz
+Source3:          https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz
 Patch0:           0001-find-cmark-with-pkgconfig.patch
 
 BuildRequires:    cmake >= 3.15
@@ -46,7 +50,6 @@ BuildRequires:    gcc-c++
 BuildRequires:    java-17-openjdk-devel
 BuildRequires:    desktop-file-utils
 BuildRequires:    libappstream-glib
-BuildRequires:    tomlplusplus-devel
 BuildRequires:    cmake(ghc_filesystem)
 BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
@@ -55,13 +58,9 @@ BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version}
 
 %if %{with qt6}
 BuildRequires:    cmake(Qt6Core5Compat)
-BuildRequires:    quazip-qt6-devel
-%else
-BuildRequires:    quazip-qt5-devel
 %endif
 
 BuildRequires:    pkgconfig(libcmark)
@@ -104,9 +103,13 @@ multiple installations of Minecraft at once (Fork of MultiMC)
 %autosetup -p1 -n PrismLauncher-%{commit}
 
 tar -xzf %{SOURCE1} -C libraries
+tar -xvf %{SOURCE2} -C libraries
+tar -xvf %{SOURCE3} -C libraries
 
-rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,zlib}/
+rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/
 mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus
+mv -f libraries/quazip-%{quazip_commit} libraries/quazip
+mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus
 
 # Do not set RPATH
 sed -i "s|\$ORIGIN/||" CMakeLists.txt
@@ -153,9 +156,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 
 
 %changelog
-* Wed Jun 19 2024 Trung Lê <8 at tle dot id dot au> - 9.0^20240619.8014283-1
-- use system quazip-qt and tomlplusplus
-
 * Wed Jul 26 2023 seth <getchoo at tuta dot io> - 8.0^20230726.4f00012-1
 - remove terra-fractureiser-detector from recommends, use proper build platform,
   and add patches for epel/older fedora versions

anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec

@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher
 
-%global commit a2d28f6872841d047ce3854365c595ebf941b848
+%global commit df0280f52b68f4352d8da711136609c16ce4db7b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
 %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
 %global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
 
-%global commit_date 20240401
+%global commit_date 20240325
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 %bcond_with qt6

anda/games/prismlauncher/prismlauncher.spec

@@ -22,8 +22,8 @@ Name:             prismlauncher
 %else
 Name:             prismlauncher-qt5
 %endif
-Version:          8.4
-Release:          2%?dist
+Version:          8.3
+Release:          1%?dist
 Summary:          Minecraft launcher with ability to manage multiple instances
 # see COPYING.md for more information
 # each file in the source also contains a SPDX-License-Identifier header that declares its license
@@ -46,16 +46,11 @@ BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
-BuildRequires:    tomlplusplus-devel
 
 %if %{with qt6}
 BuildRequires:    cmake(Qt6Core5Compat)
-BuildRequires:    quazip-qt6-devel
-%else
-BuildRequires:    quazip-qt5-devel
 %endif
 
-
 BuildRequires:    pkgconfig(libcmark)
 BuildRequires:    pkgconfig(scdoc)
 BuildRequires:    pkgconfig(zlib)
@@ -137,9 +132,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 
 
 %changelog
-* Sun Jun 23 2024 Trung Lê <8@tle.id.au> - 8.2-2
-- update to 8.4. Add quazip-qt deps
-
 * Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
 - move JREs to weak deps, add java 21 for snapshots
 

anda/langs/crystal/crystal/crystal.spec

@@ -1,7 +1,7 @@
 %define debug_package %nil
 
 Name:			crystal
-Version:		1.13.0
+Version:		1.12.2
 Release:		1%?dist
 Summary:		The Crystal Programming Language
 License:		Apache-2.0

anda/langs/crystal/crystal/update.rhai

@@ -1 +1,2 @@
-rpm.version(gh("crystal-lang/crystal"));
+let html = get("https://crystal-lang.org/");
+rpm.version(find("Latest release: <strong>(.+?)</strong>", html, 1))

anda/langs/dart/dart.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name: dart
-Version: 3.4.4
+Version: 3.4.2
 Release: 1%?dist
 Summary: The Dart Language
 License: BSD-3-Clause

anda/langs/go/albius/albius.spec

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

anda/langs/go/albius/anda.hcl

@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-    spec = "albius.spec"
-  }
-  labels {
-    nightly = 1
-  }
-}

anda/langs/go/albius/update.rhai

@@ -1,7 +0,0 @@
-if filters.contains("nightly") {
-  rpm.global("commit", gh_commit("Vanilla-OS/Albius"));
-  if rpm.changed() {
-    rpm.global("commit_date", date());
-    rpm.release();
-  }
-}

anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec

@@ -27,7 +27,6 @@ License:        BSD-3-Clause
 URL:            %{gourl}
 Source:         %{gosource}
 BuildRequires:  git-core gcc
-Provides:       gendesk
 
 %description %{common_description}
 

anda/langs/groovy/groovy-docs/groovy-docs.spec

@@ -1,5 +1,5 @@
 Name:		groovy-docs
-Version:	4.0.22
+Version:	4.0.21
 Release:	1%?dist
 Summary:	Documentation for the Groovy programming language
 URL:		https://groovy-lang.org/

anda/langs/groovy/groovy.spec

@@ -1,5 +1,5 @@
 Name:			groovy
-Version:		4.0.22
+Version:		4.0.21
 Release:		1%?dist
 Summary:		A multi-faceted language for the Java platform
 BuildArch:		noarch

anda/langs/nim/dive/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "umdive.spec"
-    }
-}

anda/langs/nim/dive/umdive.spec

@@ -1,29 +0,0 @@
-Name:           umdive
-Version:        0.1.2
-Release:        1%?dist
-Summary:        Chroot utility (just like arch-chroot)
-License:        MIT
-URL:            https://github.com/Ultramarine-Linux/dive
-Source0:		%url/archive/refs/tags/v%version.tar.gz
-Requires:       (%_bindir/chroot or %_sbindir/chroot)
-Requires:       %_bindir/mount
-BuildRequires:  anda-srpm-macros nim
-Provides:       dive = %version-%release
-
-%description
-%summary.
-
-%prep
-%autosetup -n dive-%version
-
-%build
-nimble setup -y
-nim c %nim_c src/dive
-
-%install
-install -Dpm755 src/dive %buildroot%_bindir/dive
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/dive

anda/langs/nim/dive/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("Ultramarine-Linux/dive"));

anda/langs/nim/mkfstab/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "mkfstab.spec"
-    }
-}

anda/langs/nim/mkfstab/mkfstab.spec

@@ -1,26 +0,0 @@
-Name:           mkfstab
-Version:        0.1.2
-Release:        1%?dist
-Summary:        An alternative to genfstab: generate output suitable for addition to /etc/fstab
-License:        MIT
-URL:            https://github.com/Ultramarine-Linux/mkfstab
-Source0:		%url/archive/refs/tags/v%version.tar.gz
-BuildRequires:  nim anda-srpm-macros
-
-%description
-An alternative to genfstab from Arch Linux. This is a dead simple but faster implementation of genfstab.
-
-%prep
-%autosetup
-
-%build
-nimble setup -y
-nim c %nim_c src/%name
-
-%install
-install -Dpm755 src/%name %buildroot%_bindir/%name
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/%name

anda/langs/nim/mkfstab/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("Ultramarine-Linux/mkfstab"));

anda/langs/nim/nim-nightly/nim-nightly.spec

@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 22ba5abd635a1b50c76acb0b80097a663cdf97c9
+%global commit 185e06c92362083c06c76f87e325889b1c9dc659
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
-%global commit_date 20240712
+%global commit_date 20240502
 %global debug_package %nil
 
 Name:			nim-nightly
@@ -100,13 +100,11 @@ mold -run bin/nim cc -d:nimCallDepthLimit=10000 -r tools/niminst/niminst --var:v
 
 sh ./install.sh %buildroot/usr/bin
 
-mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim %buildroot%_datadir
+mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim
 install -Dpm755 bin/nim{grep,suggest,pretty} %buildroot/%_bindir
 install -Dpm644 tools/nim.bash-completion %buildroot/%_datadir/bash-completion/completions/nim
 install -Dpm644 dist/nimble/nimble.bash-completion %buildroot/%_datadir/bash-completion/completions/nimble
 install -Dpm644 -t%buildroot/%_mandir/man1 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4
-mv %buildroot%_bindir/nim %buildroot%_datadir/
-ln -s %_datadir/nim/bin/nim %buildroot%_bindir/nim
 
 %ifarch x86_64
 mkdir -p %buildroot/%_docdir/%name/html || true
@@ -131,7 +129,6 @@ rm %buildroot%_bindir/*.bat || true
 %_bindir/nim{,ble}
 %_mandir/man1/nim{,ble}.1*
 %_datadir/bash-completion/completions/nim{,ble}
-%_datadir/nim/
 %_prefix/lib/nim/
 %_sysconfdir/nim/
 

anda/langs/nim/nim/nim.spec

@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 
 Name:			nim
-Version:		2.0.8
+Version:		2.0.4
 Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD

anda/langs/python/mpv/python-mpv.spec

@@ -1,7 +1,7 @@
 %define debug_package %nil
 
 Name:			python3-mpv
-Version:		1.0.7
+Version:		1.0.6
 Release:		1%?dist
 Summary:		Python interface to the awesome mpv media player
 License:		GPL-2.0+ OR LGPL-2.1+

anda/langs/python/pillow-heif/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "python3-pillow-heif.spec"
-	}
-}

anda/langs/python/pillow-heif/python3-pillow-heif.spec

@@ -1,115 +0,0 @@
-%global py3_incdir %(RPM_BUILD_ROOT= %{python3} -Ic 'import sysconfig; print(sysconfig.get_path("include"))')
-
-%global srcname pillow-heif
-
-# Dependencies are missing to build the documentation
-%bcond_with doc
-
-Name:           python-%{srcname}
-Version:        0.17.0
-Release:        0%{?dist}
-Summary:        Python library for working with HEIF images and plugin for Pillow
-
-License:        BSD-3-Clause
-URL:            https://github.com/bigcat88/pillow_heif
-Source0:        https://github.com/bigcat88/pillow_heif/archive/refs/tags/v%{version}/pillow-heif-%{version}.tar.gz
-Source1:        test.py
-
-BuildRequires:  gcc
-BuildRequires:  python%{python3_pkgversion}-pytest
-BuildRequires:  python%{python3_pkgversion}
-BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-pillow-devel
-BuildRequires:  libheif-devel
-%if %{with doc}
-BuildRequires:  make
-BuildRequires:  python%{python3_pkgversion}-sphinx
-BuildRequires:  python%{python3_pkgversion}-sphinx-copybutton
-BuildRequires:  python%{python3_pkgversion}-sphinx-issues
-BuildRequires:  python%{python3_pkgversion}-sphinx_rtd_theme
-%endif
-
-%description
-Python library for working with HEIF images and plugin for Pillow
-
-There are two subpackages: devel (development) and doc (documentation).
-
-%package -n python%{python3_pkgversion}-%{srcname}
-Summary:        Python library for working with HEIF images and plugin for Pillow
-Requires:       python%{python3_pkgversion}-pillow
-Requires:       libheif
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
-
-%description -n python%{python3_pkgversion}-%{srcname}
-Python library for working with HEIF images and plugin for Pillow
-
-There are two subpackages: devel (development) and doc (documentation).
-
-%package -n python%{python3_pkgversion}-%{srcname}-devel
-Summary:        Development files for %{srcname}
-Requires:       python%{python3_pkgversion}-devel, libheif-devel
-Requires:       python%{python3_pkgversion}-%{srcname}%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-devel}
-
-%description -n python%{python3_pkgversion}-%{srcname}-devel
-Development files for %{srcname}.
-
-
-%package -n python%{python3_pkgversion}-%{srcname}-doc
-Summary:        Documentation for %{srcname}
-BuildArch:      noarch
-Requires:       python%{python3_pkgversion}-%{srcname} = %{version}-%{release}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-doc}
-
-%description -n python%{python3_pkgversion}-%{srcname}-doc
-Documentation for %{srcname}.
-
-
-%prep
-%autosetup -p1 -n pillow_heif-%{version}
-
-
-%build
-# Native build
-%py3_build
-
-# Doc build
-%if %{with doc}
-PYTHONPATH=$(echo $PWD/build/lib.linux-*) make -C docs html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version
-rm -f docs/_build_py3/html/.buildinfo
-%endif
-
-
-%install
-# Native build
-%py3_install
-
-%check
-# Check Python 3 modules
-cp %{SOURCE1} $(echo $PWD/build/lib.linux-*)/
-pushd build/lib.linux-*
-PYTHONPATH=$PWD %{__python3} test.py
-pytest pillow_heif && echo "Test done"
-popd
-
-%files -n python%{python3_pkgversion}-%{srcname}
-%doc README.md CHANGELOG.md
-%license LICENSE.txt
-%{python3_sitearch}/pillow_heif/
-%{python3_sitearch}/pillow_heif-%{version}-py%{python3_version}.egg-info/
-%{python3_sitearch}/_pillow_heif.*.so
-
-%files -n python%{python3_pkgversion}-%{srcname}-devel
-
-%if %{with doc}
-%files -n python%{python3_pkgversion}-%{srcname}-doc
-%doc docs/_build_py3/html
-%endif
-
-%changelog
-* Wed Jul 10 2024 Trung Lê <8@tle.id.au> - 0.17.0-0
-- New upstream release
-
-* Thu Jun 27 2024 Trung Lê <8@tle.id.au> - 0.16.0-1
-- Initial RPM package

anda/langs/python/pillow-heif/test.py

@@ -1,2 +0,0 @@
-import pillow_heif;
-print(pillow_heif.libheif_info());

anda/langs/python/pillow-heif/update.rhai

@@ -1 +0,0 @@
-rpm.version(pypi("pillow-heif"));

anda/langs/python/protobuf/python3-protobuf.spec

@@ -2,7 +2,7 @@
 %global pypi_name protobuf
 
 Name:           python-%{pypi_name}
-Version:        5.27.2
+Version:        5.27.0
 Release:        1%?dist
 Summary:        Protocol Buffers
 

anda/langs/python/ruff/python3-ruff.spec

@@ -1,12 +1,12 @@
 %define debug_package %{nil}
 
 Name:			python3-ruff
-Version:		0.5.1
+Version:		0.4.7
 Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
 URL:			https://beta.ruff.rs/
-Source0:		https://github.com/astral-sh/ruff/archive/refs/tags/%{version}.tar.gz
+Source0:		https://github.com/astral-sh/ruff/archive/refs/tags/v%{version}.tar.gz
 BuildRequires:	python3-installer python3-pip maturin cargo
 Provides:		python3.11dist(ruff) = %{version}
 

anda/langs/rust/bat-extras/bat-extras.spec

@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           bat-extras
-Version:        2024.07.10
-Release:        1%?dist
+Version:        2024.02.12
+Release:        1%{?dist}
 Summary:        Bash scripts that integrate bat with various command line tools
 
 License:        MIT

anda/langs/rust/gitoxide/rust-gitoxide.spec

@@ -1,6 +1,5 @@
 # Generated by rust2rpm 24
 %bcond_without check
-%global __brp_mangle_shebangs %{nil}
 
 %global crate gitoxide
 

anda/langs/rust/maturin/rust-terra-maturin.spec

@@ -2,8 +2,8 @@
 %global crate maturin
 
 Name:           rust-terra-maturin
-Version:        1.7.0
-Release:        1%?dist
+Version:        1.5.1
+Release:        %autorelease
 Summary:        Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages
 
 License:        MIT OR Apache-2.0