chore: sync with Terra 39 (#877)

* chore: sync with Terra 39 * fix: update mock-configs path * fix: use f38 specs for desktops * chore: move more lomiri/unity specific packages (#880) * Fix(ubuntu-sdk): update description & version (#878) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * fix: disable docs package (#887) * sync more changes from f39 * add keyd fixes --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> Signed-off-by: lleyton <lleyton@fyralabs.com> Co-authored-by: cat-master21 <96554164+cat-master21@users.noreply.github.com>
terrapkg · Jan 14, 2024 · a16b7bc · a16b7bc
1 parent 21f54d0
commit a16b7bc
Show file tree

Hide file tree

Showing 480 changed files with 5,203 additions and 1,360 deletions.
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -63,10 +63,10 @@ jobs:
 
       - name: Include custom build template instead of package default
         run: |
-          cp -v anda/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
 
       - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
 
       - name: Generating artifact name
         id: art

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Build terra-mock-configs
         run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/mock-configs/pkg -p rpm
+          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg -p rpm
       - name: Install terra-mock-configs
         run: sudo dnf install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
           key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
 
       - name: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
+        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
 
       - name: Generating artifact name
         id: art

diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
@@ -33,7 +33,7 @@ jobs:
           key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
 
       - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
 
       - name: Generating artifact name
         id: art

diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec
@@ -4,7 +4,7 @@ Release:		1%{?dist}
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
-BuildRequires:	python3-installer python3.11 rpm_macro(fdupes)
+BuildRequires:	python3-pip rpm_macro(fdupes)
 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
@@ -29,28 +29,33 @@ Anki is based on a theory called spaced repetition.
 %build
 
 %install
-python3.11 -m installer --destdir="%{buildroot}" %{SOURCE0}
-python3.11 -m installer --destdir="%{buildroot}" %{SOURCE1}
+pip3 install --root=%{buildroot} %SOURCE0 %SOURCE1
 install -Dm755 %{SOURCE2} "%{buildroot}/usr/bin/anki"
 install -Dm644 %{SOURCE3} "%{buildroot}/usr/share/applications/anki.desktop"
 install -Dm644 %{SOURCE4} "%{buildroot}/usr/share/pixmaps/anki.png"
 install -Dm644 %{SOURCE5} "%{buildroot}/%{_datadir}/licenses/%{name}/LICENSE"
 install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md"
 
-%fdupes %_libdir/python*/site-packages/_aqt/data/
+cp -r %buildroot%_libdir/python3*/site-packages/{_aqt,anki*,aqt*} .
+rm -rf %buildroot{%_libdir,/usr/lib}/python3*/site-packages/*
+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
 %doc README.md
-/usr/bin/anki
-/usr/lib64/python*/site-packages/_aqt/
-/usr/lib64/python*/site-packages/anki-%{version}.dist-info/
-/usr/lib64/python*/site-packages/anki/
-/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/
-/usr/lib64/python*/site-packages/aqt/
-/usr/share/applications/anki.desktop
-/usr/share/pixmaps/anki.png
+%_bindir/anki
+/usr/lib/python*/site-packages/_aqt/
+/usr/lib/python*/site-packages/anki-%{version}.dist-info/
+/usr/lib/python*/site-packages/anki/
+/usr/lib/python*/site-packages/aqt-%{version}.dist-info/
+/usr/lib/python*/site-packages/aqt/
+%_datadir/applications/anki.desktop
+%_datadir/pixmaps/anki.png
 
 %changelog
 * Fri Nov 10 2023 hazel-bunny <dabiswas112@gmail.com> - 23.10-2

diff --git a/anda/others/blackbox-terminal/anda.hcl → anda/apps/blackbox-terminal/anda.hcl b/anda/others/blackbox-terminal/anda.hcl → anda/apps/blackbox-terminal/anda.hcl
diff --git a/.../blackbox-terminal/blackbox-terminal.spec → .../blackbox-terminal/blackbox-terminal.spec b/.../blackbox-terminal/blackbox-terminal.spec → .../blackbox-terminal/blackbox-terminal.spec
diff --git a/anda/others/blackbox-terminal/update.rhai → anda/apps/blackbox-terminal/update.rhai b/anda/others/blackbox-terminal/update.rhai → anda/apps/blackbox-terminal/update.rhai
diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/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.209
+Version:        0.0.248
 Release:        1%{?dist}
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms

diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-canary
-Version:        0.0.209
+Version:        0.0.248
 Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com

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

diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/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.58
+Version:        0.0.64
 Release:        1%{?dist}
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms

diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-ptb
-Version:        0.0.58
+Version:        0.0.64
 Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com

diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:			discord
-Version:		0.0.34
+Version:		0.0.40
 Release:		1%{?dist}
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com

diff --git a/anda/apps/sccache/anda.hcl b/anda/apps/sccache/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "rust-sccache.spec"
+	}
+}