diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e9843ff87a..8deec02a20 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,8 +4,15 @@
"dockerfile": "Dockerfile",
"args": { "VARIANT": "38" }
},
- "settings": {},
- "extensions": [],
"remoteUser": "vscode",
- "runArgs": ["--privileged"]
+ "runArgs": [
+ "--privileged"
+ ],
+ "customizations": {
+ "vscode": {
+ "extensions": [
+ "rhaiscript.vscode-rhai"
+ ]
+ }
+ }
}
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 9e6d9c365c..0e144665d5 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -34,8 +34,7 @@ jobs:
fetch-depth: 0
- name: Generate build matrix
id: generate_build_matrix
- run: |
- anda ci >> $GITHUB_OUTPUT
+ run: anda ci >> $GITHUB_OUTPUT
build:
needs: manifest
strategy:
@@ -52,21 +51,11 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
+ - name: Set up git repository
+ run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- - uses: terrapkg/anda-build@main
- if: github.event_name != 'push'
- with:
- name: "${{ matrix.pkg.pkg }}"
- mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
- andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
-
- - uses: terrapkg/anda-build@main
- if: github.event_name == 'push'
- with:
- name: "${{ matrix.pkg.pkg }}"
- mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
- extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
- andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+ - name: Build with Anda
+ run: anda build ${{ matrix.pkg.pkg }} --package rpm -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}
- name: Generating artifact name
id: art
@@ -90,7 +79,92 @@ jobs:
- 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}}
+ 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() ) && github.event_name == 'push'
- run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+ run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+
+ - name: Lint RPMs and SRPMs
+ id: lint
+ if: success()
+ run: |
+ echo 'err=false' >> $GITHUB_ENV
+ rpmlint anda-build/ > rpmlint.txt || f=1
+ if [[ $f -eq 1 ]]; then
+ EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+ echo "esc_lint_out<<$EOF" >> $GITHUB_ENV
+ cat rpmlint.txt | sed 's/`/\\`/g' >> $GITHUB_ENV
+ echo $EOF >> $GITHUB_ENV
+ echo "lint_out<<$EOF" >> $GITHUB_ENV
+ echo '```' >> $GITHUB_ENV
+ cat rpmlint.txt >> $GITHUB_ENV
+ echo '```' >> $GITHUB_ENV
+ echo $EOF >> $GITHUB_ENV
+ echo 'err=true' >> $GITHUB_ENV
+ fi
+
+ - name: Try to install package
+ id: dnf
+ if: success()
+ run: |
+ touch out
+ for f in anda-build/rpm/rpms/*.rpm; do
+ dnf in --downloadonly -y $f > $f.dnfout.txt 2>&1 || fail=1
+ if [[ $fail -eq 1 ]]; then
+ echo "### $f" >> out
+ echo '```' >> out
+ cat $f.dnfout.txt >> out
+ echo '```' >> out
+ echo >> out
+ echo 'err=true' >> $GITHUB_ENV
+ fi
+ done
+ cat out
+ EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+ echo "esc_dnf_out<<$EOF" >> $GITHUB_ENV
+ cat out | sed 's/`/\\`/g' >> $GITHUB_ENV
+ echo $EOF >> $GITHUB_ENV
+ echo "dnf_out<<$EOF" >> $GITHUB_ENV
+ cat out >> $GITHUB_ENV
+ echo $EOF >> $GITHUB_ENV
+
+ - name: Comment RPMLint/DNF output (PR)
+ if: success() && github.event_name == 'pull_request'
+ uses: actions/github-script@v6
+ with:
+ script: |
+ let out = "";
+ if (`${{ env.esc_lint_out }}`.trim() != "") {
+ out += "## 🔨 Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n";
+ out += `\`\`\`\n${{ env.esc_lint_out }}\n\`\`\`\n`;
+ }
+ if (`${{ env.esc_dnf_out }}`.trim() != "") {
+ out += "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n";
+ out += `${{ env.esc_dnf_out }}`;
+ }
+ if (out != "") {
+ github.rest.issues.createComment({
+ issue_number: context.issue.number,
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ body: out,
+ });
+ }
+
+ - name: Create commit comment
+ if: success() && env.err == 'true'
+ uses: peter-evans/commit-comment@v1
+ with:
+ body: |
+ [run_id: ${{github.run_id}}](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})
+ # Built RPM: ${{matrix.pkg.pkg}} (${{matrix.pkg.arch}}.fc${{matrix.version}})
+ ## Lint
+ If you see anything below, RPMLint returned with a non-zero exit code.
+
+ ${{ env.lint_out }}
+
+ ## DNF
+ Output of `dnf in --downloadonly ...`.
+ If you see anything below, DNF returned with a non-zero exit code.
+
+ ${{ env.dnf_out }}
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 4a5b33ca15..ac81de2ae5 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -43,7 +43,7 @@ jobs:
- name: Build Subatomic
run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- anda build -c anda-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
+ anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
- name: Install Subatomic
run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
@@ -52,7 +52,7 @@ jobs:
repository: FyraLabs/anda
- name: Build Andaman
- run: anda build -c anda-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm
+ run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm
- name: Upload to Subatomic
run: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a830b74bad..55d8213e5d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build Packages
+name: Manual Builds
on:
workflow_dispatch:
inputs:
@@ -33,13 +33,11 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
+ - name: Set up git repository
+ run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- - uses: terrapkg/anda-build@main
- with:
- name: "${{ matrix.pkg }}pkg"
- mockConfig: anda-${{ matrix.version }}-${{ matrix.arch }}
- extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
- andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
+ - name: Build with Anda
+ run: anda build ${{ matrix.pkg }}pkg --package rpm -c terra-${{ matrix.version }}-${{ matrix.arch }}
- name: Generating artifact name
id: art
@@ -61,8 +59,8 @@ jobs:
terra${{ matrix.version }} anda-build/rpm/rpms/*
- 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()
- run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+ if: ( cancelled() || failure() ) && github.event_name == 'push'
+ run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
index c1230180fe..971da70095 100644
--- a/.github/workflows/json-build.yml
+++ b/.github/workflows/json-build.yml
@@ -1,4 +1,4 @@
-name: Build Packages (JSON)
+name: JSON Build
on:
workflow_dispatch:
inputs:
@@ -22,13 +22,11 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
+ - name: Set up git repository
+ run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- - uses: terrapkg/anda-build@main
- with:
- name: "${{ matrix.pkg.pkg }}"
- mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
- extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
- andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
+ - name: Build with Anda
+ run: anda build ${{ matrix.pkg.pkg }} --package rpm -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}
- name: Generating artifact name
id: art
@@ -50,8 +48,8 @@ jobs:
terra${{ matrix.version }} anda-build/rpm/rpms/*
- name: Notify Madoguchi (Success)
- if: success()
- run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+ 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()
- run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+ if: ( cancelled() || failure() ) && github.event_name == 'push'
+ run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml
index 4d90f1241d..2add134544 100644
--- a/.github/workflows/update-nightly.yml
+++ b/.github/workflows/update-nightly.yml
@@ -1,4 +1,4 @@
-name: Automatic Nightly Update
+name: Nightly Update
on:
schedule:
- cron: "0 0 * * *"
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 3891c39a73..7d5aa0e836 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -1,4 +1,4 @@
-name: Automatically check for updates
+name: Update
on:
schedule:
- cron: "*/30 * * * *"
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000000..83262841d5
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+ "recommendations": [
+ "rhaiscript.vscode-rhai"
+ ]
+}
diff --git a/README.md b/README.md
index b94f0d92a8..e3ee9343f8 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
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.
-[Contributions](https://github.com/terrapkg/packages/wiki/Contribute) are always welcome, but please read our [documentation](https://github.com/terrapkg/packages/wiki) first.
This monorepo contains the package manifests for all packages in Terra.
@@ -15,10 +14,7 @@ sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/r
```
## Documentation
-Our documentation can be found on our [GitHub Wiki](https://github.com/terrapkg/packages/wiki).
-
-> Note: you can also take a look at 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 on [Discord](https://discord.gg/5fdPuxTg5Q). We're always happy to help!
-
diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec
index 899f3a0453..535e8fc5a1 100644
--- a/anda/apps/anki-bin/anki-bin.spec
+++ b/anda/apps/anki-bin/anki-bin.spec
@@ -1,14 +1,14 @@
Name: anki-bin
-Version: 2.1.63
+Version: 2.1.65
Release: 1%{?dist}
Summary: Flashcard program for using space repetition learning (Installed with wheel)
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
URL: https://apps.ankiweb.net/
-BuildRequires: python3-installer python3.11
+BuildRequires: python3-installer python3.11 rpm_macro(fdupes)
Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
Requires: python3-flask-cors python3-protobuf python3-requests python3-waitress
-BuildArch: noarch
+ExclusiveArch: x86_64
Conflicts: anki
Source0: https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
Source1: https://files.pythonhosted.org/packages/py3/a/aqt/aqt-%{version}-py3-none-any.whl
@@ -36,6 +36,8 @@ 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/
+
%files
%license LICENSE
@@ -50,5 +52,5 @@ install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md"
/usr/share/pixmaps/anki.png
%changelog
-* Wed Jan 11 2023 windowsboy111
+* Wed Jan 11 2023 windowsboy111 - 2.1.60
- Initial package
diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec
index 40eb26aa15..1118ec8c96 100644
--- a/anda/apps/anki-qt5/anki-qt5.spec
+++ b/anda/apps/anki-qt5/anki-qt5.spec
@@ -1,15 +1,15 @@
Name: anki-qt5
-Version: 2.1.63
+Version: 2.1.65
Release: 1%{?dist}
Summary: Flashcard program for using space repetition learning
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
URL: https://apps.ankiweb.net/
-BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks
+BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip
BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
-BuildArch: noarch
+ExclusiveArch: x86_64
Conflicts: anki
Patch0: 0001-No-update.patch
Patch1: 0001-Force-qt5.patch
@@ -21,9 +21,9 @@ Anki is based on a theory called spaced repetition.
%prep
git clone https://github.com/ankitects/anki .
-git checkout %{version}
-%patch 0 -p1
-%patch 1 -p1
+git checkout %version
+%patch0 -p1
+%patch1 -p1
# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
@@ -46,6 +46,8 @@ 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*
@@ -60,5 +62,5 @@ find %{buildroot} -iname direct_url.json | xargs -r rm -rf
/usr/lib64/python*/site-packages/anki-%{version}.dist-info/
%changelog
-* Tue Jan 3 2023 windowsboy111
+* Tue Jan 3 2023 windowsboy111 - 2.1.60
- Initial package
diff --git a/anda/apps/anki/anda.hcl b/anda/apps/anki/anda.hcl
index 7da31b7cbe..8c72e132cd 100644
--- a/anda/apps/anki/anda.hcl
+++ b/anda/apps/anki/anda.hcl
@@ -1,5 +1,4 @@
project pkg {
- arches = ["x86_64"]
rpm {
spec = "anki.spec"
}
diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec
index 829e185934..64476eebc2 100644
--- a/anda/apps/anki/anki.spec
+++ b/anda/apps/anki/anki.spec
@@ -1,16 +1,16 @@
Name: anki
-Version: 2.1.63
+Version: 2.1.65
Release: 1%{?dist}
Summary: Flashcard program for using space repetition learning
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
URL: https://apps.ankiweb.net/
-BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks
+BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson
-BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
+BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-devel python3-pyqt6
Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
-Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-qt5-webengine
+Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-qt5-webengine python3-pyqt6
+Recommends: mpv
Obsoletes: anki <= 2.1.15
-BuildArch: noarch
Conflicts: anki-qt5
Patch0: 0001-No-update.patch
@@ -27,6 +27,8 @@ git checkout %{version}
# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki
%build
+export RELEASE=1
+export PYTHONPATH=%_libdir/python3/dist-packages
mold -run ./tools/build
@@ -47,6 +49,8 @@ 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*
@@ -54,11 +58,11 @@ chmod 755 %{buildroot}%{_bindir}/anki
%{_bindir}/anki
%{_datadir}/applications/anki.desktop
%{_datadir}/pixmaps/anki.png
-/usr/lib64/python*/site-packages/aqt/
-/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/
-/usr/lib64/python*/site-packages/_aqt/
-/usr/lib64/python*/site-packages/anki/
-/usr/lib64/python*/site-packages/anki-%{version}.dist-info/
+%_libdir/python*/site-packages/aqt/
+%_libdir/python*/site-packages/aqt-%{version}.dist-info/
+%_libdir/python*/site-packages/_aqt/
+%_libdir/python*/site-packages/anki/
+%_libdir/python*/site-packages/anki-%{version}.dist-info/
%changelog
diff --git a/anda/apps/armcord-bin/armcord-bin.spec b/anda/apps/armcord-bin/armcord-bin.spec
index 303e0494df..4dc9cf8f74 100644
--- a/anda/apps/armcord-bin/armcord-bin.spec
+++ b/anda/apps/armcord-bin/armcord-bin.spec
@@ -10,14 +10,15 @@
Name: armcord-bin
Version: 3.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/ArmCord/ArmCord
Group: Applications/Internet
Source0: %url/releases/download/v%version/%src.tar.gz
Source1: armcord.png
-Requires: electron libnotify xdg-utils
+Source2: https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
+Requires: electron xdg-utils
ExclusiveArch: x86_64 aarch64 armv7l
Conflicts: armcord
@@ -34,9 +35,9 @@ Name=ArmCord
Comment=%summary
GenericName=Internet Messenger
Type=Application
-Exec=/usr/bin/armcord
+Exec=%_bindir/armcord
Icon=armcord
-Categories=Internet;Network;InstantMessaging;
+Categories=Network;InstantMessaging;
StartupWMClass=armcord
Keywords=discord;armcord;vencord;shelter;electron;
EOF
@@ -44,21 +45,28 @@ EOF
%build
%install
-mkdir -p %buildroot/usr/bin %buildroot/usr/share/applications %buildroot/usr/share/pixmaps %buildroot/opt/armcord
-cp -a * %buildroot/opt/armcord
-ln -s /opt/armcord/armcord %buildroot/usr/bin/armcord
-chmod +x -R %buildroot/opt/armcord/*
-chmod 755 %buildroot/opt/armcord/armcord
-install -Dm644 .armcord.desktop %buildroot/usr/share/applications/ArmCord.desktop
-install -Dm644 %SOURCE1 %buildroot/usr/share/pixmaps/armcord.png
+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
-/opt/armcord
-/usr/bin/armcord
-/usr/share/applications/ArmCord.desktop
-/usr/share/pixmaps/armcord.png
+%doc README.md
+%_datadir/armcord
+%_bindir/armcord
+%_datadir/applications/ArmCord.desktop
+%_datadir/pixmaps/armcord.png
%changelog
-* Sat May 6 2023 windowsboy111
-- Initial package
+* Sat Jun 17 2023 windowsboy111 - 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 - 3.1.7-1
+- Initial package
diff --git a/anda/apps/armcord/anda.hcl b/anda/apps/armcord/anda.hcl
index 236771976c..00e296d1b8 100644
--- a/anda/apps/armcord/anda.hcl
+++ b/anda/apps/armcord/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "armcord.spec"
}
diff --git a/anda/apps/armcord/armcord.spec b/anda/apps/armcord/armcord.spec
index 08f79a46d6..6d179e5b23 100644
--- a/anda/apps/armcord/armcord.spec
+++ b/anda/apps/armcord/armcord.spec
@@ -2,16 +2,17 @@
Name: armcord
Version: 3.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/ArmCord/ArmCord
Group: Applications/Internet
Source0: %url/archive/refs/tags/v%version.tar.gz
Source1: launch.sh
-Requires: electron libnotify xdg-utils
+Requires: electron xdg-utils
BuildRequires: nodejs-npm
Conflicts: armcord-bin
+BuildArch: noarch
%description
ArmCord is a custom client designed to enhance your Discord experience
@@ -28,7 +29,7 @@ GenericName=Internet Messenger
Type=Application
Exec=/usr/bin/armcord
Icon=armcord
-Categories=Internet;Network;InstantMessaging;
+Categories=Network;InstantMessaging;
StartupWMClass=armcord
Keywords=discord;armcord;vencord;shelter;electron;
EOF
@@ -55,6 +56,11 @@ install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png
/usr/share/armcord/app.asar
%changelog
-* Sat May 6 2023 windowsboy111
+* Sat Jun 17 2023 windowsboy111 - 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 - 3.1.7-1
- Initial package
diff --git a/anda/apps/authy/authy.spec b/anda/apps/authy/authy.spec
index 87a2ca4f49..1a856b221f 100644
--- a/anda/apps/authy/authy.spec
+++ b/anda/apps/authy/authy.spec
@@ -1,13 +1,13 @@
Name: authy
Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Two factor authentication desktop application
License: Unlicense
URL: https://authy.com/
Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_19.snap
Requires: gtk3
Requires: nss
-BuildRequires: squashfs-tools
+BuildRequires: squashfs-tools desktop-file-utils
%description
%{summary}.
@@ -18,24 +18,30 @@ unsquashfs -q -f -d snap %{SOURCE0}
%build
%install
-install -d "%{buildroot}/opt/authy"
-cp -r "snap/." "%{buildroot}/opt/authy"
+install -d %buildroot%_datadir/authy
+cp -r snap/. %buildroot%_datadir/authy
-sed -i 's|${SNAP}/meta/gui/icon.png|authy|g' "%{buildroot}/opt/authy/meta/gui/authy.desktop"
-install -Dm644 "%{buildroot}/opt/authy/meta/gui/authy.desktop" -t "%{buildroot}/usr/share/applications"
-install -Dm644 "%{buildroot}/opt/authy/meta/gui/icon.png" "%{buildroot}/usr/share/pixmaps/authy.png"
+sed -i 's|${SNAP}/meta/gui/icon.png|authy|g' %buildroot%_datadir/authy/meta/gui/authy.desktop
+install -Dm644 %buildroot%_datadir/authy/meta/gui/authy.desktop -t %buildroot%_datadir/applications
+install -Dm644 %buildroot%_datadir/authy/meta/gui/icon.png %buildroot%_datadir/pixmaps/authy.png
-rm -rf "%{buildroot}/opt/authy"/{data-dir,gnome-platform,lib,meta,scripts,usr,*.sh}
+rm -rf %buildroot%_datadir/authy/{data-dir,gnome-platform,lib,meta,scripts,usr,*.sh}
-install -d "%{buildroot}/usr/bin"
-ln -s "/opt/authy/authy" "%{buildroot}/usr/bin"
+install -d %buildroot%_bindir
+ln -s %_datadir/authy/authy %buildroot%_bindir
+
+%check
+desktop-file-validate %buildroot%_datadir/applications/authy.desktop
%files
-/opt/authy/
-/usr/bin/authy
-/usr/share/applications/authy.desktop
-/usr/share/pixmaps/authy.png
+%_datadir/authy/
+%_bindir/authy
+%_datadir/applications/authy.desktop
+%_datadir/pixmaps/authy.png
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Jun 17 2023 windowsboy111 - 2.3.0-2
+- Use /usr/share/ instead of /opt/
+
+* Sat Oct 15 2022 windowsboy111 - 2.2.1-2
- Initial release
diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec
index c59e0973b2..3d8c0c4f62 100644
--- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec
+++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec
@@ -1,19 +1,24 @@
%define debug_package %{nil}
Name: discord-canary-openasar
-Version: 0.0.154
-Release: 1%{?dist}
-Summary: OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+Version: 0.0.160
+Release: 2%{?dist}
+Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
Source0: https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
Source1: %{url}/releases/download/nightly/app.asar
Group: Applications/Internet
-Requires: libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires: glibc GConf2
+Requires: nspr >= 4.13
+Requires: nss >= 3.27
+Requires: libX11 >= 1.6
+Requires: libXtst >= 1.2
ExclusiveArch: x86_64
%description
-%{summary}.
+OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and
+include more features like further customization and theming.
%prep
%autosetup -n DiscordCanary
@@ -28,8 +33,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-canary-openasar
cp -rv * %{buildroot}%{_datadir}/discord-canary-openasar
mkdir -p %{buildroot}%{_datadir}/applications/
mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary-openasar.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary-openasar.png
+ln -s %_datadir/discord-canary-openasar/discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary-openasar.desktop
+ln -s %_datadir/discord-canary-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary-openasar.png
cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-canary-openasar/resources/app.asar
chmod o+w %{buildroot}%{_datadir}/discord-canary-openasar/resources -R
diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec
index 6ce8f6b642..a8ed52c7fa 100644
--- a/anda/apps/discord-canary/discord-canary.spec
+++ b/anda/apps/discord-canary/discord-canary.spec
@@ -1,32 +1,33 @@
%define debug_package %{nil}
Name: discord-canary
-Version: 0.0.154
-Release: 1%{?dist}
-Summary: Free Voice and Text Chat for Gamers.
+Version: 0.0.160
+Release: 2%{?dist}
+Summary: Free Voice and Text Chat for Gamers
URL: discord.com
Source0: https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
License: https://discord.com/terms
-Requires: libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires: glibc GConf2 nspr >= 4.13 nss >= 3.27 libX11 >= 1.6 libXtst >= 1.2
Group: Applications/Internet
ExclusiveArch: x86_64
%description
-Imagine a place where you can belong to a school club, a gaming group, or a worldwide art community. Where just you and a handful of friends can spend time together. A place that makes it easy to talk every day and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.
%prep
%autosetup -n DiscordCanary
%build
-
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p %{buildroot}%{_datadir}/discord-canary
cp -rv * %{buildroot}%{_datadir}/discord-canary
mkdir -p %{buildroot}%{_datadir}/applications/
mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary.png
+ln -s %_datadir/discord-canary/discord-canary.desktop %{buildroot}%{_datadir}/applications/
+ln -s %_datadir/discord-canary/discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary.png
%files
%{_datadir}/discord-canary/
diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec
index 1263895f71..9b86801c2f 100644
--- a/anda/apps/discord-openasar/discord-openasar.spec
+++ b/anda/apps/discord-openasar/discord-openasar.spec
@@ -2,18 +2,23 @@
Name: discord-openasar
Version: 0.0.27
-Release: 1%{?dist}
-Summary: OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+Release: 2%{?dist}
+Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
Source0: https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
Source1: %{url}/releases/download/nightly/app.asar
Group: Applications/Internet
-Requires: libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires: glibc GConf2
+Requires: nspr >= 4.13
+Requires: nss >= 3.27
+Requires: libX11 >= 1.6
+Requires: libXtst >= 1.2
ExclusiveArch: x86_64
%description
-%{summary}.
+OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and
+include more features like further customization and theming.
%prep
%autosetup -n Discord
@@ -28,8 +33,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-openasar
cp -rv * %{buildroot}%{_datadir}/discord-openasar
mkdir -p %{buildroot}%{_datadir}/applications/
mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord.desktop %{buildroot}%{_datadir}/applications/discord-openasar.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-openasar.png
+ln -s %_datadir/discord-openasar/discord.desktop %{buildroot}%{_datadir}/applications/discord-openasar.desktop
+ln -s %_datadir/discord-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-openasar.png
cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-openasar/resources/app.asar
chmod o+w %{buildroot}%{_datadir}/discord-openasar/resources -R
diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec
index dd51bab150..74ab8915e8 100644
--- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec
+++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec
@@ -2,18 +2,23 @@
Name: discord-ptb-openasar
Version: 0.0.42
-Release: 1%{?dist}
-Summary: OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+Release: 2%{?dist}
+Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
Source0: https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
Source1: %{url}/releases/download/nightly/app.asar
Group: Applications/Internet
-Requires: libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires: glibc GConf2
+Requires: nspr >= 4.13
+Requires: nss >= 3.27
+Requires: libX11 >= 1.6
+Requires: libXtst >= 1.2
ExclusiveArch: x86_64
%description
-%{summary}.
+OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and
+include more features like further customization and theming.
%prep
%autosetup -n DiscordPTB
@@ -28,6 +33,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-ptb-openasar
cp -rv * %{buildroot}%{_datadir}/discord-ptb-openasar
mkdir -p %{buildroot}%{_datadir}/applications/
mkdir -p %{buildroot}%{_datadir}/pixmaps
+ln -s %_datadir/discord-ptb-openasar/discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb-openasar.desktop
+ln -s %_datadir/discord-ptb-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb-openasar.png
install discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb-openasar.desktop
install discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb-openasar.png
cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-ptb-openasar/resources/app.asar
diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec
index 5fc9b5eff2..bcd769d1f3 100644
--- a/anda/apps/discord-ptb/discord-ptb.spec
+++ b/anda/apps/discord-ptb/discord-ptb.spec
@@ -2,16 +2,22 @@
Name: discord-ptb
Version: 0.0.42
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Free Voice and Text Chat for Gamers.
-URL: discord.com
+URL: https://discord.com
Source0: https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
License: https://discord.com/terms
-Requires: libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires: glibc GConf2
+Requires: nspr >= 4.13
+Requires: nss >= 3.27
+Requires: libX11 >= 1.6
+Requires: libXtst >= 1.2
Group: Applications/Internet
ExclusiveArch: x86_64
%description
-Imagine a place where you can belong to a school club, a gaming group, or a worldwide art community. Where just you and a handful of friends can spend time together. A place that makes it easy to talk every day and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.
%prep
%autosetup -n DiscordPTB
@@ -24,8 +30,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-ptb
cp -rv * %{buildroot}%{_datadir}/discord-ptb
mkdir -p %{buildroot}%{_datadir}/applications/
mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb.png
+ln -s %_datadir/discord-ptb/discord-ptb.desktop %{buildroot}%{_datadir}/applications/
+ln -s %_datadir/discord-ptb/discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb.png
%files
%{_datadir}/discord-ptb/
diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec
index ed4cc133ce..7eed626984 100644
--- a/anda/apps/discord/discord.spec
+++ b/anda/apps/discord/discord.spec
@@ -2,12 +2,12 @@
Name: discord
Version: 0.0.27
-Release: 1%{?dist}
-Summary: Free Voice and Text Chat for Gamers.
-URL: discord.com
+Release: 2%{?dist}
+Summary: Free Voice and Text Chat for Gamers
+URL: https://discord.com
Source0: https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
License: https://discord.com/terms
-Requires: libatomic glibc alsa-lib GConf2 libnotify libstdc++ libappindicator libcxx libXScrnSaver
+Requires: glibc GConf2
Requires: nspr >= 4.13
Requires: nss >= 3.27
Requires: libX11 >= 1.6
@@ -15,10 +15,9 @@ Requires: libXtst >= 1.2
Group: Applications/Internet
ExclusiveArch: x86_64
%description
-Imagine a place where you can belong to a school club, a gaming group,
-or a worldwide art community. Where just you and a handful of friends
-can spend time together. A place that makes it easy to talk every day
-and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.
%prep
%autosetup -n Discord
@@ -31,8 +30,8 @@ mkdir -p %{buildroot}%{_datadir}/discord
cp -rv * %{buildroot}%{_datadir}/discord
mkdir -p %{buildroot}%{_datadir}/applications/
mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord.desktop %{buildroot}%{_datadir}/applications/discord.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord.png
+ln -s %_datadir/discord/discord.desktop %{buildroot}%{_datadir}/applications/discord.desktop
+ln -s %_datadir/discord/discord.png %{buildroot}%{_datadir}/pixmaps/discord.png
%files
%{_datadir}/discord/
diff --git a/anda/apps/lomiri-system-settings/lomiri-system-settings.spec b/anda/apps/lomiri-system-settings/lomiri-system-settings.spec
index 4a4531ca4a..94e46e3e49 100644
--- a/anda/apps/lomiri-system-settings/lomiri-system-settings.spec
+++ b/anda/apps/lomiri-system-settings/lomiri-system-settings.spec
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 595b25b5f6ab0fee51e084bb6b0d31ccfb719e73
+%global commit 890b72e8689a90289522f374534b06f85cde9ddb
%forgemeta
Name: lomiri-system-settings
@@ -11,7 +11,6 @@ URL: https://gitlab.com/ubports/development/core/lomiri-system-settings
Source0: %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
Patch1: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch
-Patch2: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2002_use-Noto-font-instead-of-Ubuntu-font.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -58,6 +57,7 @@ developing applications that use %{name}.
%find_lang %{name}
%files -f %{name}.lang
+%doc README.md
%license COPYING
%{_bindir}/lomiri-system-settings
%{_libdir}/libLomiriSystemSettings.so.*
diff --git a/anda/apps/lomiri-system-settings/update.rhai b/anda/apps/lomiri-system-settings/update.rhai
new file mode 100644
index 0000000000..6d6b8ae10d
--- /dev/null
+++ b/anda/apps/lomiri-system-settings/update.rhai
@@ -0,0 +1,3 @@
+let o = get("https://gitlab.com/api/v4/projects/25770177/repository/tags").json_arr()[0];
+rpm.version(o.name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/25770177/repository/commits").json_arr()[0].id);
diff --git a/anda/apps/vala-panel-appmenu/update.rhai b/anda/apps/vala-panel-appmenu/update.rhai
new file mode 100644
index 0000000000..90f03e6ca9
--- /dev/null
+++ b/anda/apps/vala-panel-appmenu/update.rhai
@@ -0,0 +1,3 @@
+let o = get("https://gitlab.com/api/v4/projects/6865053/repository/tags").json_arr()[0];
+rpm.version(o.name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/6865053/repository/commits").json_arr()[0].id);
diff --git a/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec b/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec
index fa7397396c..aee519f693 100644
--- a/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec
+++ b/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec
@@ -1,15 +1,16 @@
%global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
-%global commit 99cd56c1644fe4193854902c450e67f9a6685112
+%global commit 76442be6195385193cb5931d0004122310d40c95
%forgemeta
Name: vala-panel-appmenu
Version: 0.7.6
-Release: %autorelease
+Release: 2%?dist
License: LGPL-3.0-or-later
-Summary: This package provides Application Menu plugin for vala-panel
+Summary: Application Menu plugin for vala-panel
URL: %{forgeurl}
Source: %{forgesource}
+BuildRequires: fdupes
BuildRequires: bamf-daemon
BuildRequires: meson
BuildRequires: ninja-build
@@ -32,39 +33,35 @@ BuildRequires: pkgconfig(dbusmenu-glib-0.4)
BuildRequires: pkgconfig(vala-panel)
BuildRequires: pkgconfig(libmatepanelapplet-4.0)
Provides: vala-panel-appmenu-plugin = %{version}
-Requires: unity-gtk3-module
-Requires: unity-gtk2-module
Requires: bamf-daemon
-Requires: libdbusmenu
-Requires: libdbusmenu-gtk2
-Requires: libdbusmenu-gtk3
%description
-Vala Panel Application Menu is a Global Menu applet for use with Vala Panel, xfce4-panel and mate-panel (Budgie 10.x is also planned).
+Vala Panel Application Menu is a Global Menu applet for use with Vala Panel,
+xfce4-panel and mate-panel (Budgie 10.x is also planned).
Unity-gtk-module is used as a backend
%package -n xfce4-vala-panel-appmenu-plugin
-Summary: This package provides Application Menu plugin for xfce4-panel
-Requires: xfce4-panel
-Requires: vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
+Summary: Application Menu plugin for xfce4-panel
+Requires: xfce4-panel
+Requires: vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
%description -n xfce4-vala-panel-appmenu-plugin
XFCE4 desktop plugin for %{name}.
%package -n mate-vala-panel-appmenu-plugin
-Summary: This package provides Application Menu plugin for xfce4-panel
-Requires: mate-panel
-Requires: vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
+Summary: Application Menu plugin for xfce4-panel
+Requires: mate-panel
+Requires: vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
%description -n mate-vala-panel-appmenu-plugin
Mate desktop plugin for %{name}.
%package -n budgie-vala-panel-appmenu-plugin
-Summary: This package provides Application Menu plugin for xfce4-panel
-Requires: budgie-desktop
-Requires: vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
+Summary: Application Menu plugin for xfce4-panel
+Requires: budgie-desktop
+Requires: vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
%description -n budgie-vala-panel-appmenu-plugin
Budgie desktop plugin for %{name}.
@@ -80,7 +77,6 @@ Header files, libraries, and other files for developing %{name}.
%package -n vala-panel-appmenu-gtk-module
Summary: Gtk3MenuShell D-Bus exporter
-Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n vala-panel-appmenu-gtk-module
GTK (2, 3) module that exports GtkMenuShells over D-Bus.
@@ -95,6 +91,7 @@ GTK (2, 3) module that exports GtkMenuShells over D-Bus.
%install
%meson_install
+%fdupes %buildroot%_datadir/locale/
%find_lang vala-panel-appmenu
%files -f vala-panel-appmenu.lang
diff --git a/anda/apps/vala-panel/vala-panel.spec b/anda/apps/vala-panel/vala-panel.spec
index b62d2f0856..5f403e84fd 100644
--- a/anda/apps/vala-panel/vala-panel.spec
+++ b/anda/apps/vala-panel/vala-panel.spec
@@ -5,12 +5,13 @@
Name: vala-panel
Version: 0.5.0
-Release: %autorelease
+Release: 2%?dist
License: LGPL-3.0-or-later
Summary: This package provides Application Menu plugin for vala-panel
URL: %{forgeurl}
Source: %{forgesource}
+BuildRequires: fdupes
BuildRequires: meson
BuildRequires: vala
BuildRequires: desktop-file-utils
@@ -42,18 +43,20 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%install
%meson_install
+%fdupes %buildroot%_datadir/locale/
%find_lang %{name}
# Already packaged
rm -rf %{buildroot}%{_datadir}/vala-panel/doc
+%check
desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.application.desktop
# Seems to succeed with other appstream checkers and works but fails
#appstream-util validate-relax --nonet {buildroot}{_datadir}/appdata/org.valapanel.application.appdata.xml
%files -f %{name}.lang
-%doc README.md LICENSE
+%doc README.md
%license LICENSE
-%{_sysconfdir}/xdg/vala-panel/
+%config %{_sysconfdir}/xdg/vala-panel/
%{_bindir}/vala-*
%{_libdir}/libvalapanel.so.*
%dir %{_libdir}/vala-panel
@@ -72,6 +75,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
%{_datadir}/vala-panel/images/background.png
%files devel
+%doc README.md
+%license LICENSE
%dir %{_includedir}/vala-panel
%{_includedir}/vala-panel/*.h
%{_libdir}/libvalapanel.so
diff --git a/anda/audio/distrho/distrho.spec b/anda/audio/distrho/distrho.spec
index 5233d4351c..ebfa3adec8 100644
--- a/anda/audio/distrho/distrho.spec
+++ b/anda/audio/distrho/distrho.spec
@@ -26,37 +26,36 @@ BuildRequires: pkgconfig(xcursor)
%description
Misc audio production plugins ported to linux lv2 plugins by DISTRHO
-# Dexed
%package dexed
-Summary: Dexed is a multi platform, multi format plugin synth that is closely modeled on the Yamaha DX7
+Summary: A multi platform, multi format plugin synth closely modeled on the Yamaha DX7
%description dexed
-Dexed is a multi platform, multi format plugin synth that is closely modeled on the Yamaha DX7.
-Dexed is also a midi cartridge librarian/manager for the DX7
+Dexed is a multi platform, multi format plugin synth that is closely modeled on
+the Yamaha DX7. Dexed is also a midi cartridge librarian/manager for the DX7.
-# Vitalium
%package vitalium
-Summary: vitalium is a spectral warping wavetable synthesizer
+Summary: A spectral warping wavetable synthesizer
Provides: vitalium-vst = %{version}-%{release}
Provides: vitalium-lv2 = %{version}-%{release}
Provides: vitalium = %{version}-%{release}
+
%description vitalium
-vitalium is the Open Source version of the Vital spectral warping wavetable synthesizer
+vitalium is the Open Source version of the Vital spectral warping wavetable
+synthesizer.
+
%package TAL
-Summary: Misc Plugins for TAL (tal-filter, tal-filter-2, tal-noisemaker, tal-reverb, tal-reverb-2, tal-reverb-3, tal-vocoder-2)
-
-# TAL
+Summary: Misc Plugins for TAL
%description TAL
-Misc Plugins for TAL (tal-filter, tal-filter-2, tal-noisemaker, tal-reverb, tal-reverb-2, tal-reverb-3, tal-vocoder-2)
+Misc Plugins for TAL (tal-filter, tal-filter-2, tal-noisemaker, tal-reverb,
+tal-reverb-2, tal-reverb-3, tal-vocoder-2).
+
%package dRowAudio
-Summary: Plugins from dRowAudio (distortion, distortionshaper, flanger, reverb, tremolo)
-
-# dRowAudio
+Summary: Plugins from dRowAudio
%description dRowAudio
Plugins from dRowAudio (distortion, distortionshaper, flanger, reverb, tremolo)
@@ -68,132 +67,132 @@ Summary: Arctican lv2 plugins
%description Arctican
Plugins from Arctican (The Functiom & The Pilgrim)
-# LUFS
%package LUFS
Summary: Klangfreund metering plugins (Multimeter + LUFS Meter)
%description LUFS
-Klangfreund metering plugins (Multimeter + LUFS Meter)
+Klangfreund metering plugins (Multimeter + LUFS Meter).
-# EasySSP
%package EasySSP
-Summary: Easy Sound Space Perception is a small and lightweight audio visualization tool
+Summary: A small and lightweight audio visualization tool
%description EasySSP
-Easy Sound Space Perception is a small and lightweight audio visualization tool, which currently provides spectrometer and goniometer views.
+Easy Sound Space Perception is a small and lightweight audio visualization tool
+that currently provides spectrometer and goniometer views.
-# JuceOPL
%package JuceOPL
Summary: Classic game sounds in Plugin form, as heard in late 80s / early 90s sound cards
%description JuceOPL
-Classic game sounds in Plugin form, as heard in late 80s / early 90s sound cards.
+Classic game sounds in Plugin form,
+as heard in late 80s / early 90s sound cards.
-# KlangFalter
%package KlangFalter
-Summary: KlangFalter is a convolution audio plugin
+Summary: A convolution audio plugin
%description KlangFalter
KlangFalter is a convolution audio plugin
-# Luftikus
%package Luftikus
Summary: Luftikus plugin
%description Luftikus
-Luftikus is a digital adaptation of an analog EQ with fixed half-octave bands and additional high frequency boost.
-As an improvement to the hardware it allows deeper cuts and supports a keep-gain mode where overall gain changes are avoided.
+Luftikus is a digital adaptation of an analog EQ with fixed half-octave bands
+and additional high frequency boost. As an improvement to the hardware it
+allows deeper cuts and supports a keep-gain mode where overall gain changes are
+avoided.
-# Obxd
%package Obxd
-Summary: Obxd is emulation of famous ob-x, ob-xa and ob8 synths
+Summary: Emulation of famous ob-x, ob-xa and ob8 synths
%description Obxd
Obxd is emulation of famous ob-x, ob-xa and ob8 synths.
-# Refine
%package ReFine
Summary: ReFine plugin
%description ReFine
-ReFine is a plugin that allows to add a final polishing to your tracks, busses and masters.
-It extracts psycho-acoustic parameters from the source and thus allows to add warmth, space and punch to your mixes.
+ReFine is a plugin that allows to add a final polishing to your tracks, busses
+and masters. It extracts psycho-acoustic parameters from the source and thus
+allows to add warmth, space and punch to your mixes.
-# Wolpertinger
%package Wolpertinger
-Summary: Wolpertinger is a subtractive, antialiased polyphonic software synthesizer
+Summary: A subtractive, antialiased polyphonic software synthesizer
%description Wolpertinger
Wolpertinger is a subtractive, antialiased polyphonic software synthesizer.
-# Vex
%package Vex
-Summary: Vex is a 3 oscillator subtractive waverom synth
+Summary: A 3 oscillator subtractive waverom synth
%description Vex
Vex is a 3 oscillator subtractive waverom synth
-# Temper
+
%package Temper
-Summary: Temper is a modern digital distortion plugin
+Summary: A modern digital distortion plugin
%description Temper
-Temper is a modern digital distortion plugin featuring a rich saturation stage and a unique phase distortion.
-Use the variable saturation curve to add warmth and edge to your sound, and let the phase distortion bring character and clarity through your mix.
-Temper also features a simple resonant lowpass filter and a feedback path to drive the intensity of the tone.
+Temper is a modern digital distortion plugin featuring a rich saturation stage
+and a unique phase distortion. Use the variable saturation curve to add warmth
+and edge to your sound, and let the phase distortion bring character and
+clarity through your mix. Temper also features a simple resonant lowpass filter
+and a feedback path to drive the intensity of the tone.
+
-# SwankyAmp
%package SwankyAmp
-Summary: Swanky Amp is a tube amplifier emulation plug-in
+Summary: A tube amplifier emulation plug-in
%description SwankyAmp
-Swanky Amp is a tube amplifier emulation plug-in which is based on detailed simulations of tube amplification.
-Discover new tones effortlessly with intuitive controls, harnessing the coveted sounds of dynamic tube amplification.
+Swanky Amp is a tube amplifier emulation plug-in based on detailed simulations
+of tube amplification. Discover new tones effortlessly with intuitive controls,
+harnessing the coveted sounds of dynamic tube amplification.
+
-# PitchedDelay
%package PitchedDelay
Summary: PitchedDelay is a delay that allows the pitching the delayed signal
%description PitchedDelay
-PitchedDelay is a delay that allows the pitching the delayed signal, within or outside the feedback loop.
+PitchedDelay is a delay that allows the pitching the delayed signal, within or
+outside the feedback loop.
+
-# StereoSourceSeparation
%package StereoSourceSeparation
Summary: Stereo Source Separation plugin
%description StereoSourceSeparation
-This is a plugin that uses the spatial information hidden in the stereo signal to accomplish source separation.
+This is a plugin that uses the spatial information hidden in the stereo signal
+to accomplish source separation.
-# HiReSam
%package HiReSam
Summary: Klangfreund High Resolution Spectrum Analyse Meter
%description HiReSam
-Klangfreund High Resolution Spectrum Analyse Meter
+%summary.
+
-# eqinox
%package eqinox
Summary: EQinox equaliser plugin
%description eqinox
-EQinox equaliser plugin
+EQinox equaliser plugin.
+
-# drumsynth
%package drumsynth
-Summary: drumsynth plugin
+Summary: Plugin for drumsynth
%description drumsynth
-drumsynth plugin
+%summary.
%prep
%autosetup -p1 -n DISTRHO-Ports-%{github_release}
diff --git a/anda/audio/voicevox/0001-feat-add-repository-entry-in-package.json.patch b/anda/audio/voicevox/0001-feat-add-repository-entry-in-package.json.patch
new file mode 100644
index 0000000000..8b3c61bd79
--- /dev/null
+++ b/anda/audio/voicevox/0001-feat-add-repository-entry-in-package.json.patch
@@ -0,0 +1,22 @@
+From 6b8c81d1d4ac0ac562b69e7f8164c8a92dafe13a Mon Sep 17 00:00:00 2001
+From: windowsboy111
+Date: Mon, 19 Jun 2023 10:33:20 +0800
+Subject: [PATCH] feat: add repository entry in package.json
+
+---
+ package.json | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/package.json b/package.json
+index 622756a..b3d3dfa 100644
+--- a/package.json
++++ b/package.json
+@@ -1,4 +1,5 @@
+ {
++ "repository": "github:VOICEVOX/voicevox",
+ "name": "voicevox",
+ "version": "999.999.999",
+ "author": "Hiroshiba Kazuyuki",
+--
+2.40.1
+
diff --git a/anda/lib/libunity/anda.hcl b/anda/audio/voicevox/anda.hcl
similarity index 50%
rename from anda/lib/libunity/anda.hcl
rename to anda/audio/voicevox/anda.hcl
index d25dbe3c3c..2a748721bc 100644
--- a/anda/lib/libunity/anda.hcl
+++ b/anda/audio/voicevox/anda.hcl
@@ -1,5 +1,5 @@
project pkg {
rpm {
- spec = "libunity.spec"
+ spec = "voicevox.spec"
}
}
diff --git a/anda/audio/voicevox/update.rhai b/anda/audio/voicevox/update.rhai
new file mode 100644
index 0000000000..212b012879
--- /dev/null
+++ b/anda/audio/voicevox/update.rhai
@@ -0,0 +1,9 @@
+// let v = gh("VOICEVOX/voicevox");
+// rpm.version(v);
+// let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
+// rpm.define("nodev", find(">=([\\d.]+)", engines.node, 1));
+// rpm.define("nodev", find(">=([\\d.]+)", engines.npm, 1));
+let v = "0.14.7";
+let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
+print(find(">=([\\d.]+)", engines.node, 1));
+print(find(">=([\\d.]+)", engines.npm, 1));
diff --git a/anda/audio/voicevox/voicevox.spec b/anda/audio/voicevox/voicevox.spec
new file mode 100644
index 0000000000..a42c656019
--- /dev/null
+++ b/anda/audio/voicevox/voicevox.spec
@@ -0,0 +1,60 @@
+%global nodev 16.17.0
+%global npmv 8.11.0
+%define debug_package %nil
+
+Name: voicevox
+Version: 0.14.7
+Release: 1%?dist
+Summary: Free Japanese text-to-speech editor
+License: LGPL-3.0
+URL: https://voicevox.hiroshiba.jp
+Source0: https://github.com/VOICEVOX/voicevox/archive/refs/tags/%version.tar.gz
+# requires specific node and npm version
+%ifarch x86_64
+%global a x64
+%elifarch aarch64
+%global a arm64
+%endif
+Source1: https://nodejs.org/download/release/v%nodev/node-v%nodev-linux-%a.tar.xz
+Patch0: 0001-feat-add-repository-entry-in-package.json.patch
+
+%description
+VOICEVOX is a free Japanese text-to-speech software with medium output quality.
+
+%package doc
+Summary: Documentation files for voicevox (Japanese)
+
+%description doc
+%summary.
+
+%prep
+%autosetup -p1
+tar xf %SOURCE1
+PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
+npx npm@%npmv i
+
+%build
+PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
+npx browserslist@latest --update-db
+PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
+npm run electron:build
+
+%install
+rm dist_electron/linux-unpacked/README.txt # dummy
+mkdir -p %buildroot%_datadir/%name %buildroot%_bindir %buildroot%_docdir/%name/res
+mv dist_electron/linux-unpacked/* %buildroot%_datadir/%name/
+ln -s %_datadir/%name/%name %buildroot%_bindir/%name
+install -Dm644 docs/*.md %buildroot%_docdir/%name/
+install -Dm644 docs/res/* %buildroot%_docdir/%name/res/
+
+%files
+%doc README.md
+%license LICENSE LGPL_LICENSE
+%_bindir/%name
+%_datadir/%name/
+
+%files doc
+%doc %_docdir/%name/
+
+%changelog
+%autochangelog
diff --git a/anda/crystal/blahaj/blahaj.spec b/anda/crystal/blahaj/blahaj.spec
index 57b5d793a6..1ff80622de 100644
--- a/anda/crystal/blahaj/blahaj.spec
+++ b/anda/crystal/blahaj/blahaj.spec
@@ -7,28 +7,33 @@ Summary: Gay sharks at your local terminal - lolcat-like CLI tool
License: BSD-2-Clause
URL: https://blahaj.queer.software
Source0: https://github.com/GeopJr/BLAHAJ/archive/refs/tags/v%version.tar.gz
-BuildRequires: crystal make gcc libyaml-devel pcre-devel
+BuildRequires: crystal gcc libyaml-devel pcre-devel
ExclusiveArch: x86_64
%description
-Apart from a cute cuddly shark plushie from IKEA, BLÅHAJ is a lolcat-like CLI tool that colorizes your input, shows flags and prints colorful sharks!
-It has a wide variety of flags/colors to choose from and many options from flag size to whether to colorize by line, word or character.
+Apart from a cute cuddly shark plushie from IKEA, BLÅHAJ is a lolcat-like CLI
+tool that colorizes your input, shows flags and prints colorful sharks!
+It has a wide variety of flags/colors to choose from and many options from flag
+size to whether to colorize by line, word or character.
%prep
%autosetup -n BLAHAJ-%{version}
%build
-%make_build
+shards build --production --release -D "-fPIE" --link-flags "-pie"
%install
-%make_install
+mkdir -p %buildroot%_bindir
+install -Dm755 bin/blahaj %buildroot%_bindir/
%check
-make test_mt
+crystal spec --order random -Dpreview_mt
%files
-/usr/bin/blahaj
+%doc README.md
+%license LICENSE
+%_bindir/blahaj
%changelog
-* Sat Apr 15 2023 windowsboy111
+* Sat Apr 15 2023 windowsboy111 - 2.0.1-1
- Initial package.
diff --git a/anda/crystal/crystal/crystal.spec b/anda/crystal/crystal/crystal.spec
index 2dea01d896..49b8fe9bf3 100644
--- a/anda/crystal/crystal/crystal.spec
+++ b/anda/crystal/crystal/crystal.spec
@@ -2,16 +2,23 @@
Name: crystal
Version: 1.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Crystal Programming Language
License: Apache-2.0
URL: https://crystal-lang.org/
Source0: https://github.com/crystal-lang/crystal/releases/download/%version/crystal-%version-1-linux-x86_64-bundled.tar.gz
ExclusiveArch: x86_64
+BuildRequires: rpm_macro(fdupes)
%description
%summary.
+%package devel
+Summary: Development files for the crystal package
+
+%description devel
+%summary.
+
%prep
%autosetup -n crystal-%version-1
@@ -25,10 +32,12 @@ install -Dm755 bin/* %buildroot/usr/bin/
cp -r share/* %buildroot/usr/share/
cp -r lib/crystal/* %buildroot/usr/lib/crystal/
+%fdupes %buildroot%_datadir/crystal/src/lib_c/
+
+
%files
%license /usr/share/licenses/crystal/LICENSE
/usr/bin/crystal
-/usr/lib/crystal/
/usr/share/zsh/site-functions/_crystal
/usr/share/man/man1/crystal.1.gz
/usr/share/crystal/
@@ -39,7 +48,13 @@ cp -r lib/crystal/* %buildroot/usr/lib/crystal/
/usr/share/man/man1/shards.1.gz
/usr/share/man/man5/shard.yml.5.gz
+%files devel
+/usr/lib/crystal/
+
%changelog
-* Sat Apr 15 2023 windowsboy111
+* Sat Jun 17 2023 windowsboy111 - 1.8.2-2
+- Add devel package.
+
+* Sat Apr 15 2023 windowsboy111 - 1.8.0-1
- Initial package.
diff --git a/anda/dart/dart.spec b/anda/dart/dart.spec
index 2669ffe295..cb6d88f850 100644
--- a/anda/dart/dart.spec
+++ b/anda/dart/dart.spec
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: dart
-Version: 3.0.1
+Version: 3.0.5
Release: 1%{?dist}
Summary: The Dart Language
License: BSD-3-Clause
@@ -18,9 +18,11 @@ URL: https://dart.dev/
%endif
Source0: https://storage.googleapis.com/dart-archive/channels/stable/release/%{version}/sdk/dartsdk-linux-%{arch}-release.zip
+BuildRequires: fdupes
%description
-Dart is a client-optimized language for fast apps on any platform. This package contains the SDK used to develop and compile Dart applications.
+Dart is a client-optimized language for fast apps on any platform.
+This package contains the SDK used to develop and compile Dart applications.
%prep
%setup -q -n dart-sdk
@@ -37,6 +39,8 @@ cp -rv ./* %{buildroot}%{_libdir}/dart
ln -sf %{_libdir}/dart/bin/dart %{buildroot}%{_bindir}/dart
ln -sf %{_libdir}/dart/bin/dartaotruntime %{buildroot}%{_bindir}/dartaotruntime
+%fdupes %buildroot%_libdir/dart/bin/
+
%files
%{_libdir}/dart/
%{_bindir}/dart
diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec
index 7c27624b7b..7783ef036c 100644
--- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec
+++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec
@@ -1,7 +1,6 @@
-
Name: budgie-extras
Version: 1.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0
Summary: Additional Budgie Desktop enhancements for user experience
@@ -10,6 +9,7 @@ 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
+BuildRequires: rpm_macro(fdupes)
BuildRequires: cmake
BuildRequires: meson
BuildRequires: vala
@@ -69,6 +69,7 @@ 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
The shared component provides for capabilities that are utilised between
budgie-extra applets.
@@ -282,6 +283,8 @@ 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
@@ -294,7 +297,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
%{_datadir}/glib-2.0/schemas/20_budgie-extras.gschema.override
%files daemon
-%{_sysconfdir}/xdg/autostart/budgie-extras-daemon.desktop
+%config %{_sysconfdir}/xdg/autostart/budgie-extras-daemon.desktop
%{_bindir}/budgie-extras-daemon
%{_libdir}/budgie-extras-daemon/invoke.py
%{_datadir}/budgie-desktop/layouts/*.layout
@@ -335,7 +338,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
%files -n budgie-applet-hotcorners
%{_libdir}/budgie-desktop/plugins/budgie-hotcorners
-%{_sysconfdir}/xdg/autostart/org.ubuntubudgie.budgie-extras.HotCorners-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/org.ubuntubudgie.budgie-extras.HotCorners-autostart.desktop
%{_datadir}/glib-2.0/schemas/org.ubuntubudgie.budgie-extras.HotCorners.gschema.xml
%{_datadir}/applications/org.ubuntubudgie.budgie-extras.HotCorners.desktop
%{_datadir}/budgie-hotcorners
@@ -357,7 +360,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
%{_libdir}/budgie-desktop/plugins/budgie-network-manager
%files -n budgie-applet-quickchar
-%{_sysconfdir}/xdg/autostart/quickchar-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/quickchar-autostart.desktop
%ghost %{_bindir}/quickchar
%{_libdir}/quickchar
%{_datadir}/applications/org.ubuntubudgie.quickchar.desktop
@@ -394,13 +397,13 @@ rm -f %{buildroot}%{_bindir}/quickchar
%{_libdir}/budgie-desktop/plugins/budgie-trash
%files -n budgie-applet-visualspace
-%{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
%{_libdir}/budgie-desktop/plugins/budgie-visualspace
%{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.budgie-visualspace.gschema.xml
%{_datadir}/pixmaps/visualspace-symbolic.svg
%files -n budgie-applet-wallstreet
-%{_sysconfdir}/xdg/autostart/wallstreet-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/wallstreet-autostart.desktop
%{_libdir}/budgie-wallstreet/wallstreet*
%{_datadir}/applications/org.ubuntubudgie.wallstreetcontrol.desktop
%{_datadir}/glib-2.0/schemas/org.ubuntubudgie.budgie-wallstreet.gschema.xml
@@ -413,9 +416,9 @@ rm -f %{buildroot}%{_bindir}/quickchar
%{_datadir}/pixmaps/budgie-wticon-symbolic.svg
%files -n budgie-applet-window-shuffler
-%{_sysconfdir}/xdg/autostart/layoutspopup-autostart.desktop
-%{_sysconfdir}/xdg/autostart/dragsnap-autostart.desktop
-%{_sysconfdir}/xdg/autostart/shuffler*.desktop
+%config %{_sysconfdir}/xdg/autostart/layoutspopup-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/dragsnap-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/shuffler*.desktop
%{_libdir}/budgie-window-shuffler
%{_datadir}/applications/org.ubuntubudgie.shufflercontrol.desktop
%{_datadir}/icons/hicolor/scalable/apps/org.ubuntubudgie.shuffler-control.svg
@@ -433,7 +436,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
%{_datadir}/pixmaps/budgie-wstopwatch-symbolic.svg
%files -n budgie-applet-wpreviews
-%{_sysconfdir}/xdg/autostart/previews-*.desktop
+%config %{_sysconfdir}/xdg/autostart/previews-*.desktop
%{_libdir}/budgie-previews
%{_datadir}/applications/org.ubuntubudgie.previewscontrols.desktop
%{_datadir}/metainfo/org.ubuntubudgie.previewscontrols.metainfo.xml
diff --git a/anda/desktops/compiz9/compiz9.spec b/anda/desktops/compiz9/compiz9.spec
index 3b36c9942d..99a67d7b5a 100644
--- a/anda/desktops/compiz9/compiz9.spec
+++ b/anda/desktops/compiz9/compiz9.spec
@@ -1,9 +1,9 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu1
+%define _ubuntu_rel 22.10.20220822-0ubuntu3
%global _hardened_build 0
Name: compiz9
Version: 0.9.14.2
-Release: %autorelease
+Release: 3%?dist
Summary: OpenGL window and compositing manager 0.9.X.X series
License: GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT
@@ -14,6 +14,7 @@ Patch1: gtk-extents.patch
Patch2: focus-prevention-disable.patch
Conflicts: compiz
+BuildRequires: rpm_macro(fdupes)
BuildRequires: libX11-devel
BuildRequires: libdrm-devel
BuildRequires: libXcursor-devel
@@ -66,6 +67,7 @@ This package contains the development files for %{name}.
%package -n python3-ccsm
Summary: Compiz Config Manager
Conflicts: ccsm
+BuildArch: noarch
Requires: %{name}%{?_isa}
%description -n python3-ccsm
@@ -102,10 +104,14 @@ 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 INSTALL NEWS
+%doc AUTHORS README NEWS
%license COPYING COPYING.GPL COPYING.LGPL COPYING.MIT
-%config %{_sysconfdir}/compizconfig/config.conf
+%config(noreplace) %{_sysconfdir}/compizconfig/config.conf
%{_bindir}/compiz
%{_bindir}/compiz-decorator
%{_bindir}/gtk-window-decorator
diff --git a/anda/desktops/compiz9/update.rhai b/anda/desktops/compiz9/update.rhai
new file mode 100644
index 0000000000..b14bc269eb
--- /dev/null
+++ b/anda/desktops/compiz9/update.rhai
@@ -0,0 +1,5 @@
+let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/c/compiz/?C=N;O=D");
+let v = find("compiz_([\\d.]+)\\+(.+?).tar.xz", html, 1);
+let r = find("compiz_([\\d.]+)\\+(.+?).tar.xz", html, 2);
+rpm.version(v);
+rpm.define("_ubuntu_rel", r);
diff --git a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec
index 1002047e74..cea9610dfa 100644
--- a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec
+++ b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec
@@ -3,8 +3,8 @@
Name: elementary-calculator
Summary: Calculator app designed for elementary
-Version: 2.0.1
-Release: %autorelease
+Version: 2.0.2
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/%{srcname}
@@ -18,6 +18,7 @@ BuildRequires: vala
BuildRequires: pkgconfig(granite-7) >= 7.0.0
BuildRequires: pkgconfig(gtk4)
+BuildRequires: fdupes
Requires: hicolor-icon-theme
@@ -45,13 +46,15 @@ functions (sin, cos, and tan).
%find_lang %{appname}
+%fdupes %buildroot/%_datadir/icons/hicolor
+
%check
desktop-file-validate \
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
appstream-util validate-relax --nonet \
- %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+ %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
%files -f %{appname}.lang
@@ -63,9 +66,9 @@ appstream-util validate-relax --nonet \
%{_datadir}/applications/%{appname}.desktop
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 1.7.2-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec
index b7eae6dc28..714e5722f4 100644
--- a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec
+++ b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec
@@ -6,7 +6,7 @@
Name: elementary-calendar
Summary: Desktop calendar app designed for elementary
Version: 6.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/calendar
@@ -32,6 +32,7 @@ BuildRequires: libhandy >= 0.90.0
BuildRequires: meson
BuildRequires: vala
BuildRequires: evolution-data-server-devel
+BuildRequires: fdupes
Requires: hicolor-icon-theme
@@ -64,6 +65,8 @@ This package contains the development files.
%find_lang %{appname}
+%fdupes %buildroot/%_datadir/icons/hicolor
+
%check
desktop-file-validate \
diff --git a/anda/desktops/elementary/elementary-camera/elementary-camera.spec b/anda/desktops/elementary/elementary-camera/elementary-camera.spec
index 081f7267ca..212e3eca6f 100644
--- a/anda/desktops/elementary/elementary-camera/elementary-camera.spec
+++ b/anda/desktops/elementary/elementary-camera/elementary-camera.spec
@@ -3,8 +3,8 @@
Name: elementary-camera
Summary: Camera app designed for elementary
-Version: 6.2.1
-Release: 1%{?dist}
+Version: 6.2.2
+Release: 2%{?dist}
License: GPL-3.0
URL: https://github.com/elementary/camera
@@ -15,6 +15,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson >= 0.46
BuildRequires: vala
+BuildRequires: fdupes
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(gio-2.0)
@@ -46,13 +47,16 @@ Camera is a simple app to take photos with a webcam.
%find_lang %{appname}
+%fdupes %buildroot/%_datadir/icons/hicolor
+
+
%check
desktop-file-validate \
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
appstream-util validate-relax --nonet \
- %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+ %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
%files -f %{appname}.lang
@@ -64,7 +68,7 @@ appstream-util validate-relax --nonet \
%{_datadir}/applications/%{appname}.desktop
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
%changelog
diff --git a/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec b/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec
index dbeeb6cbc0..161398c650 100644
--- a/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec
+++ b/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec
@@ -3,7 +3,7 @@
Name: elementary-capnet-assist
Summary: Captive Portal Assistant for elementary
-Version: 2.4.3
+Version: 2.4.4
Release: 2%{?dist}
License: GPL-3.0-or-later
@@ -25,6 +25,7 @@ BuildRequires: pkgconfig(granite)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libhandy-1) >= 1.0.0
BuildRequires: pkgconfig(webkit2gtk-4.1)
+BuildRequires: fdupes
Requires: NetworkManager
Requires: hicolor-icon-theme
@@ -54,13 +55,15 @@ Written in Vala and using WebkitGtk+.
%find_lang %{appname}
+%fdupes %buildroot%_datadir/icons/hicolor/
+
%check
desktop-file-validate \
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
appstream-util validate-relax --nonet \
- %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+ %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
%files -f %{appname}.lang
@@ -72,9 +75,9 @@ appstream-util validate-relax --nonet \
%{_datadir}/applications/%{appname}.desktop
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 2.4.2-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-code/elementary-code.spec b/anda/desktops/elementary/elementary-code/elementary-code.spec
index 042719fae8..0358234512 100644
--- a/anda/desktops/elementary/elementary-code/elementary-code.spec
+++ b/anda/desktops/elementary/elementary-code/elementary-code.spec
@@ -6,7 +6,7 @@
Name: elementary-code
Summary: Code editor from elementary
Version: 7.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL-3.0
URL: https://github.com/elementary/%{srcname}
@@ -38,6 +38,7 @@ BuildRequires: pkgconfig(libpeas-gtk-1.0)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(pangoft2)
BuildRequires: pkgconfig(vte-2.91)
+BuildRequires: fdupes
Requires: hicolor-icon-theme
@@ -68,6 +69,8 @@ This package contains the development headers.
%find_lang %{appname}
+%fdupes %buildroot%_datadir/icons/hicolor/
+
%files -f %{appname}.lang
%doc README.md
@@ -99,5 +102,5 @@ This package contains the development headers.
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 6.2.0-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-files/elementary-files.spec b/anda/desktops/elementary/elementary-files/elementary-files.spec
index 554c1bac04..c72f4ddd35 100644
--- a/anda/desktops/elementary/elementary-files/elementary-files.spec
+++ b/anda/desktops/elementary/elementary-files/elementary-files.spec
@@ -6,7 +6,7 @@
Name: elementary-files
Summary: File manager from elementary
Version: 6.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0
URL: https://github.com/elementary/%{srcname}
@@ -21,6 +21,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson >= 0.50.0
BuildRequires: vala >= 0.48.2
+BuildRequires: fdupes
BuildRequires: pkgconfig(cloudproviders) >= 0.3.0
BuildRequires: pkgconfig(gdk-x11-3.0)
@@ -84,6 +85,8 @@ This package contains the development headers.
%find_lang %{appname}
+%fdupes %buildroot%_datadir/icons/hicolor/
+
# remove unused pixmaps
rm -r %{buildroot}/%{_datadir}/pixmaps
diff --git a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec
index 9bae08259b..a7cd1b04ea 100644
--- a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec
+++ b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec
@@ -4,19 +4,20 @@
Name: elementary-greeter
Summary: LightDM Login Screen for the elementary desktop
Version: 6.1.1
-Release: %autorelease
+Release: 3%{?dist}
License: GPL-3.0
URL: https://github.com/elementary/greeter
Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
Source1: 40-%{appname}.conf
-Patch0: https://github.com/elementary/greeter/compare/93bbca3..0f47402.patch
+Patch0: https://github.com/elementary/greeter/compare/93bbca3..1b3879d.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala
+BuildRequires: fdupes
BuildRequires: mesa-libEGL-devel
@@ -81,6 +82,8 @@ The elementary Greeter is a styled Login Screen for LightDM.
%find_lang %{appname}
+%fdupes %buildroot%_datadir/icons/hicolor/
+
# install LightDM configuration file
mkdir -p %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d
install -pm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/
@@ -103,8 +106,9 @@ appstream-util validate-relax --nonet \
%{_datadir}/xgreeters/%{appname}.desktop
%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/lightdm/lightdm.conf.d/40-%appname.conf
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 6.1.0-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-icon-theme/anda.hcl b/anda/desktops/elementary/elementary-icon-theme/anda.hcl
index 340f8e2599..c770d89893 100644
--- a/anda/desktops/elementary/elementary-icon-theme/anda.hcl
+++ b/anda/desktops/elementary/elementary-icon-theme/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "elementary-icon-theme.spec"
}
diff --git a/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec b/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec
index 6c76d7c75e..7af50b95b1 100644
--- a/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec
+++ b/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec
@@ -4,7 +4,7 @@
Name: elementary-icon-theme
Summary: Icons from the Elementary Project
Version: 7.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/icons
@@ -18,6 +18,7 @@ BuildRequires: libappstream-glib
BuildRequires: librsvg2-tools
BuildRequires: meson
BuildRequires: xcursorgen
+BuildRequires: fdupes
%description
This is an icon theme designed to be smooth, sexy, clear, and efficient.
@@ -65,6 +66,8 @@ done
# Create icon cache file
touch %{buildroot}/%{_datadir}/icons/elementary/icon-theme.cache
+%fdupes %buildroot%_datadir/icons/elementary/
+
%check
# ignore validation until appstream-glib knows the "icon-theme" component type
diff --git a/anda/desktops/elementary/elementary-music/elementary-music.spec b/anda/desktops/elementary/elementary-music/elementary-music.spec
index 958736cf3d..11cdbe71bc 100644
--- a/anda/desktops/elementary/elementary-music/elementary-music.spec
+++ b/anda/desktops/elementary/elementary-music/elementary-music.spec
@@ -10,7 +10,7 @@ utilizes Granite for a consistent and slick UI.}
Name: elementary-music
Summary: Music player and library from elementary
-Version: 7.0.1
+Version: 7.1.0
Release: 2%{?dist}
License: LGPL-2.0-or-later
@@ -23,6 +23,7 @@ BuildRequires: gettext
BuildRequires: meson
BuildRequires: libappstream-glib
BuildRequires: vala >= 0.26
+BuildRequires: fdupes
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(gio-2.0)
@@ -77,6 +78,8 @@ This package contains files needed for developing with Music.
%meson_install
%find_lang %{appname}
+%fdupes %buildroot%_datadir/icons/hicolor/
+
%check
desktop-file-validate \
diff --git a/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec b/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec
index 77d04018e6..6a91184bf9 100644
--- a/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec
+++ b/anda/desktops/elementary/elementary-notifications/elementary-notifications.spec
@@ -4,7 +4,7 @@
Name: elementary-notifications
Version: 6.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK Notification server for Pantheon
License: GPL-3.0
@@ -26,6 +26,7 @@ Provides: %{name} = %{version}-%{release}
%description
+%summary.
%prep
@@ -49,11 +50,11 @@ Provides: %{name} = %{version}-%{release}
%{_bindir}/%{appname}.demo
%{_datadir}/applications/%{appname}.demo.desktop
-%{_sysconfdir}/xdg/autostart/%{appname}.desktop
+%config %{_sysconfdir}/xdg/autostart/%{appname}.desktop
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
%{_metainfodir}/%{appname}.appdata.xml
%changelog
-* Wed Nov 09 2022 Cappy Ishihara
+* Wed Nov 09 2022 Cappy Ishihara - 6.0.3-1
- Packaged
diff --git a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec
index b9b54c9f6e..320fe05048 100644
--- a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec
+++ b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec
@@ -4,7 +4,7 @@
Name: elementary-onboarding
Summary: Onboarding app for new users
Version: 7.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/onboarding
@@ -77,9 +77,9 @@ appstream-util validate-relax --nonet \
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
%{_datadir}/metainfo/%{appname}.metainfo.xml
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-/etc/guest-session/prefs.sh
+%config %_sysconfdir/guest-session/prefs.sh
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 6.1.0-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-photos/elementary-photos.spec b/anda/desktops/elementary/elementary-photos/elementary-photos.spec
index 459569ea0e..705849d3b3 100644
--- a/anda/desktops/elementary/elementary-photos/elementary-photos.spec
+++ b/anda/desktops/elementary/elementary-photos/elementary-photos.spec
@@ -6,7 +6,7 @@
Name: elementary-photos
Summary: Photo manager and viewer from elementary
Version: 2.8.0
-Release: %autorelease
+Release: 2%?dist
License: LGPL-2.0-or-later
URL: https://github.com/elementary/photos
@@ -17,6 +17,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson >= 0.46.0
BuildRequires: vala
+BuildRequires: fdupes
BuildRequires: pkgconfig(gee-0.8) >= 0.8.5
BuildRequires: pkgconfig(geocode-glib-1.0)
@@ -65,6 +66,9 @@ Foundation.
%find_lang %{appname}
+%fdupes %buildroot%_datadir/icons/hicolor/
+%fdupes %buildroot%_datadir/locale/
+
%check
desktop-file-validate \
@@ -97,5 +101,5 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 2.7.5-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-print/elementary-print.spec b/anda/desktops/elementary/elementary-print/elementary-print.spec
index db420894e2..96c4706e77 100644
--- a/anda/desktops/elementary/elementary-print/elementary-print.spec
+++ b/anda/desktops/elementary/elementary-print/elementary-print.spec
@@ -4,7 +4,7 @@
Name: elementary-print
Summary: Simple shim for printing support via Contractor
Version: 0.1.3
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/%{srcname}
@@ -43,7 +43,7 @@ Simple shim for printing support via Contractor.
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 0.1.3-9
- Repackaged for Terra
* Thu Jul 21 2022 Fedora Release Engineering - 0.1.3-9
diff --git a/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec b/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec
index 27ef28773b..a4321a85d2 100644
--- a/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec
+++ b/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec
@@ -3,8 +3,8 @@
Name: elementary-screenshot-tool
Summary: Screenshot tool designed for elementary
-Version: 6.0.3
-Release: 1%{?dist}
+Version: 6.0.4
+Release: 2%{?dist}
License: LGPL-3.0
URL: https://github.com/elementary/screenshot
@@ -18,6 +18,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson >= 0.46
BuildRequires: vala >= 0.24
+BuildRequires: fdupes
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(glib-2.0)
@@ -43,6 +44,8 @@ Screenshot tool designed for elementary.
%install
%meson_install
+%fdupes %buildroot%_datadir/icons/hicolor/
+%fdupes %buildroot%_datadir/locale
%find_lang %{appname}
@@ -51,7 +54,7 @@ desktop-file-validate \
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
appstream-util validate-relax --nonet \
- %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+ %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
%files -f %{appname}.lang
@@ -63,12 +66,12 @@ appstream-util validate-relax --nonet \
%{_datadir}/applications/%{appname}.desktop
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
%changelog
* Fri Dec 02 2022 root - 6.0.3-1
- new version
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 6.0.2-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec
index 50e37cbf98..f33c3c6803 100644
--- a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec
+++ b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec
@@ -63,5 +63,5 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 2.0.1-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec
index 0970fb4dfa..cea1842c14 100644
--- a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec
+++ b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec
@@ -4,7 +4,7 @@
Name: elementary-sideload
Summary: Sideload flatpaks on Pantheon
Version: 6.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/sideload
@@ -15,6 +15,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala
+BuildRequires: fdupes
BuildRequires: pkgconfig(flatpak)
BuildRequires: pkgconfig(glib-2.0)
@@ -28,41 +29,43 @@ Requires: hicolor-icon-theme
%description
Sideload is a simple application that lets users install flatpaks on
Pantheon without needing to use a command line application.
-
-
+
+
%prep
%autosetup -n %{srcname}-%{version} -p1
-
-
+
+
%build
%meson
%meson_build
-
+
%install
%meson_install
+
+%fdupes %buildroot%_datadir/icons/hicolor/
%find_lang %{appname}
-
-
+
+
%check
desktop-file-validate \
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
appstream-util validate-relax --nonet \
%{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
-
-
+
+
%files -f %{appname}.lang
%license LICENSE
%doc README.md
-
+
%{_bindir}/%{appname}
-
+
%{_datadir}/applications/%{appname}.desktop
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
%{_datadir}/metainfo/%{appname}.metainfo.xml
-
-
+
+
%changelog
-* Tue Nov 22 2022 Lleyton Gray
+* Tue Nov 22 2022 Lleyton Gray - 6.1.0-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-sound-theme/anda.hcl b/anda/desktops/elementary/elementary-sound-theme/anda.hcl
index f24bd51e01..c8ff3b8016 100644
--- a/anda/desktops/elementary/elementary-sound-theme/anda.hcl
+++ b/anda/desktops/elementary/elementary-sound-theme/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "elementary-sound-theme.spec"
}
diff --git a/anda/desktops/elementary/elementary-sound-theme/elementary-sound-theme.spec b/anda/desktops/elementary/elementary-sound-theme/elementary-sound-theme.spec
index 471b3c3e6e..b0829d12e4 100644
--- a/anda/desktops/elementary/elementary-sound-theme/elementary-sound-theme.spec
+++ b/anda/desktops/elementary/elementary-sound-theme/elementary-sound-theme.spec
@@ -3,7 +3,7 @@
Name: elementary-sound-theme
Summary: Set of system sounds for elementary
Version: 1.1.0
-Release: %autorelease
+Release: 2%?dist
License: Unlicense AND CC-BY-4.0
# Unlicense:
@@ -18,6 +18,7 @@ URL: https://github.com/elementary/%{srcname}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: meson
+BuildRequires: fdupes
BuildArch: noarch
@@ -38,6 +39,8 @@ physical, and pleasant.
%install
%meson_install
+%fdupes %buildroot%_datadir/sounds/elementary/stereo/
+
%files
%doc README.md
diff --git a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec
index 156d4c6c8b..2c010f5225 100644
--- a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec
+++ b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec
@@ -4,7 +4,7 @@
Name: elementary-terminal
Summary: The terminal of the 21st century
Version: 6.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL-3.0
URL: https://github.com/elementary/%{srcname}
@@ -15,6 +15,7 @@ BuildRequires: gettext xorg-x11-server-Xvfb
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.40.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(glib-2.0) >= 2.39
@@ -63,6 +64,7 @@ notifications when using the fish shell.
%install
%meson_install
+%fdupes %buildroot%_datadir/locale/
%find_lang %{appname}
@@ -90,6 +92,8 @@ appstream-util validate-relax --nonet \
%{_datadir}/metainfo/%{appname}.appdata.xml
%files fish
+%doc README.md
+%license COPYING
%{_datadir}/fish/vendor_conf.d/pantheon_terminal_process_completion_notifications.fish
diff --git a/anda/desktops/elementary/elementary-theme/anda.hcl b/anda/desktops/elementary/elementary-theme/anda.hcl
index 84e216387f..2af3c0866c 100644
--- a/anda/desktops/elementary/elementary-theme/anda.hcl
+++ b/anda/desktops/elementary/elementary-theme/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "elementary-theme.spec"
}
diff --git a/anda/desktops/elementary/elementary-theme/elementary-theme.spec b/anda/desktops/elementary/elementary-theme/elementary-theme.spec
index 83dfb74f5b..569dc8bb54 100644
--- a/anda/desktops/elementary/elementary-theme/elementary-theme.spec
+++ b/anda/desktops/elementary/elementary-theme/elementary-theme.spec
@@ -2,9 +2,9 @@
%global appname io.elementary.stylesheet
Name: elementary-theme
-Summary: elementary GTK+ Stylesheet
+Summary: Elementary GTK+ Stylesheet
Version: 7.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0
URL: https://github.com/elementary/stylesheet
@@ -16,6 +16,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: sassc
+BuildRequires: fdupes
# gtk-version-specific subpackages were dropped in Fedora 34
Obsoletes: %{name}-gtk2 < 5.4.2-4.20210216.gitf0c3b7f
@@ -28,7 +29,7 @@ and its desktop environment: Pantheon.
%package plank
-Summary: elementary GTK+ Stylesheet for plank
+Summary: Elementary GTK+ Stylesheet for plank
Requires: %{name} = %{version}-%{release}
Requires: plank
@@ -54,6 +55,8 @@ This package contains the plank theme.
%install
%meson_install
+%fdupes %buildroot%_datadir/themes/
+
%check
appstream-util validate-relax --nonet \
@@ -70,7 +73,9 @@ appstream-util validate-relax --nonet \
%{_datadir}/metainfo/%{appname}.appdata.xml
-%files plank
+%files plank
+%doc README.md
+%license COPYING
%{_datadir}/themes/%{appname}.*/plank/
%{_datadir}/themes/%{appname}.*/plank-dark/
diff --git a/anda/desktops/elementary/elementary-videos/elementary-videos.spec b/anda/desktops/elementary/elementary-videos/elementary-videos.spec
index ce0ab319c6..174e8bee19 100644
--- a/anda/desktops/elementary/elementary-videos/elementary-videos.spec
+++ b/anda/desktops/elementary/elementary-videos/elementary-videos.spec
@@ -3,7 +3,7 @@
Name: elementary-videos
Summary: Video player and library app from elementary
-Version: 2.9.0
+Version: 2.9.1
Release: 2%{?dist}
License: GPL-3.0-or-later
@@ -15,6 +15,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala
+BuildRequires: fdupes
BuildRequires: pkgconfig(clutter-gst-3.0)
BuildRequires: pkgconfig(clutter-gtk-1.0)
@@ -48,6 +49,8 @@ to the desktop.
%install
%meson_install
+%fdupes %buildroot%_datadir/icons/hicolor/
+%fdupes %buildroot%_datadir/locale/
%find_lang %{appname}
@@ -56,7 +59,7 @@ desktop-file-validate \
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
appstream-util validate-relax --nonet \
- %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+ %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
%files -f %{appname}.lang
@@ -68,9 +71,9 @@ appstream-util validate-relax --nonet \
%{_datadir}/applications/%{appname}.desktop
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 2.8.4-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/elementary-wallpapers/anda.hcl b/anda/desktops/elementary/elementary-wallpapers/anda.hcl
index 0eb54cb888..5453e26541 100644
--- a/anda/desktops/elementary/elementary-wallpapers/anda.hcl
+++ b/anda/desktops/elementary/elementary-wallpapers/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "elementary-wallpapers.spec"
}
diff --git a/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec b/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec
index 669128b960..2483e47a9b 100644
--- a/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec
+++ b/anda/desktops/elementary/elementary-wallpapers/elementary-wallpapers.spec
@@ -45,10 +45,7 @@ wallpapers show up in gnome-control-center.
%prep
%autosetup -n %{srcname}-%{version}
-
%build
-# Nothing to do
-
%install
cd backgrounds
@@ -73,6 +70,8 @@ cp -pav %{SOURCE1} %{buildroot}/%{_datadir}/gnome-background-properties/
%files gnome
+%license LICENSE.md
+%doc README.md
%{_datadir}/gnome-background-properties/elementary-wallpapers.xml
diff --git a/anda/desktops/elementary/gala/gala.spec b/anda/desktops/elementary/gala/gala.spec
index 6124a71238..fe464bc194 100644
--- a/anda/desktops/elementary/gala/gala.spec
+++ b/anda/desktops/elementary/gala/gala.spec
@@ -3,7 +3,7 @@
Name: gala
Summary: Gala window manager
Version: 7.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/gala
@@ -96,6 +96,8 @@ desktop-file-validate \
%files -f gala.lang
+%doc README.md
+%license COPYING
%config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
%{_bindir}/gala
@@ -128,8 +130,8 @@ desktop-file-validate \
%changelog
-* Wed Nov 09 2022 Cappy Ishihara
+* Wed Nov 09 2022 Cappy Ishihara - 6.3.3-1
- Rebuild
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 6.3.1-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/granite-7/granite-7.spec b/anda/desktops/elementary/granite-7/granite-7.spec
index 29bb3955d5..dbd9d07634 100644
--- a/anda/desktops/elementary/granite-7/granite-7.spec
+++ b/anda/desktops/elementary/granite-7/granite-7.spec
@@ -4,9 +4,9 @@ provides complex widgets and convenience functions designed for use in
apps built for elementary.}
Name: granite-7
-Summary: elementary companion library for GTK+ and GLib
-Version: 7.2.0
-Release: 1%{?dist}
+Summary: Elementary companion library for GTK+ and GLib
+Version: 7.3.0
+Release: 2%{?dist}
License: LGPL-3.0-or-later
URL: https://github.com/elementary/granite
@@ -17,6 +17,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson >= 0.48.2
BuildRequires: vala >= 0.48
+BuildRequires: fdupes
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(gio-2.0) >= 2.50
@@ -26,6 +27,7 @@ BuildRequires: pkgconfig(gobject-2.0) >= 2.50
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk4) >= 4.4
+BuildRequires: sassc
# granite relies on org.gnome.desktop.interface for the clock-format setting
Requires: gsettings-desktop-schemas
@@ -57,14 +59,17 @@ This package contains the development headers.
%install
%meson_install
+%fdupes %buildroot%_datadir/icons/hicolor/
+%fdupes %buildroot%_datadir/locale/
+
%find_lang granite-7
%check
-%dnl desktop-file-validate \
-%dnl %{buildroot}/%{_datadir}/applications/io.elementary.granite-7.demo.desktop
+desktop-file-validate \
+ %{buildroot}/%{_datadir}/applications/io.elementary.granite-7.demo.desktop
%dnl appstream-util validate-relax --nonet \
-%dnl %{buildroot}/%{_datadir}/metainfo/granite-7.appdata.xml
+%dnl %{buildroot}/%{_datadir}/metainfo/granite-7.metainfo.xml
%files -f granite-7.lang
@@ -75,11 +80,13 @@ This package contains the development headers.
%{_libdir}/libgranite-7.so.7.*
%{_libdir}/girepository-1.0/Granite-7.0.typelib
-%{_datadir}/metainfo/granite-7.appdata.xml
+%{_datadir}/metainfo/granite-7.metainfo.xml
%{_datadir}/icons/hicolor/*/apps/io.elementary.granite-7.svg
%files devel
+%doc README.md
+%license COPYING
%{_bindir}/granite-7-demo
%{_libdir}/libgranite-7.so
diff --git a/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec b/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec
index dffebcbc1c..8488b12499 100644
--- a/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec
+++ b/anda/desktops/elementary/pantheon-agent-geoclue2/pantheon-agent-geoclue2.spec
@@ -4,7 +4,7 @@
Name: pantheon-agent-geoclue2
Summary: Pantheon Geoclue2 Agent
Version: 1.0.6
-Release: %autorelease
+Release: 2%?dist
License: GPL-3.0
URL: https://github.com/elementary/pantheon-agent-geoclue2
@@ -15,6 +15,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.34.1
+BuildRequires: fdupes
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
@@ -39,7 +40,7 @@ requests access to location services.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{name}
@@ -65,5 +66,5 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 1.0.5-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec b/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec
index c7e06f09bb..609db115e2 100644
--- a/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec
+++ b/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec
@@ -4,7 +4,7 @@
Name: pantheon-agent-polkit
Summary: Pantheon Polkit Agent
Version: 1.0.5
-Release: 2%{?dist}
+Release: 1%{?dist}
License: LGPL-2.0-or-later
URL: https://github.com/elementary/%{name}
@@ -15,6 +15,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.34.1
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
BuildRequires: pkgconfig(granite) >= 6.0.0
@@ -37,7 +38,7 @@ An agent for Polkit authorization designed for Pantheon.
%install
%meson_install
-
+%fdupes %buildroot/%_datadir/locale/
%find_lang %{appname}
diff --git a/anda/desktops/elementary/pantheon-session-settings/anda.hcl b/anda/desktops/elementary/pantheon-session-settings/anda.hcl
index 29fe7ade4a..8461de7931 100644
--- a/anda/desktops/elementary/pantheon-session-settings/anda.hcl
+++ b/anda/desktops/elementary/pantheon-session-settings/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "pantheon-session-settings.spec"
}
diff --git a/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec b/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec
index 358d08540a..00579f91ce 100644
--- a/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec
+++ b/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec
@@ -7,7 +7,7 @@ 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: glib2 gtk3 libgee granite
+Requires: gtk3 granite
%description
A system settings panel for the Pantheon Desktop that
@@ -26,8 +26,6 @@ lets you easily and safely customise your desktop's appearance.
%files
%doc README.md
%license COPYING
-
-/usr/lib/debug/usr/lib64/switchboard/personal/libpantheon-tweaks.so-*.debug
/usr/lib64/switchboard/personal/libpantheon-tweaks.so
%{_datadir}/icons/hicolor/32x32/categories/preferences-desktop-tweaks.svg
%{_datadir}/locale/*/LC_MESSAGES/pantheon-tweaks-plug.mo
@@ -35,5 +33,5 @@ lets you easily and safely customise your desktop's appearance.
%changelog
-* Tue Jan 17 2023 windowsboy111
+* Tue Jan 17 2023 windowsboy111 - 1.0.4-1
- Initial package
diff --git a/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec b/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec
index f0a48feb9e..5ff0262c6b 100644
--- a/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec
+++ b/anda/desktops/elementary/switchboard-plug-a11y/switchboard-plug-a11y.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-a11y
Summary: Switchboard Accessibility plug
Version: 2.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-a11y
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(granite)
@@ -48,7 +49,7 @@ that allows the user to manage accessibility settings.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
diff --git a/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec b/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec
index 55ff965a26..466c1890cd 100644
--- a/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec
+++ b/anda/desktops/elementary/switchboard-plug-about/switchboard-plug-about.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-about
Summary: Switchboard System Information plug
Version: 6.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-about
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(appstream) >= 0.12.10
BuildRequires: pkgconfig(fwupd)
@@ -53,7 +54,7 @@ This switchboard plug shows system information.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
# remove the specified stock icon from appdata (invalid in libappstream-glib)
@@ -75,5 +76,5 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 6.1.0-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec b/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec
index d99a34297a..8e36a693a9 100644
--- a/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec
+++ b/anda/desktops/elementary/switchboard-plug-applications/switchboard-plug-applications.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-applications
Summary: Switchboard Applications plug
Version: 6.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-applications
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(flatpak) >= 1.1.2
BuildRequires: pkgconfig(glib-2.0) >= 2.34
@@ -45,7 +46,7 @@ that allows the user to manage application settings.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
# remove the specified stock icon from appdata (invalid in libappstream-glib)
diff --git a/anda/desktops/elementary/switchboard-plug-datetime/anda.hcl b/anda/desktops/elementary/switchboard-plug-datetime/anda.hcl
new file mode 100644
index 0000000000..3502e43d9f
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-datetime/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "switchboard-plug-datetime.spec"
+ }
+}
diff --git a/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec b/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec
new file mode 100644
index 0000000000..c5605d3eb5
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec
@@ -0,0 +1,69 @@
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
+
+%global srcname switchboard-plug-datetime
+
+%global plug_type system
+%global plug_name datetime
+%global plug_rdnn io.elementary.switchboard.datetime
+
+Name: switchboard-plug-datetime
+Summary: Switchboard Date & Time Plug
+Version: 2.2.0
+Release: 2%{?dist}
+License: GPL-3.0-or-later
+
+URL: https://github.com/elementary/switchboard-plug-datetime
+Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
+
+BuildRequires: gettext
+BuildRequires: libappstream-glib
+BuildRequires: meson
+BuildRequires: vala
+BuildRequires: fdupes
+
+BuildRequires: pkgconfig(granite)
+BuildRequires: pkgconfig(libadwaita-1)
+BuildRequires: switchboard-devel
+
+Requires: switchboard%{?_isa}
+Supplements: switchboard%{?_isa}
+
+%description
+%summary.
+
+
+%prep
+%autosetup -n %{srcname}-%{version} -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%fdupes %buildroot%_datadir/locale/
+%find_lang %{plug_name}-plug
+
+# remove the specified stock icon from appdata (invalid in libappstream-glib)
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+
+%check
+appstream-util validate-relax --nonet \
+ %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+
+%files -f %{plug_name}-plug.lang
+%doc README.md
+%license COPYING
+
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 - 2.2.0-1
+- Initial package.
diff --git a/anda/desktops/elementary/switchboard-plug-datetime/update.rhai b/anda/desktops/elementary/switchboard-plug-datetime/update.rhai
new file mode 100644
index 0000000000..903b7394d9
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-datetime/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("elementary/switchboard-plug-datetime"));
diff --git a/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec b/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec
index 16ed35e2c7..8a698a6e92 100644
--- a/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec
+++ b/anda/desktops/elementary/switchboard-plug-display/switchboard-plug-display.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-display
Summary: Switchboard Display plug
Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-display
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(granite)
@@ -45,7 +46,7 @@ them.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
diff --git a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec
index a6030a4262..54035c2101 100644
--- a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec
+++ b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-keyboard
Summary: Switchboard Keyboard plug
Version: 3.1.1
-Release: %autorelease
+Release: 2%?dist
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-keyboard
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(granite) >= 6.0.0
@@ -52,7 +53,7 @@ same time. Keyboard shortcuts are also part of this plug.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
@@ -71,5 +72,5 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 2.7.0-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/switchboard-plug-locale/anda.hcl b/anda/desktops/elementary/switchboard-plug-locale/anda.hcl
new file mode 100644
index 0000000000..de83677c02
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-locale/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "switchboard-plug-locale.spec"
+ }
+}
diff --git a/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec
new file mode 100644
index 0000000000..2bf8217c31
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-locale/switchboard-plug-locale.spec
@@ -0,0 +1,71 @@
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
+
+%global srcname switchboard-plug-locale
+
+%global plug_type personal
+%global plug_name locale
+%global plug_rdnn io.elementary.switchboard.locale
+
+Name: switchboard-plug-locale
+Summary: Switchboard Locale Plug
+Version: 2.5.9
+Release: 2%?dist
+License: LGPL-3.0-or-later
+
+URL: https://github.com/elementary/%name
+Source0: %url/archive/%version/%srcname-%version.tar.gz
+
+BuildRequires: gettext
+BuildRequires: libappstream-glib
+BuildRequires: meson >= 0.46.1
+BuildRequires: vala
+BuildRequires: fdupes
+
+BuildRequires: pkgconfig(accountsservice)
+BuildRequires: pkgconfig(ibus-1.0)
+BuildRequires: pkgconfig(gnome-desktop-3.0)
+BuildRequires: pkgconfig(granite)
+BuildRequires: polkit-devel
+BuildRequires: switchboard-devel
+
+Requires: switchboard%?_isa
+Supplements: switchboard%?_isa
+
+%description
+%summary.
+
+%prep
+%autosetup -n %srcname-%version -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%fdupes %buildroot%_datadir/locale/
+%find_lang %plug_name-plug
+
+
+%check
+appstream-util validate-relax --nonet \
+ %buildroot/%_datadir/metainfo/%plug_rdnn.appdata.xml
+
+
+%files -f %plug_name-plug.lang
+%doc README.md
+%license COPYING
+
+%_libdir/switchboard/%plug_type/lib%plug_name-plug.so
+%_libdir/switchboard/personal/pantheon-locale/languagelist
+%_libdir/switchboard/personal/pantheon-locale/packages_blacklist
+%_datadir/glib-2.0/schemas/%plug_rdnn.gschema.xml
+%_datadir/polkit-1/actions/%plug_rdnn.policy
+
+%_datadir/metainfo/%plug_rdnn.appdata.xml
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 - 2.5.9-1
+- Initial package.
diff --git a/anda/desktops/elementary/switchboard-plug-locale/update.rhai b/anda/desktops/elementary/switchboard-plug-locale/update.rhai
new file mode 100644
index 0000000000..e30fa05d25
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-locale/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("elementary/switchboard-plug-locale"));
diff --git a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec
index f9d8e084ea..63cff5bcee 100644
--- a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec
+++ b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-networking
Summary: Switchboard Networking plug
Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-network
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(granite)
@@ -50,7 +51,7 @@ A switchboard plug for configuring available networks.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
diff --git a/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec b/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec
index bf9f280f67..4053bed4e6 100644
--- a/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec
+++ b/anda/desktops/elementary/switchboard-plug-notifications/switchboard-plug-notifications.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-notifications
Summary: Switchboard Notifications plug
Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-notifications
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(granite)
@@ -48,7 +49,7 @@ related to the Notifications plugin for Gala.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
diff --git a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec
index 9e6ed1dc28..54bed14b01 100644
--- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec
+++ b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec
@@ -7,7 +7,7 @@
Name: switchboard-plug-onlineaccounts
Summary: Switchboard Online Accounts plug
Version: 6.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-onlineaccounts
@@ -17,6 +17,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala
+BuildRequires: fdupes
BuildRequires: pkgconfig(camel-1.2)
BuildRequires: pkgconfig(glib-2.0)
@@ -48,7 +49,7 @@ Manage online accounts and connected applications.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
# remove the specified stock icon from appdata (invalid in libappstream-glib)
diff --git a/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec b/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec
index 2870a9c940..c2155fdc82 100644
--- a/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec
+++ b/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-pantheon-shell
Summary: Switchboard Pantheon Shell plug
Version: 6.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0
URL: https://github.com/elementary/switchboard-plug-pantheon-shell
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(gexiv2)
BuildRequires: pkgconfig(gio-2.0)
@@ -57,7 +58,7 @@ desktop settings such as the panel, app launcher, and window manager.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
diff --git a/anda/desktops/elementary/switchboard-plug-parental-controls/anda.hcl b/anda/desktops/elementary/switchboard-plug-parental-controls/anda.hcl
new file mode 100644
index 0000000000..17fa5e5bdb
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-parental-controls/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "switchboard-plug-parental-controls.spec"
+ }
+}
diff --git a/anda/desktops/elementary/switchboard-plug-parental-controls/switchboard-plug-parental-controls.spec b/anda/desktops/elementary/switchboard-plug-parental-controls/switchboard-plug-parental-controls.spec
new file mode 100644
index 0000000000..414941d3f1
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-parental-controls/switchboard-plug-parental-controls.spec
@@ -0,0 +1,84 @@
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
+
+%global srcname switchboard-plug-parental-controls
+
+%global plug_type system
+%global plug_name parental-controls
+%global plug_rdnn io.elementary.switchboard.parental-controls
+
+Name: switchboard-plug-parental-controls
+Summary: Switchboard Screen Time & Limits Plug
+Version: 6.0.1
+Release: 2%?dist
+License: GPL-3.0-or-later
+
+URL: https://github.com/elementary/%name
+Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
+
+BuildRequires: gettext
+BuildRequires: libappstream-glib
+BuildRequires: meson >= 0.46.1
+BuildRequires: vala
+BuildRequires: fdupes
+
+BuildRequires: pkgconfig(accountsservice)
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(flatpak)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(granite)
+BuildRequires: pkgconfig(libhandy-1) >= 0.90.0
+BuildRequires: pkgconfig(malcontent-0)
+BuildRequires: pkgconfig(polkit-gobject-1)
+BuildRequires: polkit-devel
+BuildRequires: switchboard-devel
+
+Requires: switchboard%{?_isa}
+Supplements: switchboard%{?_isa}
+
+%description
+%summary.
+
+
+%prep
+%autosetup -n %{srcname}-%{version} -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%fdupes %buildroot%_datadir/locale/
+%find_lang %{plug_name}-plug
+
+# remove the specified stock icon from appdata (invalid in libappstream-glib)
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+
+%check
+appstream-util validate-relax --nonet \
+ %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+
+%files -f %{plug_name}-plug.lang
+%doc README.md
+%license COPYING
+
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+%_sysconfdir/pantheon-parental-controls/daemon.conf
+%_bindir/pantheon-parental-controls-daemon
+%_libexecdir/pantheon-parental-controls-client
+%_datadir/applications/pantheon-parental-controls-client.desktop
+%_datadir/dbus-1/system-services/org.pantheon.ParentalControls.service
+%_datadir/dbus-1/system.d/org.pantheon.ParentalControls.conf
+%_datadir/polkit-1/actions/io.elementary.switchboard.screentime-limits.policy
+/usr/lib/systemd/system/pantheon-parental-controls.service
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 - 6.0.1-1
+- Initial package.
diff --git a/anda/desktops/elementary/switchboard-plug-parental-controls/update.rhai b/anda/desktops/elementary/switchboard-plug-parental-controls/update.rhai
new file mode 100644
index 0000000000..d6839d638a
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-parental-controls/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("elementary/switchboard-plug-parental-controls"));
diff --git a/anda/desktops/elementary/switchboard-plug-power/anda.hcl b/anda/desktops/elementary/switchboard-plug-power/anda.hcl
new file mode 100644
index 0000000000..0f912d985d
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-power/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "switchboard-plug-power.spec"
+ }
+}
diff --git a/anda/desktops/elementary/switchboard-plug-power/switchboard-plug-power.spec b/anda/desktops/elementary/switchboard-plug-power/switchboard-plug-power.spec
new file mode 100644
index 0000000000..1f3398a978
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-power/switchboard-plug-power.spec
@@ -0,0 +1,75 @@
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
+
+%global srcname switchboard-plug-power
+
+%global plug_type hardware
+%global plug_name power
+%global plug_rdnn io.elementary.switchboard.power
+
+Name: switchboard-plug-power
+Summary: Switchboard Power Plug
+Version: 2.7.0
+Release: 2%?dist
+License: GPL-2.0-or-later
+
+URL: https://github.com/elementary/%name
+Source0: %url/archive/%version/%srcname-%version.tar.gz
+
+BuildRequires: gettext
+BuildRequires: libappstream-glib
+BuildRequires: meson
+BuildRequires: vala
+BuildRequires: fdupes
+
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(granite)
+BuildRequires: pkgconfig(polkit-gobject-1)
+BuildRequires: polkit-devel
+BuildRequires: switchboard-devel
+
+Requires: switchboard%?_isa
+Supplements: switchboard%?_isa
+
+%description
+%summary.
+
+%prep
+%autosetup -n %srcname-%version -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%fdupes %buildroot%_datadir/locale/
+%find_lang %plug_name-plug
+
+# remove the specified stock icon from appdata (invalid in libappstream-glib)
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+
+%check
+appstream-util validate-relax --nonet \
+ %buildroot/%_datadir/metainfo/%plug_rdnn.appdata.xml
+
+
+%files -f %plug_name-plug.lang
+%doc README.md
+%license COPYING
+
+%_libdir/switchboard/%plug_type/lib%plug_name.so
+
+%_datadir/metainfo/%plug_rdnn.appdata.xml
+
+%_libexecdir/io.elementary.logind.helper
+%_datadir/dbus-1/system-services/io.elementary.logind.helper.service
+%_datadir/dbus-1/system.d/io.elementary.logind.helper.conf
+%_datadir/polkit-1/actions/%plug_rdnn.policy
+
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 - 2.7.0-1
+- Initial package.
diff --git a/anda/desktops/elementary/switchboard-plug-power/update.rhai b/anda/desktops/elementary/switchboard-plug-power/update.rhai
new file mode 100644
index 0000000000..84455254aa
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-power/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("elementary/switchboard-plug-power"));
diff --git a/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec b/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec
index e2cd3cb9e9..80110c7afd 100644
--- a/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec
+++ b/anda/desktops/elementary/switchboard-plug-printers/switchboard-plug-printers.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-printers
Summary: Switchboard Printers Plug
Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%?dist
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-printers
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: cups-devel
@@ -47,7 +48,7 @@ A printers plug for Switchboard.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
diff --git a/anda/desktops/elementary/switchboard-plug-security-privacy/anda.hcl b/anda/desktops/elementary/switchboard-plug-security-privacy/anda.hcl
new file mode 100644
index 0000000000..28a9e799bf
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-security-privacy/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "switchboard-plug-security-privacy.spec"
+ }
+}
diff --git a/anda/desktops/elementary/switchboard-plug-security-privacy/switchboard-plug-security-privacy.spec b/anda/desktops/elementary/switchboard-plug-security-privacy/switchboard-plug-security-privacy.spec
new file mode 100644
index 0000000000..1ee65a570c
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-security-privacy/switchboard-plug-security-privacy.spec
@@ -0,0 +1,71 @@
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
+
+%global srcname switchboard-plug-security-privacy
+
+%global plug_type personal
+%global plug_name security-privacy
+%global plug_rdnn io.elementary.switchboard.security-privacy
+
+Name: switchboard-plug-security-privacy
+Summary: Switchboard Security & Privacy Plug
+Version: 7.0.0
+Release: 1%?dist
+License: GPL-3.0-or-later
+
+URL: https://github.com/elementary/%name
+Source0: %url/archive/%version/%srcname-%version.tar.gz
+
+BuildRequires: gettext
+BuildRequires: libappstream-glib
+BuildRequires: vala
+
+BuildRequires: granite-devel
+BuildRequires: pkgconfig(polkit-gobject-1)
+BuildRequires: pkgconfig(switchboard-2.0)
+BuildRequires: pkgconfig(zeitgeist-2.0)
+BuildRequires: meson >= 0.46.1
+BuildRequires: polkit-devel
+
+Requires: switchboard%{?_isa}
+
+Supplements: switchboard%{?_isa}
+
+%description
+%summary.
+
+
+%prep
+%autosetup -n %{srcname}-%{version} -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+
+%find_lang %{plug_name}-plug
+
+
+%check
+appstream-util validate-relax --nonet \
+ %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+
+
+%files -f %{plug_name}-plug.lang
+%doc README.md
+%license COPYING
+
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+
+%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+
+%_libdir/switchboard/personal/security-privacy-plug-helper
+%_datadir/glib-2.0/schemas/%plug_rdnn.gschema.xml
+%_datadir/polkit-1/actions/%plug_rdnn.policy
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 - 7.0.0-1
+- Initial package.
diff --git a/anda/desktops/elementary/switchboard-plug-security-privacy/update.rhai b/anda/desktops/elementary/switchboard-plug-security-privacy/update.rhai
new file mode 100644
index 0000000000..6c5ca7a5dd
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-security-privacy/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("elementary/switchboard-plug-security-privacy"));
diff --git a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec
index bcdd72aefe..49b0a3e4d0 100644
--- a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec
+++ b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec
@@ -9,7 +9,7 @@
Name: switchboard-plug-sound
Summary: Switchboard Sound Plug
Version: 2.3.2
-Release: %autorelease
+Release: 2%?dist
License: LGPL-2.0-or-later
URL: https://github.com/elementary/switchboard-plug-sound
@@ -19,6 +19,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.34.1
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(granite)
@@ -47,7 +48,7 @@ A sound plug for Switchboard.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
# remove the specified stock icon from appdata (invalid in libappstream-glib)
diff --git a/anda/desktops/elementary/switchboard-plug-useraccounts/anda.hcl b/anda/desktops/elementary/switchboard-plug-useraccounts/anda.hcl
new file mode 100644
index 0000000000..cb8534c6b4
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-useraccounts/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "switchboard-plug-useraccounts.spec"
+ }
+}
diff --git a/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec
new file mode 100644
index 0000000000..61c36b7fb5
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec
@@ -0,0 +1,73 @@
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
+
+%global srcname switchboard-plug-useraccounts
+
+%global plug_type system
+%global plug_name useraccounts
+%global plug_rdnn io.elementary.switchboard.useraccounts
+
+Name: switchboard-plug-useraccounts
+Summary: Switchboard User Accounts Plug
+Version: 2.4.3
+Release: 2%?dist
+License: LGPL-3.0-or-later
+
+URL: https://github.com/elementary/%name
+Source0: %url/archive/%version/%srcname-%version.tar.gz
+
+BuildRequires: gettext
+BuildRequires: libappstream-glib
+BuildRequires: meson >= 0.46.1
+BuildRequires: vala
+BuildRequires: fdupes
+
+BuildRequires: pkgconfig(accountsservice)
+BuildRequires: gobject-introspection-devel
+BuildRequires: gnome-desktop3-devel
+BuildRequires: pkgconfig(granite) >= 0.5
+BuildRequires: pkgconfig(libhandy-1) >= 0.90.0
+BuildRequires: pkgconfig(polkit-gobject-1)
+BuildRequires: pkgconfig(pwquality)
+BuildRequires: polkit-devel
+BuildRequires: gtk3-devel
+BuildRequires: switchboard-devel
+
+Requires: switchboard%?_isa
+Supplements: switchboard%?_isa
+
+%description
+%summary.
+
+%prep
+%autosetup -n %srcname-%version -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%fdupes %buildroot%_datadir/locale/
+%find_lang %plug_name-plug
+
+
+%check
+appstream-util validate-relax --nonet \
+ %buildroot/%_datadir/metainfo/%plug_rdnn.appdata.xml
+
+
+%files -f %plug_name-plug.lang
+%doc README.md
+%license COPYING
+
+%_libdir/switchboard/%plug_type/lib%plug_name.so
+%_libdir/switchboard/system/pantheon-useraccounts/guest-session-toggle
+%_datadir/metainfo/%plug_rdnn.appdata.xml
+%_datadir/polkit-1/actions/%plug_rdnn.policy
+
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 - 2.4.3-1
+- Initial package.
diff --git a/anda/desktops/elementary/switchboard-plug-useraccounts/update.rhai b/anda/desktops/elementary/switchboard-plug-useraccounts/update.rhai
new file mode 100644
index 0000000000..752b63bffc
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-useraccounts/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("elementary/switchboard-plug-useraccounts"));
diff --git a/anda/desktops/elementary/switchboard-plug-wacom/anda.hcl b/anda/desktops/elementary/switchboard-plug-wacom/anda.hcl
new file mode 100644
index 0000000000..5c342ad769
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-wacom/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "switchboard-plug-wacom.spec"
+ }
+}
diff --git a/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec b/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec
new file mode 100644
index 0000000000..50d1bebff6
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec
@@ -0,0 +1,66 @@
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
+
+%global srcname switchboard-plug-wacom
+
+%global plug_type hardware
+%global plug_name wacom
+%global plug_rdnn io.elementary.switchboard.wacom
+
+Name: switchboard-plug-wacom
+Summary: Switchboard Wacom Plug
+Version: 1.0.1
+Release: 1%?dist
+License: GPL-3.0-or-later
+
+URL: https://github.com/elementary/%name
+Source0: %url/archive/%version/%srcname-%version.tar.gz
+
+BuildRequires: gettext
+BuildRequires: libappstream-glib
+BuildRequires: meson >= 0.46.1
+BuildRequires: vala
+
+BuildRequires: pkgconfig(granite)
+BuildRequires: pkgconfig(libwacom)
+BuildRequires: pkgconfig(gudev-1.0)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xi)
+BuildRequires: switchboard-devel
+
+Requires: switchboard%{?_isa}
+Supplements: switchboard%{?_isa}
+
+%description
+%summary.
+
+%prep
+%autosetup -n %srcname-%version -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+
+%find_lang %{plug_name}-plug
+
+
+%check
+appstream-util validate-relax --nonet \
+ %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+
+%files -f %{plug_name}-plug.lang
+%doc README.md
+%license COPYING
+
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 - 1.0.1-1
+- Initial package.
diff --git a/anda/desktops/elementary/switchboard-plug-wacom/update.rhai b/anda/desktops/elementary/switchboard-plug-wacom/update.rhai
new file mode 100644
index 0000000000..8811ce68e8
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-wacom/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("elementary/switchboard-plug-wacom"));
diff --git a/anda/desktops/elementary/switchboard-plug-wallet/anda.hcl b/anda/desktops/elementary/switchboard-plug-wallet/anda.hcl
new file mode 100644
index 0000000000..d57cb1789a
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-wallet/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "switchboard-plug-wallet.spec"
+ }
+}
diff --git a/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec b/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec
new file mode 100644
index 0000000000..b5032c5c5f
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-wallet/switchboard-plug-wallet.spec
@@ -0,0 +1,62 @@
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
+
+%global srcname switchboard-plug-wallet
+
+%global plug_type personal
+%global plug_name wallet
+%global plug_rdnn io.elementary.switchboard.wallet
+
+%global commit bfe73dfb95d9b46a0a34e0db35a178233c8552b0
+
+Name: switchboard-plug-wallet
+Summary: Switchboard Wallet Plug
+Version: %(c=%commit; echo ${c:0:7})
+Release: 2%?dist
+License: GPL-3.0-or-later
+
+URL: https://github.com/elementary/%name
+Source0: %url/archive/%version/%srcname-%version.tar.gz
+
+BuildRequires: libappstream-glib
+BuildRequires: meson
+BuildRequires: vala
+BuildRequires: fdupes
+
+BuildRequires: pkgconfig(granite) >= 0.5
+BuildRequires: gtk3-devel
+BuildRequires: pkgconfig(libsecret-1)
+BuildRequires: switchboard-devel
+
+Requires: switchboard%{?_isa}
+Supplements: switchboard%{?_isa}
+
+%description
+Manage Payment Methods and related settings.
+
+
+%prep
+%autosetup -n %srcname-%commit -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%fdupes %buildroot%_datadir/icons/hicolor
+
+
+%files
+%doc README.md
+%license COPYING
+
+%_libdir/switchboard/%plug_type/lib%plug_rdnn.so
+%_datadir/icons/hicolor/*/apps/%plug_rdnn.svg
+%_datadir/locale/*/LC_MESSAGES/%plug_rdnn.mo
+
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 - bfe73dfb95d9b46a0a34e0db35a178233c8552b0-1
+- Initial package.
diff --git a/anda/desktops/elementary/switchboard-plug-wallet/update.rhai b/anda/desktops/elementary/switchboard-plug-wallet/update.rhai
new file mode 100644
index 0000000000..a125200846
--- /dev/null
+++ b/anda/desktops/elementary/switchboard-plug-wallet/update.rhai
@@ -0,0 +1,3 @@
+let req = new_req("https://api.github.com/repos/elementary/switchboard-plug-wallet/commits/HEAD");
+req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
+rpm.global("commit", json(req.get()).sha);
diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec
index d3120644b6..db08c70f57 100644
--- a/anda/desktops/elementary/switchboard/switchboard.spec
+++ b/anda/desktops/elementary/switchboard/switchboard.spec
@@ -4,7 +4,7 @@
Name: switchboard
Summary: Modular Desktop Settings Hub
Version: 6.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL-2.0-or-later
URL: https://github.com/elementary/%{name}
@@ -21,6 +21,7 @@ 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}
@@ -72,6 +73,9 @@ mkdir -p %{buildroot}/%{_libdir}/%{name}/network
mkdir -p %{buildroot}/%{_libdir}/%{name}/personal
mkdir -p %{buildroot}/%{_libdir}/%{name}/system
+%fdupes %buildroot%_datadir/locale/
+%fdupes %buildroot%_datadir/icons/hicolor/
+
%check
desktop-file-validate \
@@ -82,6 +86,8 @@ appstream-util validate-relax --nonet \
%files -f %{appname}.lang
+%doc README.md
+%license COPYING
%{_bindir}/%{appname}
%{_datadir}/applications/%{appname}.desktop
@@ -110,5 +116,5 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 6.0.2-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec b/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec
index 437f55e56e..7cbd3f42c5 100644
--- a/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec
+++ b/anda/desktops/elementary/wingpanel-applications-menu/wingpanel-applications-menu.spec
@@ -6,7 +6,7 @@
Name: wingpanel-applications-menu
Summary: Lightweight and stylish app launcher
Version: 2.11.1
-Release: %autorelease
+Release: 2%?dist
License: GPL-3.0-or-later
URL: https://github.com/elementary/applications-menu
@@ -16,6 +16,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.32.1
+BuildRequires: fdupes
BuildRequires: appstream-vala
@@ -51,7 +52,7 @@ The lightweight and stylish app launcher from elementary.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang slingshot
diff --git a/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec b/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec
index 53f3481875..b49829d1c9 100644
--- a/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-bluetooth/wingpanel-indicator-bluetooth.spec
@@ -6,7 +6,7 @@
Name: wingpanel-indicator-bluetooth
Summary: Bluetooth Indicator for wingpanel
Version: 2.1.8
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPL-2.0-or-later
URL: https://github.com/elementary/%{name}
@@ -16,6 +16,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(granite) >= 6.0.0
@@ -44,7 +45,7 @@ A bluetooth indicator for wingpanel.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang bluetooth-indicator
# remove the specified stock icon from appdata (invalid in libappstream-glib)
@@ -67,5 +68,5 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 2.1.0-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec b/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec
index 9f93928550..3286d36327 100644
--- a/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec
@@ -6,7 +6,7 @@
Name: wingpanel-indicator-datetime
Summary: Datetime Indicator for wingpanel
Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/wingpanel-indicator-datetime
@@ -16,6 +16,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(granite) >= 6.0.0
@@ -44,7 +45,7 @@ A datetime indicator for wingpanel.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang datetime-indicator
# remove the specified stock icon from appdata (invalid in libappstream-glib)
diff --git a/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec b/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec
index afee3a47da..f065dcf35b 100644
--- a/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-keyboard/wingpanel-indicator-keyboard.spec
@@ -6,7 +6,7 @@
Name: wingpanel-indicator-keyboard
Summary: Keyboard Indicator for wingpanel
Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL-2.0-or-later
URL: https://github.com/elementary/%{name}
@@ -16,6 +16,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(granite)
@@ -44,7 +45,7 @@ A keyboard indicator for wingpanel.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang keyboard-indicator
diff --git a/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec b/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec
index 6337928315..6bfdff8a8e 100644
--- a/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-network/wingpanel-indicator-network.spec
@@ -6,7 +6,7 @@
Name: wingpanel-indicator-network
Summary: Network Indicator for wingpanel
Version: 7.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/wingpanel-indicator-network
@@ -23,6 +23,7 @@ BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libnm)
BuildRequires: pkgconfig(libnma)
BuildRequires: pkgconfig(wingpanel) >= 3.0.0
+BuildRequires: fdupes
Requires: network-manager-applet%{?_isa}
Requires: wingpanel%{?_isa}
@@ -45,7 +46,7 @@ A network indicator for wingpanel.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang network-indicator
diff --git a/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec b/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec
index 886d30f13b..b91cb18986 100644
--- a/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec
@@ -6,7 +6,7 @@
Name: wingpanel-indicator-nightlight
Summary: Night Light Indicator for wingpanel
Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-2.0-or-later
URL: https://github.com/elementary/wingpanel-indicator-nightlight
@@ -16,6 +16,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(gobject-2.0)
@@ -42,7 +43,7 @@ A wingpanel indicator for Night Light.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang nightlight-indicator
diff --git a/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec b/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec
index f977edf876..ce666f36c1 100644
--- a/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-notifications/wingpanel-indicator-notifications.spec
@@ -6,7 +6,7 @@
Name: wingpanel-indicator-notifications
Summary: Notifications Indicator for wingpanel
Version: 6.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL-2.0-or-later
URL: https://github.com/elementary/wingpanel-indicator-notifications
@@ -16,6 +16,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gio-2.0)
@@ -45,7 +46,7 @@ A notifications indicator for wingpanel.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang notifications-indicator
diff --git a/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec b/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec
index ff832a3401..beb77c3ab7 100644
--- a/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-power/wingpanel-indicator-power.spec
@@ -6,7 +6,7 @@
Name: wingpanel-indicator-power
Summary: Power indicator for wingpanel
Version: 6.2.0
-Release: %autorelease
+Release: 2%?dist
License: GPL-2.0-or-later
URL: https://github.com/elementary/wingpanel-indicator-power
@@ -16,7 +16,9 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(granite) >= 6.0.0
BuildRequires: pkgconfig(gtk+-3.0)
@@ -45,7 +47,7 @@ A power indicator for wingpanel.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang power-indicator
# remove the specified stock icon from appdata (invalid in libappstream-glib)
@@ -68,5 +70,5 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appda
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 6.1.0-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec b/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec
index 9a0e23fe13..a6145e874a 100644
--- a/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-session/wingpanel-indicator-session.spec
@@ -6,7 +6,7 @@
Name: wingpanel-indicator-session
Summary: Session Indicator for wingpanel
Version: 2.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-2.0-or-later
URL: https://github.com/elementary/wingpanel-indicator-session
@@ -16,7 +16,9 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
+BuildRequires: fdupes
BuildRequires: pkgconfig(accountsservice)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(granite) >= 5.3.0
@@ -43,7 +45,7 @@ A session Indicator for wingpanel.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang session-indicator
diff --git a/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec b/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec
index eb94f4d844..4f4707da02 100644
--- a/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec
+++ b/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec
@@ -6,7 +6,7 @@
Name: wingpanel-indicator-sound
Summary: Sound Indicator for wingpanel
Version: 6.0.2
-Release: %autorelease
+Release: 2%?dist
License: GPL-3.0
URL: https://github.com/elementary/%{name}
@@ -16,6 +16,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala >= 0.22.0
+BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(granite)
@@ -45,7 +46,7 @@ A sound indicator for wingpanel.
%install
%meson_install
-
+%fdupes %buildroot%_datadir/locale/
%find_lang sound-indicator
# remove the specified stock icon from appdata (invalid in libappstream-glib)
@@ -68,5 +69,5 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 6.0.2-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/wingpanel/wingpanel.spec b/anda/desktops/elementary/wingpanel/wingpanel.spec
index e0e2c5ee8f..af50e0148b 100644
--- a/anda/desktops/elementary/wingpanel/wingpanel.spec
+++ b/anda/desktops/elementary/wingpanel/wingpanel.spec
@@ -113,6 +113,8 @@ appstream-util validate-relax --nonet \
%{_libdir}/libwingpanel.so.3.*
%files devel
+%license COPYING
+%doc README.md
%{_includedir}/wingpanel/
%{_libdir}/libwingpanel.so
@@ -123,5 +125,5 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Oct 15 2022 windowsboy111
+* Sat Oct 15 2022 windowsboy111 - 3.0.2-1
- Repackaged for Terra
diff --git a/anda/desktops/elementary/xdg-desktop-portal-pantheon/xdg-desktop-portal-pantheon.spec b/anda/desktops/elementary/xdg-desktop-portal-pantheon/xdg-desktop-portal-pantheon.spec
index 024bfd6146..21c2a12b3a 100644
--- a/anda/desktops/elementary/xdg-desktop-portal-pantheon/xdg-desktop-portal-pantheon.spec
+++ b/anda/desktops/elementary/xdg-desktop-portal-pantheon/xdg-desktop-portal-pantheon.spec
@@ -2,16 +2,16 @@
Name: xdg-desktop-portal-pantheon
Version: 7.0.0
-Release: %?dist
+Release: 1%?dist
Summary: Pantheon XDG Desktop Portals
License: GPL-3.0
URL: https://github.com/elementary/portals
Source0: %url/archive/refs/tags/%version.tar.gz
-Requires: gtk4 glib2 granite-7 libX11
+Requires: gtk4 granite-7
BuildRequires: ninja-build vala meson glib2-devel pkgconfig(granite-7) gtk4-devel pkgconfig(x11) pkgconfig(systemd)
%description
-Backend implementation for xdg-desktop-portal for the Pantheon desktop environment
+Backend implementation for xdg-desktop-portal for Pantheon desktop environment.
%prep
%autosetup -n portals-%version
@@ -38,5 +38,5 @@ Backend implementation for xdg-desktop-portal for the Pantheon desktop environme
/usr/share/locale/*/LC_MESSAGES/xdg-desktop-portal-pantheon.mo
%changelog
-* Sat Mar 25 2023 windowsboy111
+* Sat Mar 25 2023 windowsboy111 - 7.0.0-1
- Initial package
diff --git a/anda/desktops/golang-github-fyshos-fynedesk/anda.hcl b/anda/desktops/golang-github-fyshos-fynedesk/anda.hcl
new file mode 100644
index 0000000000..7c7bc414cd
--- /dev/null
+++ b/anda/desktops/golang-github-fyshos-fynedesk/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "golang-github-fyshos-fynedesk.spec"
+ }
+}
diff --git a/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec b/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec
new file mode 100644
index 0000000000..8ccf3ed5a3
--- /dev/null
+++ b/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec
@@ -0,0 +1,76 @@
+# Generated by go2rpm 1.9.0
+%bcond_with check
+
+%global debug_package %{nil}
+
+# https://github.com/FyshOS/fynedesk
+%global goipath github.com/FyshOS/fynedesk
+Version: 0.3.0
+
+%gometa -f
+
+
+%global common_description %{expand:
+A full desktop environment for Linux/Unix using Fyne.}
+
+%global golicenses LICENSE
+%global godocs AUTHORS README.md CHANGELOG.md
+
+Name: %{goname}
+Release: %autorelease
+Summary: A full desktop environment for Linux/Unix using Fyne
+
+License: BSD-3-Clause
+URL: %{gourl}
+Source: %{gosource}
+BuildRequires: git
+BuildRequires: libX11-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXi-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
+BuildRequires: xorg-x11-server-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: pkgconfig(gl)
+
+Requires: arandr
+Requires: xbacklight
+Requires: network-manager-applet
+BuildRequires: make
+BuildRequires: golang
+
+%description %{common_description}
+
+%gopkg
+
+
+%prep
+%goprep
+%autopatch -p1
+
+%generate_buildrequires
+
+%build
+go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w" -buildmode=pie ./cmd/fynedesk_runner
+go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w" -buildmode=pie ./cmd/fynedesk
+
+%install
+%gopkginstall
+install -m 0755 -vd %{buildroot}%{_bindir}
+%make_install
+
+%if %{with check}
+%check
+%gocheck
+%endif
+
+%files
+%license LICENSE
+%doc AUTHORS README.md CHANGELOG.md
+%{_bindir}/*
+%{_datadir}/xsessions/fynedesk.desktop
+
+%gopkgfiles
+
+%changelog
+%autochangelog
diff --git a/anda/desktops/golang-github-fyshos-fynedesk/update.rhai b/anda/desktops/golang-github-fyshos-fynedesk/update.rhai
new file mode 100644
index 0000000000..e932363c22
--- /dev/null
+++ b/anda/desktops/golang-github-fyshos-fynedesk/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("FyshOS/fynedesk"));
diff --git a/anda/desktops/kde/kde-liquidshell/kde-liquidshell.spec b/anda/desktops/kde/kde-liquidshell/kde-liquidshell.spec
index b5583a5876..44ddb827e9 100644
--- a/anda/desktops/kde/kde-liquidshell/kde-liquidshell.spec
+++ b/anda/desktops/kde/kde-liquidshell/kde-liquidshell.spec
@@ -7,42 +7,42 @@ Name: kde-liquidshell
Version: 1.8.1
Release: %autorelease
Summary: Basic desktop shell using QtWidgets
-Provides: liquidshell
+Provides: liquidshell = %version
License: GPL-3.0
URL: %{forgeurl}
Source0: %{forgeurl}/-/archive/%{commit}/liquidshell-%{commit}.tar.gz
-BuildRequires: cmake
-BuildRequires: libappstream-glib
-BuildRequires: pkgconfig(Qt5)
-BuildRequires: kf5-rpm-macros
-BuildRequires: extra-cmake-modules
-BuildRequires: pkgconfig(Qt5X11Extras)
-BuildRequires: qt5-qtbase-private-devel
-BuildRequires: qt5-qtbase-static
-BuildRequires: cmake(KF5WindowSystem)
-BuildRequires: cmake(KF5WidgetsAddons)
-BuildRequires: cmake(KF5ConfigWidgets)
-BuildRequires: cmake(KF5Config)
-BuildRequires: cmake(KF5KIO)
-BuildRequires: cmake(KF5IconThemes)
-BuildRequires: cmake(KF5ItemViews)
-BuildRequires: cmake(KF5Archive)
-BuildRequires: cmake(KF5Notifications)
-BuildRequires: cmake(KF5I18n)
-BuildRequires: cmake(KF5NetworkManagerQt)
-BuildRequires: cmake(KF5Service)
-BuildRequires: cmake(KF5Solid)
-BuildRequires: cmake(KF5BluezQt)
-BuildRequires: cmake(KF5KCMUtils)
-BuildRequires: cmake(KF5Crash)
-BuildRequires: cmake(KF5DBusAddons)
-BuildRequires: cmake(KF5NewStuff)
-BuildRequires: pkgconfig(packagekitqt5)
+BuildRequires: cmake
+BuildRequires: libappstream-glib
+BuildRequires: pkgconfig(Qt5)
+BuildRequires: kf5-rpm-macros
+BuildRequires: extra-cmake-modules
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: qt5-qtbase-private-devel
+BuildRequires: qt5-qtbase-static
+BuildRequires: cmake(KF5WindowSystem)
+BuildRequires: cmake(KF5WidgetsAddons)
+BuildRequires: cmake(KF5ConfigWidgets)
+BuildRequires: cmake(KF5Config)
+BuildRequires: cmake(KF5KIO)
+BuildRequires: cmake(KF5IconThemes)
+BuildRequires: cmake(KF5ItemViews)
+BuildRequires: cmake(KF5Archive)
+BuildRequires: cmake(KF5Notifications)
+BuildRequires: cmake(KF5I18n)
+BuildRequires: cmake(KF5NetworkManagerQt)
+BuildRequires: cmake(KF5Service)
+BuildRequires: cmake(KF5Solid)
+BuildRequires: cmake(KF5BluezQt)
+BuildRequires: cmake(KF5KCMUtils)
+BuildRequires: cmake(KF5Crash)
+BuildRequires: cmake(KF5DBusAddons)
+BuildRequires: cmake(KF5NewStuff)
+BuildRequires: pkgconfig(packagekitqt5)
Requires: kwin
-Requires: plasma-workspace-x11
-Requires: plasma-workspace
+Requires: plasma-workspace-x11
+Requires: plasma-workspace
Recommends: polkit-kde
%description
diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec
index 4ff2a108d8..8fc4ee6a4f 100644
--- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec
+++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec
@@ -1,6 +1,6 @@
%global forgeurl https://github.com/KDE/latte-dock/
-%global commit 93fcab62171d047f2d0d5be43499c67d5e15561e
+%global commit 4cc612284dd3ae76e2159cd846cf137fde802d52
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
@@ -31,6 +31,7 @@ BuildRequires: kf5-kdeclarative-devel
BuildRequires: kf5-knewstuff-devel
BuildRequires: kf5-knotifications-devel
BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kitemmodels-devel
BuildRequires: kf5-ki18n-devel
BuildRequires: kf5-kpackage-devel
BuildRequires: kf5-plasma-devel
@@ -43,6 +44,7 @@ BuildRequires: kf5-kcrash-devel
BuildRequires: qt5-qtwayland-devel
BuildRequires: plasma-wayland-protocols-devel
BuildRequires: wayland-devel
+BuildRequires: plasma-workspace-devel
Recommends: %{name}-lang
@@ -60,6 +62,7 @@ using parabolic zoom effect and tries to be there only when it is needed.
%package lang
Summary: Translation files for latte-dock
Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%description lang
%{summary}.
@@ -78,6 +81,8 @@ Requires: %{name} = %{version}-%{release}
%find_lang %{name} --all-name
%files
+%doc README.md
+%license LICENSES/*
%{_bindir}/latte-dock
%{_datadir}/metainfo/org.kde.latte-dock.appdata.xml
%{_datadir}/metainfo/org.kde.latte.plasmoid.appdata.xml
@@ -101,8 +106,8 @@ Requires: %{name} = %{version}-%{release}
%files lang -f %{name}.lang
%changelog
-* Sun Dec 25 2022 lleyton
+* Sun Dec 25 2022 lleyton - 0.10.0^20221226.93c50a7-1
- Comply with packaging policy
-* Sun Dec 25 2022 windowsboy111
+* Sun Dec 25 2022 windowsboy111 - 0.10.9-1
- Initial package
diff --git a/anda/desktops/lomiri/lomiri.spec b/anda/desktops/lomiri/lomiri.spec
index d939386ef3..a324087da5 100644
--- a/anda/desktops/lomiri/lomiri.spec
+++ b/anda/desktops/lomiri/lomiri.spec
@@ -1,10 +1,10 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit a1a1b1f25714a0f5cddf3905edc38dc6e6b49228
+%global commit 8a2f908c306ec63a7a0f14c247fa1676c655c7ce
%forgemeta
Name: lomiri
Version: 0.1.2
-Release: %autorelease
+Release: 2%?dist
Summary: A convergent desktop environment by Ubports
License: GPLv3 AND LGPLv3
@@ -55,6 +55,9 @@ BuildRequires: qt5-qtbase-private-devel
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: systemd-rpm-macros
Recommends: lomiri-session
+# Most of these are for other libs that rpm doesn't find
+Requires: libusermetrics
+Requires: deviceinfo
Requires: lomiri-system-settings
Requires: qmenumodel
Requires: xorg-x11-server-Xwayland
@@ -108,11 +111,12 @@ install -Dm644 data/test.sensors %{buildroot}%{_sysconfdir}/lomirisensors
%ldconfig_scriptlets
%files -f %{name}.lang
+%doc README.md
%license COPYING COPYING.LGPL
%dir %{_sysconfdir}/lomiri
-%{_sysconfdir}/lomiri/devices.conf
+%config %{_sysconfdir}/lomiri/devices.conf
%dir %{_sysconfdir}/lomirisensors
-%{_sysconfdir}/lomirisensors/test.sensors
+%config %{_sysconfdir}/lomirisensors/test.sensors
%{_bindir}/indicators-client
%{_bindir}/lomiri
%{_userunitdir}/*.service
diff --git a/anda/desktops/lomiri/update.rhai b/anda/desktops/lomiri/update.rhai
new file mode 100644
index 0000000000..bf40ea8d35
--- /dev/null
+++ b/anda/desktops/lomiri/update.rhai
@@ -0,0 +1,3 @@
+let o = get("https://gitlab.com/api/v4/projects/25716028/repository/tags").json_arr()[0];
+rpm.version(o.name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/25716028/repository/commits").json_arr()[0].id);
diff --git a/anda/desktops/unity-shell/unity-shell.spec b/anda/desktops/unity-shell/unity-shell.spec
index a2381e313e..47f233e22b 100644
--- a/anda/desktops/unity-shell/unity-shell.spec
+++ b/anda/desktops/unity-shell/unity-shell.spec
@@ -1,3 +1,5 @@
+%define archive unity_7.7.0+23.04.20230222.2-0ubuntu2.tar.xz
+
Name: unity-shell
Version: 7.7.0
Release: %autorelease
@@ -5,7 +7,7 @@ Summary: Unity is a shell that sings
License: GPL-3.0-or-later
URL: https://launchpad.net/unity
-Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity/unity_%{version}+23.04.20230222.2-0ubuntu2.tar.xz
+Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity/%archive
Patch0: 0001-Remove-xpathselect-dependency.patch
Patch1: 0002-Remove-ido-dependency.patch
Patch2: 0003-Remove-social-scope.patch
@@ -19,7 +21,7 @@ BuildRequires: pkgconfig(zeitgeist-2.0)
BuildRequires: libappstream-glib-devel
BuildRequires: libdbusmenu-devel
BuildRequires: bamf-devel
-BuildRequires: libindicator-gtk3-devel
+BuildRequires: terra-libindicator-gtk3-devel
BuildRequires: json-glib-devel
BuildRequires: libnotify-devel
BuildRequires: libsigc++20-devel
@@ -45,7 +47,7 @@ Requires: pam
Requires: bamf-daemon
Requires: unity-gtk-module-common
Requires: compiz9
-Requires: libindicator-gtk3
+Requires: terra-libindicator-gtk3
Recommends: unity-greeter
Recommends: unity-scope-home
@@ -210,14 +212,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%dir %{_datadir}/compiz/unitymtgrabhandles/images/
%{_datadir}/compiz/unitymtgrabhandles/images/handle-*.png
%{_datadir}/gnome-control-center/keybindings/50-unity-launchers.xml
-%{_sysconfdir}/pam.d/unity
%{_datadir}/compizconfig/upgrades/*.upgrade
-%{_sysconfdir}/compizconfig/unity*
+%config %{_sysconfdir}/pam.d/unity
+%config %{_sysconfdir}/compizconfig/unity*
%{_userunitdir}/unity*.service
%{_userunitdir}/unity*.target
%files -n python3-uwidgets
-%doc AUTHORS ChangeLog HACKING README
+%doc README
%license uwidgets/LICENCE
%{_bindir}/uwidgets-runner
%{python3_sitearch}/uwidgets-*.egg-info/
diff --git a/anda/desktops/unity-shell/update.rhai b/anda/desktops/unity-shell/update.rhai
new file mode 100644
index 0000000000..f2c7f60807
--- /dev/null
+++ b/anda/desktops/unity-shell/update.rhai
@@ -0,0 +1,4 @@
+let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/u/unity/?C=N;O=D");
+let v = find("unity_([\\d.]+)\\+.+?.tar.xz", html, 1);
+rpm.version(v);
+rpm.define("archive", find("unity_([\\d.]+)\\+.+?.tar.xz", html, 0));
diff --git a/anda/desktops/unityx-shell/unityx-shell.spec b/anda/desktops/unityx-shell/unityx-shell.spec
index cbadc5ba2f..2c52fd5bac 100644
--- a/anda/desktops/unityx-shell/unityx-shell.spec
+++ b/anda/desktops/unityx-shell/unityx-shell.spec
@@ -6,7 +6,7 @@
Name: unityx-shell
Version: 1.7.7
-Release: %autorelease
+Release: 2%?dist
Summary: UnityX is a smaller shell based on Unity7
License: GPL-3.0 AND LGPL-3.0
@@ -15,6 +15,7 @@ Source0: %{url}/-/archive/%commit/unityx-%commit.tar.bz2
Source2: https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/-/commit/dee596492f006d02e2b39abd072ddd7b37fefe82.diff
Patch0: 0001-Remove-social-scope.patch
+BuildRequires: fdupes
BuildRequires: cmake
BuildRequires: g++
BuildRequires: gcc
@@ -26,7 +27,7 @@ BuildRequires: zeitgeist-devel
BuildRequires: libappstream-glib-devel
BuildRequires: libdbusmenu-devel
BuildRequires: bamf-devel
-BuildRequires: libindicator-gtk3-devel
+BuildRequires: terra-libindicator-gtk3-devel
BuildRequires: json-glib-devel
BuildRequires: libnotify-devel
BuildRequires: libsigc++20-devel
@@ -38,6 +39,7 @@ BuildRequires: boost-devel
BuildRequires: pkgconfig(nux-4.0)
BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(unity-protocol-private)
+BuildRequires: libunity libunity-devel
# unityx-shell-xfce4-windowck-plugin
BuildRequires: pkgconfig(libwnck-3.0)
BuildRequires: pkgconfig(libxfconf-0)
@@ -61,7 +63,7 @@ Requires: geis-devel
Requires: unity-settings-daemon
Requires: unity-gtk3-module
Requires: unity-gtk2-module
-Requires: libindicator-gtk3
+Requires: terra-libindicator-gtk3
Requires: plotinus%{?_isa} = %{version}-%{release}
Requires: bamf-daemon
Requires: xbindkeys
@@ -74,7 +76,8 @@ Requires: xfce4-vala-panel-appmenu-plugin
Requires: xfwm4
%description
-UnityX is a shell based off code from Unity7 with lighter dependencies and more customizability.
+UnityX is a shell based off code from Unity7 with lighter dependencies and more
+customizability.
%package xfce4-windowck-plugin
Summary: Core library for the Unity shell
@@ -160,6 +163,8 @@ rm -rf .%{_datadir}/unityx
ln -s %{_datadir}/unity .%{_datadir}/unityx
popd
+%fdupes %buildroot%_datadir/themes/
+
%find_lang unityx
%find_lang xfce4-windowck-plugin
@@ -174,7 +179,7 @@ fi
glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%files -f unityx.lang
-%doc AUTHORS ChangeLog INSTALL README.md
+%doc AUTHORS ChangeLog README.md
%license COPYING COPYING.LGPL
%{_bindir}/unityx*
%{_libdir}/unityx
diff --git a/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec b/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec
index 5fe797cdd7..4004ec9a50 100644
--- a/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec
+++ b/anda/fonts/arphic-ukai/arphic-ukai-fonts.spec
@@ -1,6 +1,6 @@
Name: arphic-ukai-fonts
Version: 0.2.20080216.2
-Release: %autorelease
+Release: 2%?dist
URL: https://www.freedesktop.org/wiki/Software/CJKUnifonts
Source0: https://deb.debian.org/debian/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_%{version}.orig.tar.bz2
License: Arphic-1999
@@ -23,9 +23,8 @@ install -D -m644 ukai.ttc %{buildroot}/%{_datadir}/fonts/arphic-ukai/ukai.ttc
%files
%doc README
%license license/english/ARPHICPL.TXT
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/arphic-ukai/ukai.ttc
%changelog
-* Mon Nov 21 2022 windowsboy111 - 4.004
+* Mon Nov 21 2022 windowsboy111 - 0.2.20080216.2-1
- Initial package
diff --git a/anda/fonts/arphic-uming/arphic-uming-fonts.spec b/anda/fonts/arphic-uming/arphic-uming-fonts.spec
index 0ae77eb780..cfe482f2cd 100644
--- a/anda/fonts/arphic-uming/arphic-uming-fonts.spec
+++ b/anda/fonts/arphic-uming/arphic-uming-fonts.spec
@@ -1,6 +1,6 @@
Name: arphic-uming-fonts
Version: 0.2.20080216.2
-Release: %autorelease
+Release: 2%?dist
URL: https://www.freedesktop.org/wiki/Software/CJKUnifonts
Source0: https://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_%{version}.orig.tar.bz2
License: Arphic-1999
@@ -27,5 +27,5 @@ install -D -m644 uming.ttc %{buildroot}/%{_datadir}/fonts/arphic-uming/uming.ttc
/%{_datadir}/fonts/arphic-uming/uming.ttc
%changelog
-* Mon Nov 21 2022 windowsboy111 - 4.004
+* Mon Nov 21 2022 windowsboy111 - 0.2.20080216.2-1
- Initial package
diff --git a/anda/fonts/fakepearl/fakepearl-fonts.spec b/anda/fonts/fakepearl/fakepearl-fonts.spec
index f4a97d86ea..32c3b184df 100644
--- a/anda/fonts/fakepearl/fakepearl-fonts.spec
+++ b/anda/fonts/fakepearl/fakepearl-fonts.spec
@@ -1,6 +1,6 @@
Name: fakepearl-fonts
Version: 1.1
-Release: 1%?dist
+Release: 2%?dist
URL: https://github.com/max32002/FakePearl
Source0: %url/archive/refs/tags/%version.tar.gz
License: OFL-1.1
@@ -24,7 +24,6 @@ install -Dm644 tw/*.ttf %buildroot/%_datadir/fonts/fakepearl/
%files
%doc README.md
%license SIL_Open_Font_License_1.1.txt
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/fakepearl/
diff --git a/anda/fonts/hannom/hannom-fonts.spec b/anda/fonts/hannom/hannom-fonts.spec
index 395734ec92..f651f64092 100644
--- a/anda/fonts/hannom/hannom-fonts.spec
+++ b/anda/fonts/hannom/hannom-fonts.spec
@@ -1,6 +1,6 @@
Name: hannom-fonts
Version: 2005
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: https://vietunicode.sourceforge.net/fonts/fonts_hannom.html
Source0: https://downloads.sourceforge.net/project/vietunicode/hannom/hannom%20v%{version}/hannomH.zip
Source1: COPYING
@@ -25,7 +25,6 @@ install -Dm644 %{SOURCE1} "%{buildroot}/%{_datadir}/licenses/%{name}/COPYING"
%files
%license COPYING
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/hannom/
%changelog
diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec
index 95b8a4013b..83c9153670 100644
--- a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec
+++ b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec
@@ -2,7 +2,7 @@
%global debug_package %{nil}
Name: iosevka-fusion-fonts
-Version: 23.0.0
+Version: 24.1.3
Release: 1%{?dist}
Summary: A custom font based on iosevka
diff --git a/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec b/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec
index 0c957948aa..b0e4438a21 100644
--- a/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec
+++ b/anda/fonts/kanjistrokeorders/kanjistrokeorders-fonts.spec
@@ -1,11 +1,11 @@
Name: kanjistrokeorders-fonts
Version: 4.004
-Release: %autorelease
+Release: 2%?dist
URL: https://sites.google.com/site/nihilistorguk
License: BSD-3-Clause
Summary: Kanji stroke order font
BuildRequires: unzip
-BuildArch: noarch
+BuildArch: noarch
%description
@@ -23,7 +23,6 @@ install -D -m644 KanjiStrokeOrders_v%{version}.ttf %{buildroot}/%{_datadir}/font
%files
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/TTF/KanjiStrokeOrders_v%{version}.ttf
%changelog
diff --git a/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec b/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec
index 574f9405cc..ca342299e8 100644
--- a/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec
+++ b/anda/fonts/mini-wakuwaku/mini-wakuwaku-fonts.spec
@@ -1,6 +1,6 @@
Name: mini-wakuwaku-fonts
Version: 1.0
-Release: %autorelease
+Release: 2%?dist
URL: http://mini-design.jp/font/mini-wakuwaku.html
Source0: http://mini-design.jp/font/img/mini-wakuwaku.zip
License: Unlicense
@@ -25,9 +25,8 @@ install -D -m644 mini-wakuwaku.otf %{buildroot}/%{_datadir}/fonts/mini-wakuwaku/
%files
%doc readme.html
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/mini-wakuwaku/
%changelog
-* Mon Nov 21 2022 windowsboy111 - 4.004
+* Mon Nov 21 2022 windowsboy111 - 1.0-1
- Initial package
diff --git a/anda/fonts/naikai/naikai-fonts.spec b/anda/fonts/naikai/naikai-fonts.spec
index bc2e99fd77..6a173d91c5 100644
--- a/anda/fonts/naikai/naikai-fonts.spec
+++ b/anda/fonts/naikai/naikai-fonts.spec
@@ -14,12 +14,14 @@ BuildArch: noarch
%package jp
Summary: A free font family derived from setofont (JP version)
%description jp
-%{summary}. 瀬戸フォントに由来、たくさん中国語文字を加えた無料なフォント
+%{summary}.
+瀬戸フォントに由来、たくさん中国語文字を加えた無料なフォント。
%package tw
Summary: A free font family derived from setofont (TW version)
%description tw
-%{summary}. 瀨戶字體的繁體中文補字計畫
+%{summary}.
+瀨戶字體的繁體中文補字計畫。
%prep
@@ -29,20 +31,18 @@ Summary: A free font family derived from setofont (TW version)
%install
mkdir -p %{buildroot}/%{_datadir}/fonts/%{name}-{jp,tw}/
-install -D -m644 jp/*.ttf %{buildroot}/%{_datadir}/fonts/%{name}-jp/
-install -D -m644 tw/*.ttf %{buildroot}/%{_datadir}/fonts/%{name}-tw/
+install -Dm644 jp/*.ttf %{buildroot}/%{_datadir}/fonts/%{name}-jp/
+install -Dm644 tw/*.ttf %{buildroot}/%{_datadir}/fonts/%{name}-tw/
%files jp
%doc README.md
%license SIL_Open_Font_License_1.1.txt
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/%{name}-jp
%files tw
%doc README.md
%license SIL_Open_Font_License_1.1.txt
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/%{name}-tw
%changelog
diff --git a/anda/fonts/nerd-fonts/nerd-fonts.spec b/anda/fonts/nerd-fonts/nerd-fonts.spec
index 17698d8aa3..01e41983ce 100644
--- a/anda/fonts/nerd-fonts/nerd-fonts.spec
+++ b/anda/fonts/nerd-fonts/nerd-fonts.spec
@@ -1,20 +1,22 @@
%global flist 3270 Agave AnonymousPro Arimo AurulentSansMono BigBlueTerminal BitstreamVeraSansMono CascadiaCode CodeNewRoman Cousine DaddyTimeMono DejaVuSansMono DroidSansMono FantasqueSansMono FiraCode FiraMono Go-Mono Gohu Hack Hasklig HeavyData Hermit IBMPlexMono Inconsolata InconsolataGo InconsolataLGC Iosevka JetBrainsMono Lekton LiberationMono Lilex MPlus Meslo Monofur Monoid Mononoki NerdFontsSymbolsOnly Noto OpenDyslexic Overpass ProFont ProggyClean RobotoMono ShareTechMono SourceCodePro SpaceMono Terminus Tinos Ubuntu UbuntuMono VictorMono iA-Writer
-%global desc Nerd Fonts is a project that patches developer targeted fonts with a high number of glyphs (icons).
+%global desc %{expand:
+Nerd Fonts is a project that patches developer targeted fonts with a high
+number of glyphs (icons).}
Name: nerd-fonts
-Version: 3.0.1
+Version: 3.0.2
Release: 1%{?dist}
URL: https://nerdfonts.com/
-Source0: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%{version}/readme.md
-Source1: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%{version}/LICENSE
+Source0: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/readme.md
+Source1: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/LICENSE
License: OFL-1.1
Summary: All packaged Nerd fonts
BuildArch: noarch
-Requires: %{lua:
+Recommends: %{lua:
local x = ""
-local ver = rpm.expand("%{version}")
-for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do
- x = x .. font:lower().."-nerd-fonts="..ver.." "
+local ver = rpm.expand("%version-%release")
+for font in (rpm.expand("%flist")):gmatch("[^ ]+") do
+ x = x .. font:lower().."-nerd-fonts = "..ver.." "
end
print(x)
}
@@ -22,7 +24,7 @@ BuildRequires: unzip
%{lua:
local url = rpm.expand(": https://github.com/ryanoasis/nerd-fonts/releases/download/v%{version}/");
local n = 2;
-for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do
+for font in (rpm.expand("%flist")):gmatch("[^ ]+") do
print("Source"..n..url..font..".zip\n")
n = n + 1
end
@@ -33,38 +35,39 @@ end
'iconic fonts' such as Font Awesome, Devicons, Octicons, and others.
%{lua:
-for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do
+local desc = rpm.expand("%desc")
+for font in (rpm.expand("%flist")):gmatch("[^ ]+") do
print("%package -n "..font:lower().."-nerd-fonts\n")
print("Summary:\tPatched Nerd fonts: "..font)
print("\n%description -n "..font:lower().."-nerd-fonts\n")
- print("%{desc}. The package contains the patched version of "..font..".\n")
+ print(desc..". The package contains the patched version of "..font..".\n")
end
}
-%global debug_package %{nil}
+%global debug_package %nil
%prep
-cp %{SOURCE0} .
-cp %{SOURCE1} .
+cp %SOURCE0 .
+cp %SOURCE1 .
%build
%install
-mkdir -p %{buildroot}/usr/share/fonts/nerd-fonts/
+mkdir -p %buildroot/usr/share/fonts/nerd-fonts/
%{lua:
-local dest = rpm.expand("%{buildroot}/usr/share/fonts/nerd-fonts/");
+local dest = rpm.expand("%buildroot/usr/share/fonts/nerd-fonts/");
local n = 2;
-for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do
- local src = rpm.expand("%{SOURCE"..n.."}")
+for font in (rpm.expand("%flist")):gmatch("[^ ]+") do
+ local src = rpm.expand("%SOURCE"..n)
print("unzip "..src.." -d "..dest..font.." &\n")
n = n + 1
end
}
wait
-find %{buildroot}/usr/share/fonts/nerd-fonts/ -name "* Windows Compatible.*" -delete &
-find %{buildroot}/usr/share/fonts/nerd-fonts/ -name "*.txt" -delete &
-find %{buildroot}/usr/share/fonts/nerd-fonts/ -name "readme.md" -delete &
+find %buildroot/usr/share/fonts/nerd-fonts/ -name "* Windows Compatible.*" -delete &
+find %buildroot/usr/share/fonts/nerd-fonts/ -name "*.txt" -delete &
+find %buildroot/usr/share/fonts/nerd-fonts/ -name "readme.md" -delete &
wait
@@ -73,7 +76,7 @@ wait
%license LICENSE
%{lua:
-for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do
+for font in (rpm.expand("%flist")):gmatch("[^ ]+") do
print("%files -n "..font:lower().."-nerd-fonts\n")
print("%doc readme.md\n")
print("%license LICENSE\n")
@@ -83,5 +86,5 @@ end
%changelog
-* Wed Jan 4 2023 windowsboy111
+* Wed Jan 4 2023 windowsboy111 - 2.2.2-1
- Initial package
diff --git a/anda/fonts/open-huninn/open-huninn-fonts.spec b/anda/fonts/open-huninn/open-huninn-fonts.spec
index 7577038b01..bca26a38f1 100644
--- a/anda/fonts/open-huninn/open-huninn-fonts.spec
+++ b/anda/fonts/open-huninn/open-huninn-fonts.spec
@@ -1,6 +1,6 @@
Name: open-huninn-fonts
Version: 2.0
-Release: 1%?dist
+Release: 2%?dist
URL: https://github.com/justfont/open-huninn-font
Source0: %url/archive/refs/tags/v%version.tar.gz
License: OFL-1.1
@@ -24,7 +24,6 @@ install -Dm644 font/jf-openhuninn-%version.ttf %buildroot/%_datadir/fonts/open-h
%files
%doc README.md
%license license.txt
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/open-huninn/
diff --git a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec
index b6d0dc9546..48a371dce2 100644
--- a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec
+++ b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec
@@ -1,6 +1,6 @@
Name: sarasa-gothic-fonts
-Version: 0.40.7
-Release: 1%{?dist}
+Version: 0.41.2
+Release: 2%{?dist}
URL: https://github.com/be5invis/Sarasa-Gothic
Source0: %url/releases/download/v%version/sarasa-gothic-ttc-%version.7z
Source1: %url/releases/download/v%version/sarasa-gothic-super-ttc-%version.7z
@@ -49,13 +49,11 @@ install -Dm644 %SOURCE3 %buildroot/%_datadir/doc/sarasa-gothic-super-fonts/
%files
%doc README.md
%license LICENSE
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/sarasa-gothic/
%files -n sarasa-gothic-super-fonts
%doc README.md
%license LICENSE
-%defattr(-,root,root,0755)
/%{_datadir}/fonts/sarasa-gothic-super/
%changelog
diff --git a/anda/fonts/seto/seto-fonts.spec b/anda/fonts/seto/seto-fonts.spec
index d0617bf61c..3365601eeb 100644
--- a/anda/fonts/seto/seto-fonts.spec
+++ b/anda/fonts/seto/seto-fonts.spec
@@ -1,8 +1,8 @@
Name: seto-fonts
Version: 6.20
-Release: %autorelease
+Release: 2%?dist
URL: https://setofont.osdn.jp/
-Source0: https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip
+Source0: https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip
License: OFL-1.1
Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji
BuildRequires: unzip
@@ -10,7 +10,7 @@ BuildArch: noarch
%description
-%{summary}.
+%summary.
%prep
@@ -19,15 +19,17 @@ BuildArch: noarch
%build
%install
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/%{name}/
-cp -r *.ttf $RPM_BUILD_ROOT/%{prefix}/%{name}/
+mkdir -p %buildroot/%_datadir/fonts/%name
+install -Dm644 *.ttf %buildroot/%_datadir/fonts/%name/
%files
%doc readme.txt
-%defattr(-,root,root,0755)
-/%{prefix}/%{name}
+%_datadir/fonts/%name/
%changelog
-* Tue Nov 22 2022 windowsboy111 - 6.20
+* Sun Jun 18 2023 windowsboy111 - 6.20-2
+- Fix install dir.
+
+* Tue Nov 22 2022 windowsboy111 - 6.20-1
- Initial package
diff --git a/anda/rust/sccache/anda.hcl b/anda/fonts/sipa/anda.hcl
similarity index 61%
rename from anda/rust/sccache/anda.hcl
rename to anda/fonts/sipa/anda.hcl
index a57944ad84..59acbbe738 100644
--- a/anda/rust/sccache/anda.hcl
+++ b/anda/fonts/sipa/anda.hcl
@@ -1,6 +1,6 @@
project pkg {
arches = ["x86_64"]
rpm {
- spec = "rust-sccache.spec"
+ spec = "sipa-fonts.spec"
}
}
diff --git a/anda/fonts/sipa/sipa-fonts.spec b/anda/fonts/sipa/sipa-fonts.spec
new file mode 100644
index 0000000000..b4cb6932ac
--- /dev/null
+++ b/anda/fonts/sipa/sipa-fonts.spec
@@ -0,0 +1,84 @@
+%global variants Baijam Chakra Charm Charmonman Fahkwang K2D_July8 KoHo Kodchasal Krub Mali_Grade6 Niramit_AS Srisakdi Sarabun SarabunNew
+
+Name: sipa-fonts
+Version: 20200217
+Release: 2%?dist
+Summary: Thai National Fonts collection
+URL: https://www.f0nt.com/release/13-free-fonts-from-sipa/
+License: OFL-1.1
+Source0: https://waa.inter.nstda.or.th/stks/pub/%(x=%version;echo ${x:0:4})/%version-13Fonts.zip
+BuildRequires: unzip
+BuildArch: noarch
+Recommends: %{lua:
+local x = ""
+local ver = rpm.expand("%version-%release")
+for variant in (rpm.expand("%variants")):gmatch("[^ ]+") do
+ local v = string.gsub(variant, "_", " ")
+ local name = "th-"..string.gsub(v:lower(), " ", "-").."-fonts"
+ x = x .. name .. " = "..ver.." "
+end
+print(x)
+}
+
+%description
+Thai National Fonts collection, freely-licensed computer fonts for the Thai
+script sponsored by the Thai government.
+
+
+%{lua:
+local summary = rpm.expand("%summary.\n");
+for variant in (rpm.expand("%variants")):gmatch("[^ ]+") do
+ local v = string.gsub(variant, "_", " ")
+ local name = "th-"..string.gsub(v:lower(), " ", "-").."-fonts"
+ print("%package -n "..name.."\n")
+ print("Summary: Thai "..v.." fonts (sipa-fonts)\n")
+ print("%description -n "..name.."\n")
+ print(summary)
+end
+}
+
+%prep
+%autosetup -n Fonts
+
+# copied from https://www.f0nt.com/about/license/
+cat < LICENSE
+1. คุณสามารถดาวน์โหลดฟอนต์ไปใช้งานได้ฟรี ไม่ต้องเสียค่าใช้จ่ายแต่อย่างใด
+2. แต่ถ้ามีการระบุข้อตกลงอื่นใดจากเจ้าของฟอนต์ ดังที่แสดงไว้ในหน้าดาวน์โหลดฟอนต์ หรือเป็นไฟล์เอกสารแสดงข้อตกลงที่แนบไปกับฟอนต์นั้นๆ ให้ยึดข้อตกลงดังกล่าวเป็นสำคัญ
+3. คุณสามารถคัดลอกรายละเอียดอธิบายข้อมูล, ภาพตัวอย่างฟอนต์ ไปเผยแพร่ แจกจ่ายในเว็บไซต์หรือสื่ออื่นๆ ได้ โดยต้องระบุที่มา และทำลิงก์กลับมายังหน้าแสดงรายละเอียดฟอนต์
+4. ไม่อนุญาตให้นำ “ไฟล์ฟอนต์” ไปขาย เว้นแต่จะเป็นการแนบไฟล์ติดไปกับสื่อ โปรแกรม เพื่อความสะดวกในการใช้งาน แต่ไม่ใช่เพื่อการขายฟอนต์เป็นหลัก
+5. หากคุณต้องการดัดแปลงฟอนต์เพื่อใช้งานเป็นการส่วนตัว สามารถทำได้ แต่ถ้าทำเพื่อขายหรือรับจ้างผลิต คุณจะต้องได้รับอนุญาตจากเจ้าของฟอนต์ก่อนเท่านั้น
+EOF
+
+%build
+
+%install
+mkdir -p %buildroot/%_datadir/fonts/sipa/
+mv *.ttf %buildroot/%_datadir/fonts/sipa/
+cd %buildroot/%_datadir/fonts/sipa/
+mv "THSarabun Bold Italic.ttf" "TH Sarabun Bold Italic.ttf"
+mv "THSarabun Bold.ttf" "TH Sarabun Bold.ttf"
+mv "THSarabun BoldItalic.ttf" "TH Sarabun BoldItalic.ttf"
+mv "THSarabun Italic.ttf" "TH Sarabun Italic.ttf"
+mv "THSarabun.ttf" "TH Sarabun.ttf"
+mv "THSarabunNew Bold.ttf" "TH SarabunNew Bold.ttf"
+mv "THSarabunNew BoldItalic.ttf" "TH SarabunNew BoldItalic.ttf"
+mv "THSarabunNew Italic.ttf" "TH SarabunNew Italic.ttf"
+mv "THSarabunNew.ttf" "TH SarabunNew.ttf"
+
+
+%files
+%license LICENSE
+
+%{lua:
+for variant in (rpm.expand("%variants")):gmatch("[^ ]+") do
+ local v = string.gsub(variant, "_", " ")
+ local name = "th-"..string.gsub(v:lower(), " ", "-").."-fonts"
+ print("%files -n "..name.."\n")
+ print("%license LICENSE\n")
+ print("/usr/share/fonts/sipa/TH?"..v:gsub(" ", "?").."*\n")
+end
+}
+
+%changelog
+* Sun Jun 11 2023 windowsboy111 - 20200217-1
+- Initial package
diff --git a/anda/fonts/vl-gothic/65-2-vl-pgothic-fonts.conf b/anda/fonts/vl-gothic/65-2-vl-pgothic-fonts.conf
deleted file mode 100644
index 806a95eedd..0000000000
--- a/anda/fonts/vl-gothic/65-2-vl-pgothic-fonts.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
- VL PGothic
-
- sans-serif
-
-
-
-
-
- ja
-
-
- sans-serif
-
-
- VL PGothic
-
-
-
-
-
- VL PGothic
-
-
- false
-
-
-
diff --git a/anda/fonts/vl-gothic/65-3-vl-gothic-fonts.conf b/anda/fonts/vl-gothic/65-3-vl-gothic-fonts.conf
deleted file mode 100644
index a9557d5b2e..0000000000
--- a/anda/fonts/vl-gothic/65-3-vl-gothic-fonts.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
- VL Gothic
-
- monospace
-
-
-
-
- VL Gothic
-
- sans-serif
-
-
-
-
-
- ja
-
-
- monospace
-
-
- VL Gothic
-
-
-
-
-
- ja
-
-
- sans-serif
-
-
- VL Gothic
-
-
-
-
-
- VL Gothic
-
-
- false
-
-
-
diff --git a/anda/fonts/vl-gothic/vl-gothic-fonts.spec b/anda/fonts/vl-gothic/vl-gothic-fonts.spec
deleted file mode 100644
index 5e48b2e748..0000000000
--- a/anda/fonts/vl-gothic/vl-gothic-fonts.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-# Packaging template: multi-family fonts packaging.
-#
-# SPDX-License-Identifier: MIT
-#
-# This template documents spec declarations, used when packaging multiple font
-# families, from a single dedicated source archive. The source rpm is named
-# after the first (main) font family). Look up “fonts-3-sub” when the source
-# rpm needs to be named some other way.
-#
-# It is part of the following set of packaging templates:
-# “fonts-0-simple”: basic single-family fonts packaging
-# “fonts-1-full”: less common patterns for single-family fonts packaging
-# “fonts-2-multi”: multi-family fonts packaging
-# “fonts-3-sub”: packaging fonts, released as part of something else
-#
-Version: 20220612
-Release: 2%{?dist}
-URL: http://dicey.org/vlgothic
-
-# The following declarations will be aliased to [variable]0 and reused for all
-# generated *-fonts packages unless overriden by a specific [variable][number]
-# declaration.
-%global foundry VL
-%global fontlicense mplus and BSD
-%global fontlicenses LICENSE_J.mplus LICENSE_E.mplus LICENSE LICENSE.en
-%global fontdocs README README_J.mplus README.sazanami README_E.mplus
-%global fontdocsex %{fontlicenses}
-
-# A text block that can be reused as part of the description of each generated
-# subpackage.
-%global common_description %{expand:
-VLGothic provides Japanese TrueType fonts from the Vine Linux project.
-Most of the glyphs are taken from the M+ and Sazanami Gothic fonts,
-but some have also been improved by the project.
-}
-
-# Declaration for the subpackage containing the first font family. Also used as
-# source rpm info. All the [variable]0 declarations are equivalent and aliased
-# to [variable].
-
-%global fontfamily0 VL Gothic
-%global fontsummary0 Japanese TrueType font
-%global fontpkgheader0 %{expand:
-Obsoletes: vlgothic-fonts < %{version}-%{release}
-Provides: vlgothic-fonts = %{version}-%{release}
-}
-%global fonts0 VL-Gothic-Regular.ttf
-%global fontsex0 %{nil}
-%global fontconfs0 %{SOURCE10}
-%global fontconfsex0 %{nil}
-%global fontdescription0 %{expand:
-%{common_description}
-
-This package provides the monospace VLGothic font.
-}
-
-%global fontfamily1 VL PGothic
-%global fontsummary1 Proportional Japanese TrueType font
-%global fontpkgheader1 %{expand:
-Obsoletes: vlgothic-p-fonts < %{version}-%{release}
-Provides: vlgothic-p-fonts = %{version}-%{release}
-}
-%global fonts1 VL-PGothic-Regular.ttf
-%global fontsex1 %{nil}
-%global fontconfs1 %{SOURCE11}
-%global fontconfsex1 %{nil}
-%global fontdescription1 %{expand:
-%{common_description}
-
-This package provides the VLGothic font with proportional glyphs for some
-non-Japanese characters.
-}
-
-
-# https://ja.osdn.net/frs/redir.php?m=gigenet&f=vlgothic%2F77450%2FVLGothic-%%{version}.tar.xz
-Source0: https://mirrors.gigenet.com/OSDN/vlgothic/77450/VLGothic-%{version}.tar.xz
-Source10: 65-3-%{fontpkgname0}.conf
-Source11: 65-2-%{fontpkgname1}.conf
-
-# “fontpkg” will generate the font subpackage headers corresponding to the
-# elements declared above.
-# “fontpkg” accepts the following selection arguments:
-# – “-a” process everything
-# – “-z [number]” process a specific declaration block
-# If no flag is specified it will only process the zero/nosuffix block.
-%fontpkg -a
-
-# “fontmetapkg” will generate a font meta(sub)package header for all the font
-# subpackages generated in this spec. Optional arguments:
-# – “-n [name]” use [name] as metapackage name
-# – “-s [variable]” use the content of [variable] as metapackage summary
-# – “-d [variable]” use the content of [variable] as metapackage description
-# – “-z [numbers]” restrict metapackaging to [numbers] comma-separated list
-# of font package suffixes
-%fontmetapkg
-
-%prep
-%setup -q -n VLGothic
-iconv -f EUC-JP -t UTF-8 -o README.sazanami.tmp README.sazanami
-touch -r README.sazanami README.sazanami.tmp
-mv README.sazanami.tmp README.sazanami
-
-%build
-# “fontbuild” accepts the usual selection arguments:
-# – “-a” process everything
-# – “-z [number]” process a specific declaration block
-# If no flag is specified it will only process the zero/nosuffix block.
-%fontbuild -a
-
-%install
-# “fontinstall” accepts the usual selection arguments:
-# – “-a” process everything
-# – “-z [number]” process a specific declaration block
-# If no flag is specified it will only process the zero/nosuffix block.
-%fontinstall -a
-
-%check
-# “fontcheck” accepts the usual selection arguments:
-# – “-a” process everything
-# – “-z [number]” process a specific declaration block
-# If no flag is specified it will only process the zero/nosuffix block.
-%fontcheck -a
-
-# “fontfiles” accepts the usual selection arguments:
-# – “-a” process everything
-# – “-z [number]” process a specific declaration block
-# If no flag is specified it will only process the zero/nosuffix block
-%fontfiles -a
-
-%changelog
-* Wed Dec 28 2022 windowsboy111 - 16.8.4
-- Initial package
diff --git a/anda/games/minecraft-java/minecraft-java.spec b/anda/games/minecraft-java/minecraft-java.spec
index 439f4f65ac..d87c14304b 100644
--- a/anda/games/minecraft-java/minecraft-java.spec
+++ b/anda/games/minecraft-java/minecraft-java.spec
@@ -2,7 +2,7 @@
Name: minecraft-launcher
Version: 1121
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Official launcher for Minecraft
License: Proprietary
@@ -15,6 +15,8 @@ ExclusiveArch: x86_64
Requires: java >= 1.8.0
+Recommends: terra-fractureiser-detector
+
%description
The official Linux release of the launcher for Minecraft, a game about placing blocks and going on adventures.
@@ -40,7 +42,7 @@ install -Dm644 %{SOURCE2} %{buildroot}/%{_datadir}/icons/hicolor/symbolic/apps/m
%{_datadir}/icons/hicolor/symbolic/apps/minecraft-launcher.svg
%changelog
-* Tue Mar 08 2022 Thomas Batten stenstorpmc@gmail.com> - 1121-2
+* Tue Mar 08 2022 Thomas Batten - 1121-2
- Moved minecraft-launcher into bindir
* Mon Mar 07 2022 Thomas Batten - 1121-1
diff --git a/anda/games/opsu/opsu.spec b/anda/games/opsu/opsu.spec
index 42ad7f9b5d..031bfa7551 100644
--- a/anda/games/opsu/opsu.spec
+++ b/anda/games/opsu/opsu.spec
@@ -13,7 +13,8 @@ Recommends: ffmpeg
BuildArch: noarch
%description
-opsu! is an unofficial open-source client for the rhythm game osu!, written in Java using Slick2D and LWJGL (wrappers around OpenGL and OpenAL).
+opsu! is an unofficial open-source client for the rhythm game osu!, written in
+Java using Slick2D and LWJGL (wrappers around OpenGL and OpenAL).
%prep
@@ -38,7 +39,7 @@ EOF
%install
mkdir -p %{buildroot}/usr/share/{applications,{licenses,doc}/%{name}}
-install -Dm644 %{name}.sh %{buildroot}/usr/bin/%{name}
+install -Dm755 %{name}.sh %{buildroot}/usr/bin/%{name}
install -Dm644 %{SOURCE0} %{buildroot}/usr/share/java/%{name}/%{name}.jar
install -Dm644 %{SOURCE1} %{buildroot}/usr/share/icons/hicolor/scalable/apps/%{name}.png
install -Dm644 %{name}.desktop %{buildroot}/usr/share/applications/
@@ -54,5 +55,5 @@ install -Dm644 %{SOURCE3} "%{buildroot}/%{_datadir}/doc/%{name}/README.md"
/usr/share/applications/%{name}.desktop
%changelog
-* Tue Feb 7 2023 windowsboy111
+* Tue Feb 7 2023 windowsboy111 - 0.16.1-1
- Initial package
diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec
index 077084befd..b12d711e7a 100644
--- a/anda/games/osu-lazer/osu-lazer.spec
+++ b/anda/games/osu-lazer/osu-lazer.spec
@@ -1,14 +1,14 @@
-%define osuresver 2023.510.0
+%define osuresver 2023.605.0
%global debug_package %{nil}
Name: osu-lazer
-Version: 2023.513.0
+Version: 2023.617.0
Release: 1%{?dist}
Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
ExclusiveArch: x86_64
URL: https://osu.ppy.sh/
License: MIT AND CC-BY-NC-4.0
-Requires: zlib osu-mime fuse
+Requires: osu-mime fuse
Source0: https://github.com/ppy/osu/releases/download/%{version}/osu.AppImage
Source1: https://raw.githubusercontent.com/ppy/osu/%{version}/assets/lazer.png
Source2: https://raw.githubusercontent.com/ppy/osu-resources/%{osuresver}/LICENCE.md
@@ -47,5 +47,5 @@ install -Dm644 -t %{buildroot}/usr/share/applications %{SOURCE4}
%changelog
-* Mon Feb 13 2023 windowsboy111
+* Mon Feb 13 2023 windowsboy111 - 2023.207.0-1
- Initial package
diff --git a/anda/games/osu-mime/anda.hcl b/anda/games/osu-mime/anda.hcl
index ccf1994284..e33bc221e6 100644
--- a/anda/games/osu-mime/anda.hcl
+++ b/anda/games/osu-mime/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "osu-mime.spec"
}
diff --git a/anda/games/prismlauncher-nightly/0001-find-cmark-with-pkgconfig.patch b/anda/games/prismlauncher-nightly/0001-find-cmark-with-pkgconfig.patch
deleted file mode 100644
index d41ef66bec..0000000000
--- a/anda/games/prismlauncher-nightly/0001-find-cmark-with-pkgconfig.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001
-From: seth
-Date: Sun, 15 Jan 2023 14:47:49 -0500
-Subject: [PATCH] find cmark with pkgconfig
-
-Signed-off-by: seth
----
- cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 59 insertions(+)
- create mode 100755 cmake/Findcmark.cmake
-
-diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake
-new file mode 100755
-index 00000000..9858e5df
---- /dev/null
-+++ b/cmake/Findcmark.cmake
-@@ -0,0 +1,59 @@
-+# SPDX-FileCopyrightText: 2019 Black Hat
-+# SPDX-License-Identifier: GPL-3.0-only
-+
-+#
-+# CMake module to search for the cmark library
-+#
-+
-+# first try to find cmark-config.cmake
-+# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
-+find_package(cmark CONFIG QUIET)
-+if(cmark_FOUND AND TARGET cmark::cmark)
-+ # found it!
-+ return()
-+endif()
-+
-+find_package(PkgConfig QUIET)
-+if(PKG_CONFIG_FOUND)
-+ pkg_check_modules(PC_CMARK QUIET cmark)
-+endif()
-+
-+if(NOT CMARK_INCLUDE_DIR)
-+ find_path(CMARK_INCLUDE_DIR
-+ NAMES cmark.h
-+ PATHS
-+ ${PC_CMARK_INCLUDEDIR}
-+ ${PC_CMARK_INCLUDE_DIRS}
-+ /usr/include
-+ /usr/local/include)
-+endif()
-+
-+if(NOT CMARK_LIBRARY)
-+ find_library(CMARK_LIBRARY
-+ NAMES cmark
-+ HINTS
-+ ${PC_CMARK_LIBDIR}
-+ ${PC_CMARK_LIBRARY_DIRS}
-+ /usr/lib
-+ /usr/local/lib)
-+endif()
-+
-+if(NOT TARGET cmark::cmark)
-+ add_library(cmark::cmark UNKNOWN IMPORTED)
-+ set_target_properties(cmark::cmark
-+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-+ ${CMARK_INCLUDE_DIR})
-+ set_property(TARGET cmark::cmark APPEND
-+ PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY})
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(cmark
-+ DEFAULT_MSG
-+ CMARK_INCLUDE_DIR
-+ CMARK_LIBRARY)
-+
-+mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR)
-+
-+set(CMARK_LIBRARIES ${CMARK_LIBRARY})
-+set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR})
---
-2.39.0
-
diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
index 49575b61c3..aa6719d6ce 100644
--- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
+++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
@@ -1,6 +1,6 @@
%global real_name prismlauncher
-%global commit 42ceaa0015217d67245b40adf71120fcd8a739f2
+%global commit 12cd8a7bea991c2a8d4b59b1cfc9f7c246819fc9
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
@@ -38,23 +38,26 @@
%global build_platform CentOS
%endif
+%if %{with qt6}
Name: prismlauncher-nightly
-Version: 7.0^%{snapshot_info}
+%else
+Name: prismlauncher-qt5-nightly
+%endif
+Version: 7.1^%{snapshot_info}
Release: 1%{?dist}
Summary: Minecraft launcher with ability to manage multiple instances
-License: GPL-3.0-only
+License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
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
BuildRequires: extra-cmake-modules
BuildRequires: gcc-c++
-BuildRequires: java-devel >= 17
+BuildRequires: java-17-openjdk-devel
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: cmake(ghc_filesystem)
@@ -71,8 +74,6 @@ BuildRequires: cmake(Qt6Core5Compat)
%endif
BuildRequires: pkgconfig(libcmark)
-# https://bugzilla.redhat.com/show_bug.cgi?id=2166815
-BuildRequires: cmark
BuildRequires: pkgconfig(scdoc)
BuildRequires: pkgconfig(zlib)
@@ -82,7 +83,7 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
-Requires: java >= 17
+Requires: java-17-openjdk
Requires: java-1.8.0-openjdk
# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
@@ -92,8 +93,13 @@ Recommends: flite
# Prism supports enabling gamemode
Suggests: gamemode
-Conflicts: prismlauncher
-Conflicts: prismlauncher-qt5
+Recommends: terra-fractureiser-detector
+
+Conflicts: %{real_name}
+Conflicts: %{real_name}-qt5
+%if %{without qt6}
+Conflicts: %{real_name}-nightly
+%endif
%description
@@ -108,7 +114,7 @@ tar -xzf %{SOURCE1} -C libraries
tar -xvf %{SOURCE2} -C libraries
tar -xvf %{SOURCE3} -C libraries
-rmdir libraries/{libnbtplusplus,quazip,tomlplusplus}/
+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
@@ -137,43 +143,17 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
%check
-## disabled due to inconsistent results in copr builds that are not reproducible locally
-%dnl %ctest
-
-%if 0%{?fedora} > 35
-appstream-util validate-relax --nonet \
- %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
-%endif
+%ctest
+appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
-%post
-/usr/bin/update-desktop-database &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
-
-
-%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-
%files
%doc README.md
%license LICENSE COPYING.md
%dir %{_datadir}/%{real_name}
-%{_bindir}/prismlauncher
+%{_bindir}/%{real_name}
%{_datadir}/%{real_name}/NewLaunch.jar
%{_datadir}/%{real_name}/JavaCheck.jar
%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
@@ -186,13 +166,16 @@ fi
%changelog
+* Wed Jun 07 2023 seth - 7.0^20230603.954d4d7-1
+- specify jdk 17 + cleanup outdated patches/scriptlets
+
* Sun May 14 2023 seth - 7.0^20230513.c5aff7c-1
- add qtlogging.ini to files list
* Mon Mar 20 2023 seth - 7.0^20230319.6dcf34a-1
- recommend flite to support narrator in minecraft
-* Fri Feb 03 2023 seth flynn - 7.0^20230203.58d9ced-1
+* Fri Feb 03 2023 seth - 7.0^20230203.58d9ced-1
- disable tests and explicitly require cmark
* Sun Jan 15 2023 seth - 7.0^20230115.f1247d2-1
diff --git a/anda/games/prismlauncher-nightly/update.rhai b/anda/games/prismlauncher-nightly/update.rhai
index 6a735fe79b..851afe7e30 100644
--- a/anda/games/prismlauncher-nightly/update.rhai
+++ b/anda/games/prismlauncher-nightly/update.rhai
@@ -4,4 +4,5 @@ if filters.contains("nightly") {
let sha = req.get().json().sha;
rpm.global("commit", sha);
rpm.release();
+ rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`);
}
diff --git a/anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch b/anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch
deleted file mode 100644
index d41ef66bec..0000000000
--- a/anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001
-From: seth
-Date: Sun, 15 Jan 2023 14:47:49 -0500
-Subject: [PATCH] find cmark with pkgconfig
-
-Signed-off-by: seth
----
- cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 59 insertions(+)
- create mode 100755 cmake/Findcmark.cmake
-
-diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake
-new file mode 100755
-index 00000000..9858e5df
---- /dev/null
-+++ b/cmake/Findcmark.cmake
-@@ -0,0 +1,59 @@
-+# SPDX-FileCopyrightText: 2019 Black Hat
-+# SPDX-License-Identifier: GPL-3.0-only
-+
-+#
-+# CMake module to search for the cmark library
-+#
-+
-+# first try to find cmark-config.cmake
-+# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
-+find_package(cmark CONFIG QUIET)
-+if(cmark_FOUND AND TARGET cmark::cmark)
-+ # found it!
-+ return()
-+endif()
-+
-+find_package(PkgConfig QUIET)
-+if(PKG_CONFIG_FOUND)
-+ pkg_check_modules(PC_CMARK QUIET cmark)
-+endif()
-+
-+if(NOT CMARK_INCLUDE_DIR)
-+ find_path(CMARK_INCLUDE_DIR
-+ NAMES cmark.h
-+ PATHS
-+ ${PC_CMARK_INCLUDEDIR}
-+ ${PC_CMARK_INCLUDE_DIRS}
-+ /usr/include
-+ /usr/local/include)
-+endif()
-+
-+if(NOT CMARK_LIBRARY)
-+ find_library(CMARK_LIBRARY
-+ NAMES cmark
-+ HINTS
-+ ${PC_CMARK_LIBDIR}
-+ ${PC_CMARK_LIBRARY_DIRS}
-+ /usr/lib
-+ /usr/local/lib)
-+endif()
-+
-+if(NOT TARGET cmark::cmark)
-+ add_library(cmark::cmark UNKNOWN IMPORTED)
-+ set_target_properties(cmark::cmark
-+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-+ ${CMARK_INCLUDE_DIR})
-+ set_property(TARGET cmark::cmark APPEND
-+ PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY})
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(cmark
-+ DEFAULT_MSG
-+ CMARK_INCLUDE_DIR
-+ CMARK_LIBRARY)
-+
-+mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR)
-+
-+set(CMARK_LIBRARIES ${CMARK_LIBRARY})
-+set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR})
---
-2.39.0
-
diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec
index 6201d4756f..3fd2723b54 100644
--- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec
+++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec
@@ -1,6 +1,6 @@
%global real_name prismlauncher
-%global commit 42ceaa0015217d67245b40adf71120fcd8a739f2
+%global commit 12cd8a7bea991c2a8d4b59b1cfc9f7c246819fc9
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
@@ -38,23 +38,26 @@
%global build_platform CentOS
%endif
+%if %{with qt6}
+Name: prismlauncher-nightly
+%else
Name: prismlauncher-qt5-nightly
-Version: 7.0^%{snapshot_info}
+%endif
+Version: 7.1^%{snapshot_info}
Release: 1%{?dist}
Summary: Minecraft launcher with ability to manage multiple instances
-License: GPL-3.0-only
+License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
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
BuildRequires: extra-cmake-modules
BuildRequires: gcc-c++
-BuildRequires: java-devel >= 17
+BuildRequires: java-17-openjdk-devel
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: cmake(ghc_filesystem)
@@ -71,8 +74,6 @@ BuildRequires: cmake(Qt6Core5Compat)
%endif
BuildRequires: pkgconfig(libcmark)
-# https://bugzilla.redhat.com/show_bug.cgi?id=2166815
-BuildRequires: cmark
BuildRequires: pkgconfig(scdoc)
BuildRequires: pkgconfig(zlib)
@@ -82,19 +83,23 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
-Requires: java >= 17
+Requires: java-17-openjdk
Requires: java-1.8.0-openjdk
# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr
# libflite needed for using narrator in minecraft
Recommends: flite
+
+Recommends: terra-fractureiser-detector
# Prism supports enabling gamemode
Suggests: gamemode
-Conflicts: prismlauncher
-Conflicts: prismlauncher-qt5
-Conflicts: primslauncher-nightly
+Conflicts: %{real_name}
+Conflicts: %{real_name}-qt5
+%if %{without qt6}
+Conflicts: %{real_name}-nightly
+%endif
%description
@@ -109,7 +114,7 @@ tar -xzf %{SOURCE1} -C libraries
tar -xvf %{SOURCE2} -C libraries
tar -xvf %{SOURCE3} -C libraries
-rmdir libraries/{libnbtplusplus,quazip,tomlplusplus}/
+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
@@ -138,43 +143,17 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
%check
-## disabled due to inconsistent results in copr builds that are not reproducible locally
-%dnl %ctest
-
-%if 0%{?fedora} > 35
-appstream-util validate-relax --nonet \
- %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
-%endif
+%ctest
+appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
-%post
-/usr/bin/update-desktop-database &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
-
-
-%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-
%files
%doc README.md
%license LICENSE COPYING.md
%dir %{_datadir}/%{real_name}
-%{_bindir}/prismlauncher
+%{_bindir}/%{real_name}
%{_datadir}/%{real_name}/NewLaunch.jar
%{_datadir}/%{real_name}/JavaCheck.jar
%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
@@ -187,13 +166,16 @@ fi
%changelog
+* Wed Jun 07 2023 seth - 7.0^20230603.954d4d7-1
+- specify jdk 17 + cleanup outdated patches/scriptlets
+
* Sun May 14 2023 seth - 7.0^20230513.c5aff7c-1
- add qtlogging.ini to files list
* Mon Mar 20 2023 seth - 7.0^20230319.6dcf34a-1
- recommend flite to support narrator in minecraft
-* Fri Feb 03 2023 seth flynn - 7.0^20230203.58d9ced-1
+* Fri Feb 03 2023 seth - 7.0^20230203.58d9ced-1
- disable tests and explicitly require cmark
* Sun Jan 15 2023 seth - 7.0^20230115.f1247d2-1
diff --git a/anda/games/prismlauncher-qt5-nightly/update.rhai b/anda/games/prismlauncher-qt5-nightly/update.rhai
index 6a735fe79b..851afe7e30 100644
--- a/anda/games/prismlauncher-qt5-nightly/update.rhai
+++ b/anda/games/prismlauncher-qt5-nightly/update.rhai
@@ -4,4 +4,5 @@ if filters.contains("nightly") {
let sha = req.get().json().sha;
rpm.global("commit", sha);
rpm.release();
+ rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`);
}
diff --git a/anda/games/prismlauncher-qt5/0001-find-cmark-with-pkgconfig.patch b/anda/games/prismlauncher-qt5/0001-find-cmark-with-pkgconfig.patch
deleted file mode 100644
index d41ef66bec..0000000000
--- a/anda/games/prismlauncher-qt5/0001-find-cmark-with-pkgconfig.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001
-From: seth
-Date: Sun, 15 Jan 2023 14:47:49 -0500
-Subject: [PATCH] find cmark with pkgconfig
-
-Signed-off-by: seth
----
- cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 59 insertions(+)
- create mode 100755 cmake/Findcmark.cmake
-
-diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake
-new file mode 100755
-index 00000000..9858e5df
---- /dev/null
-+++ b/cmake/Findcmark.cmake
-@@ -0,0 +1,59 @@
-+# SPDX-FileCopyrightText: 2019 Black Hat
-+# SPDX-License-Identifier: GPL-3.0-only
-+
-+#
-+# CMake module to search for the cmark library
-+#
-+
-+# first try to find cmark-config.cmake
-+# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
-+find_package(cmark CONFIG QUIET)
-+if(cmark_FOUND AND TARGET cmark::cmark)
-+ # found it!
-+ return()
-+endif()
-+
-+find_package(PkgConfig QUIET)
-+if(PKG_CONFIG_FOUND)
-+ pkg_check_modules(PC_CMARK QUIET cmark)
-+endif()
-+
-+if(NOT CMARK_INCLUDE_DIR)
-+ find_path(CMARK_INCLUDE_DIR
-+ NAMES cmark.h
-+ PATHS
-+ ${PC_CMARK_INCLUDEDIR}
-+ ${PC_CMARK_INCLUDE_DIRS}
-+ /usr/include
-+ /usr/local/include)
-+endif()
-+
-+if(NOT CMARK_LIBRARY)
-+ find_library(CMARK_LIBRARY
-+ NAMES cmark
-+ HINTS
-+ ${PC_CMARK_LIBDIR}
-+ ${PC_CMARK_LIBRARY_DIRS}
-+ /usr/lib
-+ /usr/local/lib)
-+endif()
-+
-+if(NOT TARGET cmark::cmark)
-+ add_library(cmark::cmark UNKNOWN IMPORTED)
-+ set_target_properties(cmark::cmark
-+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-+ ${CMARK_INCLUDE_DIR})
-+ set_property(TARGET cmark::cmark APPEND
-+ PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY})
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(cmark
-+ DEFAULT_MSG
-+ CMARK_INCLUDE_DIR
-+ CMARK_LIBRARY)
-+
-+mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR)
-+
-+set(CMARK_LIBRARIES ${CMARK_LIBRARY})
-+set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR})
---
-2.39.0
-
diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec
index 21158e0409..f8c0e7a1e1 100644
--- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec
+++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec
@@ -1,4 +1,4 @@
-%define real_name prismlauncher
+%global real_name prismlauncher
%bcond_with qt6
# Change this variables if you want to use custom keys
@@ -28,20 +28,25 @@
%global build_platform CentOS
%endif
+%if %{with qt6}
+Name: prismlauncher
+%else
Name: prismlauncher-qt5
-Version: 6.3
-Release: 2%{?dist}
+%endif
+Version: 7.1
+Release: 1%{?dist}
Summary: Minecraft launcher with ability to manage multiple instances
-License: GPL-3.0-only
+# see COPYING.md for more information
+# each file in the source also contains a SPDX-License-Identifier header that declares its license
+License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
Group: Amusements/Games
URL: https://prismlauncher.org/
Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz
-Patch0: 0001-find-cmark-with-pkgconfig.patch
BuildRequires: cmake >= 3.15
BuildRequires: extra-cmake-modules
BuildRequires: gcc-c++
-BuildRequires: java-devel >= 17
+BuildRequires: java-17-openjdk-devel
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: cmake(ghc_filesystem)
@@ -58,8 +63,6 @@ BuildRequires: cmake(Qt6Core5Compat)
%endif
BuildRequires: pkgconfig(libcmark)
-# https://bugzilla.redhat.com/show_bug.cgi?id=2166815
-BuildRequires: cmark
BuildRequires: pkgconfig(scdoc)
BuildRequires: pkgconfig(zlib)
@@ -69,18 +72,21 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
-Requires: java >= 17
+Requires: java-17-openjdk
Requires: java-1.8.0-openjdk
# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr
# libflite needed for using narrator in minecraft
Recommends: flite
+
+Recommends: terra-fractureiser-detector
# Prism supports enabling gamemode
Suggests: gamemode
-Conflicts: prismlauncher
-
+%if %{without qt6}
+Conflicts: %{real_name}
+%endif
%description
A custom launcher for Minecraft that allows you to easily manage
@@ -88,7 +94,9 @@ multiple installations of Minecraft at once (Fork of MultiMC)
%prep
-%autosetup -p1 -n PrismLauncher-%{version}
+%autosetup -n PrismLauncher-%{version}
+
+rm -rf libraries/{extra-cmake-modules,filesystem,zlib}
# Do not set RPATH
sed -i "s|\$ORIGIN/||" CMakeLists.txt
@@ -114,37 +122,12 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
%check
-## disabled due to inconsistent results in copr builds that are not reproducible locally
-%dnl %ctest
-
-%if 0%{?fedora} > 35
-appstream-util validate-relax --nonet \
- %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
-%endif
+%ctest
+appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
-%post
-/usr/bin/update-desktop-database &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
-
-
-%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-
%files
%doc README.md
%license LICENSE COPYING.md
@@ -156,11 +139,15 @@ fi
%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
%{_datadir}/mime/packages/modrinth-mrpack-mime.xml
%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories
+%{_datadir}/PrismLauncher/qtlogging.ini
%{_mandir}/man?/prismlauncher.*
%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
%changelog
+* Thu Jun 08 2023 seth - 6.3-3
+- specify jdk 17 + cleanup outdated patches/scriptlets
+
* Mon Mar 20 2023 seth - 6.3-2
- recommend flite to support narrator in minecraft
diff --git a/anda/games/prismlauncher/0001-find-cmark-with-pkgconfig.patch b/anda/games/prismlauncher/0001-find-cmark-with-pkgconfig.patch
deleted file mode 100644
index d41ef66bec..0000000000
--- a/anda/games/prismlauncher/0001-find-cmark-with-pkgconfig.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001
-From: seth
-Date: Sun, 15 Jan 2023 14:47:49 -0500
-Subject: [PATCH] find cmark with pkgconfig
-
-Signed-off-by: seth
----
- cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 59 insertions(+)
- create mode 100755 cmake/Findcmark.cmake
-
-diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake
-new file mode 100755
-index 00000000..9858e5df
---- /dev/null
-+++ b/cmake/Findcmark.cmake
-@@ -0,0 +1,59 @@
-+# SPDX-FileCopyrightText: 2019 Black Hat
-+# SPDX-License-Identifier: GPL-3.0-only
-+
-+#
-+# CMake module to search for the cmark library
-+#
-+
-+# first try to find cmark-config.cmake
-+# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
-+find_package(cmark CONFIG QUIET)
-+if(cmark_FOUND AND TARGET cmark::cmark)
-+ # found it!
-+ return()
-+endif()
-+
-+find_package(PkgConfig QUIET)
-+if(PKG_CONFIG_FOUND)
-+ pkg_check_modules(PC_CMARK QUIET cmark)
-+endif()
-+
-+if(NOT CMARK_INCLUDE_DIR)
-+ find_path(CMARK_INCLUDE_DIR
-+ NAMES cmark.h
-+ PATHS
-+ ${PC_CMARK_INCLUDEDIR}
-+ ${PC_CMARK_INCLUDE_DIRS}
-+ /usr/include
-+ /usr/local/include)
-+endif()
-+
-+if(NOT CMARK_LIBRARY)
-+ find_library(CMARK_LIBRARY
-+ NAMES cmark
-+ HINTS
-+ ${PC_CMARK_LIBDIR}
-+ ${PC_CMARK_LIBRARY_DIRS}
-+ /usr/lib
-+ /usr/local/lib)
-+endif()
-+
-+if(NOT TARGET cmark::cmark)
-+ add_library(cmark::cmark UNKNOWN IMPORTED)
-+ set_target_properties(cmark::cmark
-+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-+ ${CMARK_INCLUDE_DIR})
-+ set_property(TARGET cmark::cmark APPEND
-+ PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY})
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(cmark
-+ DEFAULT_MSG
-+ CMARK_INCLUDE_DIR
-+ CMARK_LIBRARY)
-+
-+mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR)
-+
-+set(CMARK_LIBRARIES ${CMARK_LIBRARY})
-+set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR})
---
-2.39.0
-
diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec
index 7fb6a02b25..1bcc4af23a 100644
--- a/anda/games/prismlauncher/prismlauncher.spec
+++ b/anda/games/prismlauncher/prismlauncher.spec
@@ -1,3 +1,4 @@
+%global real_name prismlauncher
%bcond_without qt6
# Change this variables if you want to use custom keys
@@ -27,20 +28,25 @@
%global build_platform CentOS
%endif
+%if %{with qt6}
Name: prismlauncher
-Version: 6.3
-Release: 2%{?dist}
+%else
+Name: prismlauncher-qt5
+%endif
+Version: 7.1
+Release: 1%{?dist}
Summary: Minecraft launcher with ability to manage multiple instances
-License: GPL-3.0-only
+# see COPYING.md for more information
+# each file in the source also contains a SPDX-License-Identifier header that declares its license
+License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
Group: Amusements/Games
URL: https://prismlauncher.org/
-Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{name}-%{version}.tar.gz
-Patch0: 0001-find-cmark-with-pkgconfig.patch
+Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz
BuildRequires: cmake >= 3.15
BuildRequires: extra-cmake-modules
BuildRequires: gcc-c++
-BuildRequires: java-devel >= 17
+BuildRequires: java-17-openjdk-devel
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: cmake(ghc_filesystem)
@@ -57,8 +63,6 @@ BuildRequires: cmake(Qt6Core5Compat)
%endif
BuildRequires: pkgconfig(libcmark)
-# https://bugzilla.redhat.com/show_bug.cgi?id=2166815
-BuildRequires: cmark
BuildRequires: pkgconfig(scdoc)
BuildRequires: pkgconfig(zlib)
@@ -68,16 +72,21 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
-Requires: java >= 17
+Requires: java-17-openjdk
Requires: java-1.8.0-openjdk
# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr
# libflite needed for using narrator in minecraft
Recommends: flite
+
+Recommends: terra-fractureiser-detector
# Prism supports enabling gamemode
Suggests: gamemode
+%if %{without qt6}
+Conflicts: %{real_name}
+%endif
%description
A custom launcher for Minecraft that allows you to easily manage
@@ -85,7 +94,9 @@ multiple installations of Minecraft at once (Fork of MultiMC)
%prep
-%autosetup -p1 -n PrismLauncher-%{version}
+%autosetup -n PrismLauncher-%{version}
+
+rm -rf libraries/{extra-cmake-modules,filesystem,zlib}
# Do not set RPATH
sed -i "s|\$ORIGIN/||" CMakeLists.txt
@@ -111,53 +122,32 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
%check
-## disabled due to inconsistent results in copr builds that are not reproducible locally
-%dnl %ctest
-
-%if 0%{?fedora} > 35
-appstream-util validate-relax --nonet \
- %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
-%endif
+%ctest
+appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
-%post
-/usr/bin/update-desktop-database &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
-
-
-%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-
%files
%doc README.md
%license LICENSE COPYING.md
-%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{real_name}
%{_bindir}/prismlauncher
-%{_datadir}/%{name}/NewLaunch.jar
-%{_datadir}/%{name}/JavaCheck.jar
+%{_datadir}/%{real_name}/NewLaunch.jar
+%{_datadir}/%{real_name}/JavaCheck.jar
%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
%{_datadir}/mime/packages/modrinth-mrpack-mime.xml
%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories
+%{_datadir}/PrismLauncher/qtlogging.ini
%{_mandir}/man?/prismlauncher.*
%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
%changelog
+* Thu Jun 08 2023 seth - 6.3-3
+- specify jdk 17 + cleanup outdated patches/scriptlets
+
* Mon Mar 20 2023 seth - 6.3-2
- recommend flite to support narrator in minecraft
diff --git a/anda/go/curlie/golang-github-rs-curlie.spec b/anda/go/curlie/golang-github-rs-curlie.spec
index 809ce9947d..80036a1799 100644
--- a/anda/go/curlie/golang-github-rs-curlie.spec
+++ b/anda/go/curlie/golang-github-rs-curlie.spec
@@ -47,6 +47,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%endif
%files
+%doc README.md
%license LICENSE
%doc README.md
%{_bindir}/curlie
diff --git a/anda/go/gendesk/golang-github-xyproto-gendesk.spec b/anda/go/gendesk/golang-github-xyproto-gendesk.spec
index a5b5d27ea4..e39b45b0fb 100644
--- a/anda/go/gendesk/golang-github-xyproto-gendesk.spec
+++ b/anda/go/gendesk/golang-github-xyproto-gendesk.spec
@@ -1,14 +1,17 @@
-# Generated by go2rpm 1.8.2
-%bcond_without check
+# Generated by go2rpm 1.9.0
+# The check requires go(xyproto/env) which conflicts with go(xyproto/env/v2)
+#bcond_without check
+%define debug_package %nil
# https://github.com/xyproto/gendesk
%global goipath github.com/xyproto/gendesk
Version: 1.0.9
%global tag 1.0.9
-%global commit 7ac050a54c2f771ce41da2a38f633cefc3353383
+%global commit f074161864697100fdc21a99e09b567e82aeb1b9
%gometa -f
+
%global common_description %{expand:
:herb: Generate .desktop files and download .png icons by specifying a minimum
of information.}
@@ -16,13 +19,14 @@ of information.}
%global golicenses LICENSE
%global godocs README.md
-Name: gendesk
-Release: %autorelease
-Summary: :herb: Generate .desktop files and download .png icons by specifying a minimum of information
+Name: %{goname}
+Release: 2%{?dist}
+Summary: Generate .desktop files and download .png icons
License: BSD-3-Clause
-URL: https://gendesk.roboticoverlords.org
+URL: %{gourl}
Source: %{gosource}
+BuildRequires: git-core gcc
%description %{common_description}
@@ -30,12 +34,12 @@ Source: %{gosource}
%prep
%goprep
-
-%generate_buildrequires
-%go_generate_buildrequires
+%autopatch -p1
+go mod download
%build
-%gobuild -o %{gobuilddir}/bin/gendesk %{goipath}
+go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w -extldflags '--static-pie'" -buildmode=pie -tags 'osusergo,netgo,static_build' -v -x -o %{gobuilddir}/bin/gendesk .
+go tool buildid -w %{gobuilddir}/bin/gendesk
%install
%gopkginstall
diff --git a/anda/go/yhat-scrape/update.rhai b/anda/go/yhat-scrape/update.rhai
deleted file mode 100644
index 7043e72b33..0000000000
--- a/anda/go/yhat-scrape/update.rhai
+++ /dev/null
@@ -1 +0,0 @@
-rpm.version(gh("yhat/scrape"));
diff --git a/anda/groovy/anda.hcl b/anda/groovy/anda.hcl
index 6a66e0bee1..122c070ec5 100644
--- a/anda/groovy/anda.hcl
+++ b/anda/groovy/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "groovy.spec"
}
diff --git a/anda/groovy/groovy-docs/anda.hcl b/anda/groovy/groovy-docs/anda.hcl
index af5c87bfed..381b5bf6c0 100644
--- a/anda/groovy/groovy-docs/anda.hcl
+++ b/anda/groovy/groovy-docs/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "groovy-docs.spec"
}
diff --git a/anda/groovy/groovy.spec b/anda/groovy/groovy.spec
index b7dc8f38e0..6cc25cc300 100644
--- a/anda/groovy/groovy.spec
+++ b/anda/groovy/groovy.spec
@@ -1,6 +1,6 @@
Name: groovy
Version: 4.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A multi-faceted language for the Java platform
BuildArch: noarch
URL: https://groovy-lang.org/
@@ -30,11 +30,11 @@ cd %{name}-%{version}
install -d %{buildroot}/usr/share/groovy %{buildroot}/usr/bin
cp -r lib conf %{buildroot}/usr/share/groovy
cp bin/* %{buildroot}/usr/bin
-rm %{buildroot}/usr/bin/*completion
-install -Dm644 bin/*completion -t %{buildroot}/usr/share/bash-completion/completions
+rm %{buildroot}/usr/bin/*completion %{buildroot}%_bindir/groovy.ico
+install -Dm755 bin/*completion -t %{buildroot}/usr/share/bash-completion/completions
# Remove all DOS/Windows batch files
-find %{buildroot} -name '*.bat' -exec rm {} \;
+find %buildroot%_bindir -name '*.bat' -exec rm {} \;
# Package the license file
install -Dm644 LICENSE -t %{buildroot}/usr/share/licenses/%{name}
@@ -46,7 +46,6 @@ install -Dm644 %{name}.desktop -t %{buildroot}/usr/share/applications
%license LICENSE
/usr/bin/grape
/usr/bin/groovy
-/usr/bin/groovy.ico
/usr/bin/groovyConsole
/usr/bin/groovyc
/usr/bin/groovydoc
@@ -64,5 +63,5 @@ install -Dm644 %{name}.desktop -t %{buildroot}/usr/share/applications
%changelog
-* Wed Feb 8 2023 windowsboy111
+* Wed Feb 8 2023 windowsboy111 - 4.0.12-1
- Initial package
diff --git a/anda/indicators/ayatana-indicator-notifications/ayatana-indicator-notifications.spec b/anda/indicators/ayatana-indicator-notifications/ayatana-indicator-notifications.spec
index 35a15be116..f4dd768dda 100644
--- a/anda/indicators/ayatana-indicator-notifications/ayatana-indicator-notifications.spec
+++ b/anda/indicators/ayatana-indicator-notifications/ayatana-indicator-notifications.spec
@@ -2,7 +2,7 @@ Name: ayatana-indicator-notifications
Summary: Ayatana Indicator Notifications Applet
Version: 22.9.0
Release: %autorelease
-License: GPLv3
+License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-notifications
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -21,8 +21,9 @@ BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: intltool
%description
-The Ayatana Indicators project is the continuation of Application Indicators and System Indicators,
-two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop.
+The Ayatana Indicators project is the continuation of Application Indicators
+and System Indicators, two technologies developed by Canonical Ltd. for the
+Unity7 desktop and Lomiri desktop.
%package devel
Summary: Development files for %{name}
@@ -35,8 +36,7 @@ This package contains the development header files for %{name}.
%autosetup -n %{name}-%{version}
%build
-%cmake -DENABLE_TESTS=ON \
- -DENABLE_COVERAGE=OFF
+%cmake -DENABLE_TESTS=ON -DENABLE_COVERAGE=OFF
%cmake_build
%install
@@ -44,8 +44,9 @@ This package contains the development header files for %{name}.
%find_lang %{name}
%files -f %{name}.lang
+%doc README.md
%license COPYING
-%{_sysconfdir}/xdg/autostart/ayatana-indicator-notifications.desktop
+%config %{_sysconfdir}/xdg/autostart/ayatana-indicator-notifications.desktop
%{_userunitdir}/ayatana-indicator-notifications.service
%dir %{_libexecdir}/ayatana-indicator-notifications
%{_libexecdir}/ayatana-indicator-notifications/ayatana-indicator-notifications-service
diff --git a/anda/indicators/ayatana-indicator-notifications/update.rhai b/anda/indicators/ayatana-indicator-notifications/update.rhai
new file mode 100644
index 0000000000..ab635ab1b1
--- /dev/null
+++ b/anda/indicators/ayatana-indicator-notifications/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh_tag("AyatanaIndicators/ayatana-indicator-notifications"));
diff --git a/anda/indicators/ayatana-indicator-session/0001-fix-tests-import-cstdint.patch b/anda/indicators/ayatana-indicator-session/0001-fix-tests-import-cstdint.patch
new file mode 100644
index 0000000000..62e326898a
--- /dev/null
+++ b/anda/indicators/ayatana-indicator-session/0001-fix-tests-import-cstdint.patch
@@ -0,0 +1,24 @@
+From e4039bd482e3abba2a04e754fcb179ea95213232 Mon Sep 17 00:00:00 2001
+From: windowsboy111
+Date: Fri, 16 Jun 2023 18:02:22 +0800
+Subject: [PATCH] fix(tests): import cstdint
+
+---
+ tests/backend-dbus/mock-login1-seat.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/backend-dbus/mock-login1-seat.cc b/tests/backend-dbus/mock-login1-seat.cc
+index 49d7fb6..ad5d902 100644
+--- a/tests/backend-dbus/mock-login1-seat.cc
++++ b/tests/backend-dbus/mock-login1-seat.cc
+@@ -21,6 +21,7 @@
+
+ #include "mock-object.h"
+ #include "mock-user.h"
++#include
+
+ namespace
+ {
+--
+2.40.1
+
diff --git a/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec b/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec
index 8197832758..bd4e2bcfcd 100644
--- a/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec
+++ b/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec
@@ -1,10 +1,11 @@
Name: ayatana-indicator-session
Summary: Ayatana Indicator Session Applet
-Version: 22.9.1
-Release: %autorelease
-License: GPLv3
+Version: 22.9.2
+Release: 1%{?dist}
+License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-session
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
+Patch0: 0001-fix-tests-import-cstdint.patch
BuildRequires: cmake
BuildRequires: cmake-extras
@@ -16,11 +17,13 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(dbustest-1)
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(systemd)
BuildRequires: intltool
%description
-The Ayatana Indicators project is the continuation of Application Indicators and System Indicators,
-two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop.
+The Ayatana Indicators project is the continuation of Application Indicators
+and System Indicators, two technologies developed by Canonical Ltd. for the
+Unity7 desktop and Lomiri desktop.
%package devel
Summary: Development files for %{name}
@@ -30,7 +33,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package contains the development header files for %{name}.
%prep
-%autosetup -n %{name}-%{version}
+%autosetup -n %{name}-%{version} -p1
%build
%cmake -DENABLE_TESTS=ON \
@@ -42,8 +45,9 @@ This package contains the development header files for %{name}.
%find_lang %{name}
%files -f %{name}.lang
+%doc README.md
%license COPYING
-%{_sysconfdir}/xdg/autostart/ayatana-indicator-session.desktop
+%config %{_sysconfdir}/xdg/autostart/ayatana-indicator-session.desktop
%{_userunitdir}/ayatana-indicator-session.service
%dir %{_libexecdir}/ayatana-indicator-session
%{_libexecdir}/ayatana-indicator-session/ayatana-indicator-session-service
diff --git a/anda/indicators/ayatana-indicator-session/update.rhai b/anda/indicators/ayatana-indicator-session/update.rhai
new file mode 100644
index 0000000000..3674e0a669
--- /dev/null
+++ b/anda/indicators/ayatana-indicator-session/update.rhai
@@ -0,0 +1,3 @@
+let tags = get("https://api.github.com/repos/AyatanaIndicators/ayatana-indicator-session/git/refs/tags").json_arr();
+let split_ref = tags[tags.len-1].ref.split("/");
+rpm.version(split_ref[split_ref.len-1]);
diff --git a/anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec b/anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec
index 50963ed11a..1daa2bbcec 100644
--- a/anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec
+++ b/anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec
@@ -30,8 +30,9 @@ BuildRequires: intltool
Suggests: accountsservice
%description
-The Ayatana Indicators project is the continuation of Application Indicators and System Indicators,
-two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop.
+The Ayatana Indicators project is the continuation of Application Indicators
+and System Indicators, two technologies developed by Canonical Ltd. for the
+Unity7 desktop and Lomiri desktop.
%package devel
Summary: Development files for %{name}
@@ -54,8 +55,9 @@ This package contains the development header files for %{name}.
%find_lang %{name}
%files -f %{name}.lang
+%doc README.md
%license COPYING
-%{_sysconfdir}/xdg/autostart/ayatana-indicator-sound.desktop
+%config %{_sysconfdir}/xdg/autostart/ayatana-indicator-sound.desktop
%{_userunitdir}/ayatana-indicator-sound.service
%dir %{_libexecdir}/ayatana-indicator-sound
%{_libexecdir}/ayatana-indicator-sound/ayatana-indicator-sound-service
diff --git a/anda/indicators/ayatana-indicator-sound/update.rhai b/anda/indicators/ayatana-indicator-sound/update.rhai
new file mode 100644
index 0000000000..37d1c03c23
--- /dev/null
+++ b/anda/indicators/ayatana-indicator-sound/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh_tag("AyatanaIndicators/ayatana-indicator-sound"));
diff --git a/anda/kotlin/kotlin-native/kotlin-native.spec b/anda/kotlin/kotlin-native/kotlin-native.spec
index 90c281ce25..fe0437d0a9 100644
--- a/anda/kotlin/kotlin-native/kotlin-native.spec
+++ b/anda/kotlin/kotlin-native/kotlin-native.spec
@@ -2,7 +2,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Name: kotlin-native
-Version: 1.8.21
+Version: 1.8.22
Release: 1%{?dist}
Summary: LLVM backend for the Kotlin compiler
ExclusiveArch: x86_64
diff --git a/anda/kotlin/kotlin/anda.hcl b/anda/kotlin/kotlin/anda.hcl
index 99b81bf9c0..0835c53da0 100644
--- a/anda/kotlin/kotlin/anda.hcl
+++ b/anda/kotlin/kotlin/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "kotlin.spec"
}
diff --git a/anda/kotlin/kotlin/kotlin.spec b/anda/kotlin/kotlin/kotlin.spec
index b754baeb5b..30d6e191c1 100644
--- a/anda/kotlin/kotlin/kotlin.spec
+++ b/anda/kotlin/kotlin/kotlin.spec
@@ -1,19 +1,21 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Name: kotlin
-Version: 1.8.21
-Release: 1%{?dist}
+Version: 1.8.22
+Release: 2%{?dist}
Summary: Statically typed programming language
-License: ASL 2.0
+License: Apache-2.0
URL: https://kotlinlang.org/
Source0: https://github.com/JetBrains/kotlin/releases/download/v%{version}/kotlin-compiler-%{version}.zip
+Source1: https://raw.githubusercontent.com/JetBrains/kotlin/v%version/ReadMe.md
BuildRequires: unzip
BuildRequires: sed
BuildRequires: bash
BuildRequires: (java-headless >= 1:1.8.0 or java >= 1.8.0)
Requires: (java-headless >= 1:1.8.0 or java >= 1.8.0)
+BuildRequires: fdupes
%description
@@ -43,6 +45,10 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/lib/
install -m 0644 lib/* %{buildroot}%{_datadir}/%{name}/lib/
mkdir -p %{buildroot}%{_datadir}/licenses/%{name}/
cd license/ && find * -type f -exec install -Dm 0644 {} %{buildroot}%{_datadir}/licenses/%{name}/{} \;
+mkdir -p %buildroot%_docdir/%name
+install -Dm644 %SOURCE1 %buildroot%_docdir/%name/
+
+%fdupes %buildroot/%_datadir/licenses/%name/
%verifyscript
@@ -67,68 +73,69 @@ kotlinc-jvm test.kt -include-runtime -d test.jar
%dir %{_datadir}/licenses/%{name}/
%{_datadir}/licenses/%{name}/*
%license kotlinc/license/LICENSE.txt
+%doc ReadMe.md
%changelog
-* Mon Apr 03 2023 Gonçalo Silva
+* Mon Apr 03 2023 Gonçalo Silva - 1.8.20-1
- Update to 1.8.20
-* Thu Feb 02 2023 Gonçalo Silva
+* Thu Feb 02 2023 Gonçalo Silva - 1.8.10-1
- Update to 1.8.10
-* Wed Dec 28 2022 Gonçalo Silva
+* Wed Dec 28 2022 Gonçalo Silva - 1.8.0-1
- Update to 1.8.0
-* Wed Nov 09 2022 Gonçalo Silva
+* Wed Nov 09 2022 Gonçalo Silva - 1.7.21-1
- Update to 1.7.21
-* Thu Sep 29 2022 Gonçalo Silva
+* Thu Sep 29 2022 Gonçalo Silva - 1.7.20-1
- Update to 1.7.20
-* Fri Jul 08 2022 Gonçalo Silva
+* Fri Jul 08 2022 Gonçalo Silva - 1.7.10-1
- Update to 1.7.10
-* Mon Jun 13 2022 Gonçalo Silva
+* Mon Jun 13 2022 Gonçalo Silva - 1.7.0-1
- Update to 1.7.0
-* Mon Jun 13 2022 Gonçalo Silva
+* Mon Jun 13 2022 Gonçalo Silva - 1.6.21-1
- Update to 1.6.21
-* Thu Jun 09 2022 Gonçalo Silva
+* Thu Jun 09 2022 Gonçalo Silva - 1.7.0-1
- Update to 1.7.0
-* Wed Apr 20 2022 Gonçalo Silva
+* Wed Apr 20 2022 Gonçalo Silva - 1.6.21-1
- Update to 1.6.21
-* Mon Apr 04 2022 Gonçalo Silva
+* Mon Apr 04 2022 Gonçalo Silva - 1.6.20-1
- Update to 1.6.20
-* Tue Dec 14 2021 Gonçalo Silva
+* Tue Dec 14 2021 Gonçalo Silva - 1.6.10-1
- Update to 1.6.10
-* Fri Dec 10 2021 Gonçalo Silva
+* Fri Dec 10 2021 Gonçalo Silva - 1.6.0-1
- Update to 1.6.0
-* Mon Nov 29 2021 Gonçalo Silva
+* Mon Nov 29 2021 Gonçalo Silva - 1.5.32-1
- Update to 1.5.32
-* Tue Nov 16 2021 Gonçalo Silva
+* Tue Nov 16 2021 Gonçalo Silva - 1.6.0-1
- Update to 1.6.0
-* Mon Sep 20 2021 Gonçalo Silva
+* Mon Sep 20 2021 Gonçalo Silva - 1.5.31-1
- Update to 1.5.31
-* Tue Aug 24 2021 Gonçalo Silva
+* Tue Aug 24 2021 Gonçalo Silva - 1.5.30-1
- Update to 1.5.30
-* Tue Jul 13 2021 Gonçalo Silva
+* Tue Jul 13 2021 Gonçalo Silva - 1.5.21-1
- Update to 1.5.21
-* Thu Jun 24 2021 Gonçalo Silva
+* Thu Jun 24 2021 Gonçalo Silva - 1.5.20-1
- Update to 1.5.20
-* Mon May 24 2021 Gonçalo Silva
+* Mon May 24 2021 Gonçalo Silva - 1.5.10-1
- Update to 1.5.10
-* Wed May 05 2021 Gonçalo Silva
+* Wed May 05 2021 Gonçalo Silva - 1.5.0-1
- Update to 1.5.0
-* Tue Mar 30 2021 Gonçalo Silva
+* Tue Mar 30 2021 Gonçalo Silva - 1.4.32-1
- Update to 1.4.32
-* Fri Feb 26 2021 Gonçalo Silva
+* Fri Feb 26 2021 Gonçalo Silva - 1.4.31-1
- Update to 1.4.31
-* Wed Feb 03 2021 Gonçalo Silva
+* Wed Feb 03 2021 Gonçalo Silva - 1.4.30-1
- Update to 1.4.30
* Mon Jan 18 2021 Gonçalo Silva
- Update to 1.4.30-RC
-* Mon Dec 07 2020 Gonçalo Silva
+* Mon Dec 07 2020 Gonçalo Silva - 1.4.21-1
- Update to 1.4.21
-* Thu Nov 19 2020 Gonçalo Silva
+* Thu Nov 19 2020 Gonçalo Silva - 1.4.20-1
- Update to 1.4.20
-* Thu Sep 10 2020 Gonçalo Silva
+* Thu Sep 10 2020 Gonçalo Silva - 1.4.10-1
- Update to 1.4.10
-* Fri Aug 14 2020 Gonçalo Silva
+* Fri Aug 14 2020 Gonçalo Silva - 1.4.0-1
- Update to 1.4.0
-* Sat Apr 18 2020 Gonçalo Silva
+* Sat Apr 18 2020 Gonçalo Silva - 1.3.72-1
- Update to 1.3.72
-* Mon Apr 13 2020 Gonçalo Silva
+* Mon Apr 13 2020 Gonçalo Silva - 1.3.71-1
- Kotlin 1.3.71
diff --git a/anda/lib/apparmor/apparmor.spec b/anda/lib/apparmor/apparmor.spec
index b488e75b69..207d2ee9ff 100644
--- a/anda/lib/apparmor/apparmor.spec
+++ b/anda/lib/apparmor/apparmor.spec
@@ -3,8 +3,8 @@
%bcond_with tests
Name: apparmor
-Version: 3.1.3
-Release: %autorelease
+Version: 3.1.5
+Release: 1%{?dist}
Summary: AppArmor userspace components
%define baseversion %(echo %{version} | cut -d. -f-2)
@@ -218,10 +218,12 @@ make -C utils check
%{_mandir}/man3/aa_*.3.gz
%files -n python3-apparmor
+%doc README.md
%{python3_sitelib}/apparmor
%{python3_sitelib}/apparmor-*.egg-info
%files -n python3-LibAppArmor
+%doc README.md
%{python3_sitearch}/LibAppArmor
%{python3_sitearch}/LibAppArmor-*.egg-info
@@ -330,6 +332,7 @@ make -C utils check
%{_mandir}/man8/apparmor_status.8.gz
%files -n pam_apparmor
+%doc README.md
%{_libdir}/security/pam_apparmor.so
%files -n mod_apparmor
diff --git a/anda/lib/argagg/argagg.spec b/anda/lib/argagg/argagg.spec
index 26c5fa84e8..57f470e5c9 100644
--- a/anda/lib/argagg/argagg.spec
+++ b/anda/lib/argagg/argagg.spec
@@ -34,6 +34,7 @@ that use %{name}.
%package doc
Summary: Developer documentation for %{name}
+BuildRequires: rpm_macro(fdupes)
%description doc
The %{name}-doc package contains the documentation for developing applications
@@ -55,7 +56,8 @@ popd
%install
%cmake_install
-ls -la redhat-linux-build/share
+#ls -la redhat-linux-build/share
+%fdupes %_datadir/doc/%name/html/search
%files
@@ -66,19 +68,19 @@ ls -la redhat-linux-build/share
%doc %{_datadir}/doc/%{name}
%changelog
-* Fri May 26 2017 Viet The Nguyen
+* Fri May 26 2017 Viet The Nguyen - 0.4.6-1
- Updated version to 0.4.6
-* Fri Apr 28 2017 Viet The Nguyen
+* Fri Apr 28 2017 Viet The Nguyen - 0.4.5-1
- Updated version to 0.4.5
-* Tue Apr 25 2017 Viet The Nguyen
+* Tue Apr 25 2017 Viet The Nguyen - 0.4.4-1
- Updated version to 0.4.4
-* Tue Apr 25 2017 Viet The Nguyen
+* Tue Apr 25 2017 Viet The Nguyen - 0.4.3-1
- Updated version to 0.4.3
-* Tue Apr 25 2017 Viet The Nguyen
+* Tue Apr 25 2017 Viet The Nguyen - 0.4.2-1
- Updated version to 0.4.2
* Sun Mar 05 2017 Viet The Nguyen
@@ -91,13 +93,13 @@ ls -la redhat-linux-build/share
* Mon Feb 13 2017 Viet The Nguyen
- Fixed License field and doc subpackage description typo
-* Sat Feb 11 2017 Viet The Nguyen
+* Sat Feb 11 2017 Viet The Nguyen - 0.2.2-1
- Updated version to 0.2.2
-* Fri Feb 10 2017 Viet The Nguyen
+* Fri Feb 10 2017 Viet The Nguyen - 0.2.1-2
- Separated documentation into a separate package
-* Fri Feb 10 2017 Viet The Nguyen
+* Fri Feb 10 2017 Viet The Nguyen - 0.2.1-1
- Packaged version 0.2.1
* Mon Jan 30 2017 Viet The Nguyen
diff --git a/anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec b/anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec
index 2dc89ea588..a7527ea8e0 100644
--- a/anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec
+++ b/anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec
@@ -1,8 +1,8 @@
Name: ayatana-indicator-datetime
Summary: A GTK implementation of the StatusNotifierItem Specification
-Version: 22.9.1
+Version: 23.6.0
Release: %autorelease
-License: GPLv3
+License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-datetime
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -29,8 +29,9 @@ BuildRequires: pkgconfig(dbustest-1)
BuildRequires: pkgconfig(systemd)
%description
-The Ayatana Indicators project is the continuation of Application Indicators and System Indicators,
-two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop.
+The Ayatana Indicators project is the continuation of Application Indicators
+and System Indicators, two technologies developed by Canonical Ltd. for the
+Unity7 desktop and Lomiri desktop.
%prep
%autosetup -n %{name}-%{version}
@@ -46,8 +47,9 @@ two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri d
%find_lang %{name}
%files -f %{name}.lang
+%doc README.md
%license COPYING
-%{_sysconfdir}/xdg/autostart
+%config %{_sysconfdir}/xdg/autostart/ayatana-indicator-datetime.desktop
%{_userunitdir}/ayatana-indicator-datetime.service
%dir %{_libexecdir}/ayatana-indicator-datetime
%{_libexecdir}/ayatana-indicator-datetime/ayatana-indicator-datetime-service
diff --git a/anda/lib/ayatana-indicator-datetime/update.rhai b/anda/lib/ayatana-indicator-datetime/update.rhai
new file mode 100644
index 0000000000..c06cc9ea46
--- /dev/null
+++ b/anda/lib/ayatana-indicator-datetime/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh_tag("AyatanaIndicators/ayatana-indicator-datetime"));
diff --git a/anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec b/anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec
index 056e75f618..062136ccd3 100644
--- a/anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec
+++ b/anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec
@@ -21,8 +21,9 @@ BuildRequires: vala-devel
BuildRequires: intltool
%description
-The Ayatana Indicators project is the continuation of Application Indicators and System Indicators,
-two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop.
+The Ayatana Indicators project is the continuation of Application Indicators
+and System Indicators, two technologies developed by Canonical Ltd. for the
+Unity7 desktop and Lomiri desktop.
%package devel
Summary: Development files for %{name}
@@ -52,8 +53,9 @@ This package contains documentation files for %{name}.
%find_lang %{name}
%files -f %{name}.lang
+%doc README.md
%license COPYING
-%{_sysconfdir}/xdg/autostart/ayatana-indicator-messages.desktop
+%config %{_sysconfdir}/xdg/autostart/ayatana-indicator-messages.desktop
%{_userunitdir}/ayatana-indicator-messages.service
%{_libdir}/libmessaging-menu.so.*
%{_libdir}/girepository-1.0/MessagingMenu-1.0.typelib
diff --git a/anda/lib/cmake-extras/anda.hcl b/anda/lib/cmake-extras/anda.hcl
index 9e302b59d9..3049b5e7f6 100644
--- a/anda/lib/cmake-extras/anda.hcl
+++ b/anda/lib/cmake-extras/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "cmake-extras.spec"
}
diff --git a/anda/lib/cmake-extras/cmake-extras.spec b/anda/lib/cmake-extras/cmake-extras.spec
index 3f0bc756a6..262c8fdb19 100644
--- a/anda/lib/cmake-extras/cmake-extras.spec
+++ b/anda/lib/cmake-extras/cmake-extras.spec
@@ -21,7 +21,8 @@ Requires: lcov
Requires: qt5-qtdeclarative-devel
%description
-A collection of add-ons for the CMake build tool used to build lomiri and other applications.
+A collection of add-ons for the CMake build tool used to build lomiri and other
+applications.
%prep
%autosetup -n cmake-extras-%commit
diff --git a/anda/lib/dbus-test-runner/dbus-test-runner.spec b/anda/lib/dbus-test-runner/dbus-test-runner.spec
index 22e0dfa3e5..eecb489024 100644
--- a/anda/lib/dbus-test-runner/dbus-test-runner.spec
+++ b/anda/lib/dbus-test-runner/dbus-test-runner.spec
@@ -1,6 +1,6 @@
Name: dbus-test-runner
Version: 19.04.0
-Release: %autorelease
+Release: 2%?dist
Summary: A small utility to run executables under a new DBus session for testing
License: GPL-3.0
URL: https://launchpad.net/dbus-test-runner
@@ -19,10 +19,11 @@ BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(dbus-glib-1)
%description
-A small little utility to run a couple of executables under a new DBus session for testing.
+A small little utility to run a couple of executables under a new DBus session
+for testing.
%package devel
-Summary: dbus-test-runner development files
+Summary: Development files for dbus-test-runner
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@@ -52,6 +53,7 @@ install -dm755 %{buildroot}%{_mandir}/man1/
install -Dm644 %{SOURCE1} %{buildroot}%{_mandir}/man1/
%files
+%doc README
%license COPYING
%{_libdir}/libdbustest.so.*
%dir %{_libexecdir}/dbus-test-runner
@@ -63,6 +65,7 @@ install -Dm644 %{SOURCE1} %{buildroot}%{_mandir}/man1/
%{_datadir}/dbus-test-runner/dbus-test-bustle-handler
%files devel
+%doc README
%license COPYING
%dir %{_includedir}/libdbustest-1
%dir %{_includedir}/libdbustest-1/libdbustest
diff --git a/anda/lib/deviceinfo/deviceinfo.spec b/anda/lib/deviceinfo/deviceinfo.spec
index 517ef214ee..25191fc02c 100644
--- a/anda/lib/deviceinfo/deviceinfo.spec
+++ b/anda/lib/deviceinfo/deviceinfo.spec
@@ -1,9 +1,9 @@
%global forgeurl https://gitlab.com/ubports/development/core/deviceinfo
-%global commit fe939f071aafa47f631caec55a4e8420b3eb4a12
+%global commit 5dada778683ef8a1da13d0459768d8048429a646
%forgemeta
Name: deviceinfo
-Version: 0.1.1
+Version: 0.2.0
Release: %autorelease
Summary: Library to detect and configure devices
License: GPLv3+
@@ -41,11 +41,11 @@ install -Dm644 '%{SOURCE1}' %{buildroot}%{_mandir}/man1/device-info.1
%files
%license LICENSE
%dir %{_sysconfdir}/deviceinfo
-%{_sysconfdir}/deviceinfo/default.yaml
+%config %{_sysconfdir}/deviceinfo/default.yaml
%dir %{_sysconfdir}/deviceinfo/devices
-%{_sysconfdir}/deviceinfo/devices/*.yaml
+%config %{_sysconfdir}/deviceinfo/devices/*.yaml
%dir %{_sysconfdir}/deviceinfo/sensorfw
-%{_sysconfdir}/deviceinfo/sensorfw/*.conf
+%config %{_sysconfdir}/deviceinfo/sensorfw/*.conf
%{_bindir}/device-info
%{_mandir}/man1/device-info.1.gz
%{_libdir}/libdeviceinfo.so.*
@@ -53,6 +53,7 @@ install -Dm644 '%{SOURCE1}' %{buildroot}%{_mandir}/man1/device-info.1
%files devel
%dir %{_includedir}/deviceinfo
%{_includedir}/deviceinfo/deviceinfo.h
+/usr/include/deviceinfo/deviceinfo_c_api.h
%{_libdir}/libdeviceinfo.so
%{_libdir}/pkgconfig/deviceinfo.pc
diff --git a/anda/lib/frame/frame.spec b/anda/lib/frame/frame.spec
index 26dc59ba81..29d6e17c3a 100644
--- a/anda/lib/frame/frame.spec
+++ b/anda/lib/frame/frame.spec
@@ -1,6 +1,6 @@
Name: frame
Version: 2.5.0
-Release: %autorelease
+Release: 2%?dist
Summary: Touch Frame Library
License: GPL-3.0 AND LGPL-3.0
@@ -51,6 +51,7 @@ export PYTHON
rm -fv %{buildroot}%{_libdir}/*.la
%files
+%doc README
%license COPYING COPYING.GPL3
%{_libdir}/libframe.so.*
diff --git a/anda/lib/geonames/geonames.spec b/anda/lib/geonames/geonames.spec
index c2302e57a3..a05087a87e 100644
--- a/anda/lib/geonames/geonames.spec
+++ b/anda/lib/geonames/geonames.spec
@@ -4,7 +4,7 @@
Name: geonames
Version: 0.3.0
-Release: %autorelease
+Release: 2%?dist
Summary: Parse and query the geonames database
License: GPL-3.0
URL: https://gitlab.com/ubports/development/core/geonames
@@ -15,6 +15,7 @@ BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: gtk-doc
BuildRequires: gettext
+BuildRequires: fdupes
%description
A library for parsing and querying a local copy of the geonames.org database.
@@ -43,9 +44,11 @@ The %{name}-doc package contains documenation for %{name}.
%install
%cmake_install
+%fdupes %buildroot%_datadir/locale
%find_lang %{name}
%files -f %{name}.lang
+%doc doc/reference/geonames-docs.xml.in
%license COPYING COPYING.data
%{_libdir}/libgeonames.so.*
diff --git a/anda/lib/glewmx/glewmx.spec b/anda/lib/glewmx/glewmx.spec
index d3576cb1d0..54d1931e70 100644
--- a/anda/lib/glewmx/glewmx.spec
+++ b/anda/lib/glewmx/glewmx.spec
@@ -19,7 +19,8 @@ BuildRequires: libXmu-devel
BuildRequires: libXi-devel
%description
-OpenGL Extension Wrangler MX. The MX version is discountinued but is maintained in Ubuntu.
+OpenGL Extension Wrangler MX. The MX version is discountinued but is maintained
+in Ubuntu.
%package devel
Summary: Development files for %{name}
@@ -48,8 +49,10 @@ sed -i 's:includedir=${prefix}/include:includedir=${prefix}/include/glewmx-%{ver
%install
# Only MX is installed
%make_build DESTDIR=%{buildroot} INSTALL="/usr/bin/install -p" LIBDIR="%{_libdir}" install.mx
+chmod +x %buildroot%_libdir/libGLEWmx.so.*
%files
+%doc README.txt
%license LICENSE.txt
%{_libdir}/libGLEWmx.so.*
diff --git a/anda/lib/gmenuharness/gmenuharness.spec b/anda/lib/gmenuharness/gmenuharness.spec
index 377aac7458..555efbce71 100644
--- a/anda/lib/gmenuharness/gmenuharness.spec
+++ b/anda/lib/gmenuharness/gmenuharness.spec
@@ -42,6 +42,7 @@ developing applications that use %{name}.
%cmake_install
%files
+%doc README
%license COPYING
%{_libdir}/libgmenuharness.so.*
diff --git a/anda/lib/grail/grail.spec b/anda/lib/grail/grail.spec
index c6ac7845aa..8ee1dd6911 100644
--- a/anda/lib/grail/grail.spec
+++ b/anda/lib/grail/grail.spec
@@ -19,9 +19,13 @@ BuildRequires: xorg-x11-server-devel
BuildRequires: frame-devel
%description
-Grail consists of an interface and tools for handling gesture recognition and gesture instantiation.
+Grail consists of an interface and tools for handling gesture recognition and
+gesture instantiation.
-When a multitouch gesture is performed on a device, the recognizer emits one or several possible gestures. Once the context of the gesture is known, i.e., in what window the touches land and what gestures the clients of that window listen to, the instantiator delivers the matching set of gestures.
+When a multitouch gesture is performed on a device, the recognizer emits one or
+several possible gestures. Once the context of the gesture is known, i.e., in
+what window the touches land and what gestures the clients of that window
+listen to, the instantiator delivers the matching set of gestures.
%package devel
Summary: Development files for %{name}
@@ -52,6 +56,7 @@ export PYTHON
rm -fv %{buildroot}%{_libdir}/*.la
%files
+%doc README
%license COPYING COPYING.GPL3
%{_libdir}/libgrail.so.*
diff --git a/anda/lib/gsettings-qt-lomiri/anda.hcl b/anda/lib/gsettings-qt-lomiri/anda.hcl
new file mode 100644
index 0000000000..9fb5369697
--- /dev/null
+++ b/anda/lib/gsettings-qt-lomiri/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "gsettings-qt-lomiri.spec"
+ }
+}
diff --git a/anda/lib/gsettings-qt/gsettings-qt.spec b/anda/lib/gsettings-qt-lomiri/gsettings-qt-lomiri.spec
similarity index 92%
rename from anda/lib/gsettings-qt/gsettings-qt.spec
rename to anda/lib/gsettings-qt-lomiri/gsettings-qt-lomiri.spec
index 1efaf9a160..c52a86cd86 100644
--- a/anda/lib/gsettings-qt/gsettings-qt.spec
+++ b/anda/lib/gsettings-qt-lomiri/gsettings-qt-lomiri.spec
@@ -2,7 +2,7 @@
%global commit d5e002d7e0bce46c315bcc99a44a8bd51f49f488
%forgemeta
-Name: gsettings-qt
+Name: gsettings-qt-lomiri
Version: 0.2
Release: %autorelease
Summary: QML Bindings for GSettings
@@ -44,9 +44,7 @@ rm -rf %{buildroot}/usr/tests
%files
%license COPYING
-%{_libdir}/libgsettings-qt.so.1
-%{_libdir}/libgsettings-qt.so.1.0
-%{_libdir}/libgsettings-qt.so.1.0.0
+%{_libdir}/libgsettings-qt.so.*
%dir %{_libdir}/qt5/qml/GSettings.1.0
%{_libdir}/qt5/qml/GSettings.1.0/libGSettingsQmlPlugin.so
%{_libdir}/qt5/qml/GSettings.1.0/plugins.qmltypes
diff --git a/anda/lib/gsettings-qt/anda.hcl b/anda/lib/gsettings-qt/anda.hcl
deleted file mode 100644
index c7a3f226cd..0000000000
--- a/anda/lib/gsettings-qt/anda.hcl
+++ /dev/null
@@ -1,5 +0,0 @@
-project pkg {
- rpm {
- spec = "gsettings-qt.spec"
- }
-}
diff --git a/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec b/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec
index e201c92478..3ee938f926 100644
--- a/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec
+++ b/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec
@@ -7,6 +7,7 @@ URL: https://github.com/wmww/gtk4-layer-shell
Source0: %url/archive/refs/tags/v%version.tar.gz
BuildRequires: meson ninja-build python3.11 vala
BuildRequires: libwayland-client gtk4-devel gobject-introspection gtk-doc
+Recommends: gtk4-layer-shell-devel
%description
A library for using the Layer Shell Wayland protocol with GTK4. With this
@@ -18,19 +19,27 @@ files (Python, Vala, etc).
%package doc
-Summary: gtk4-layer-shell documentation generated by gtk-doc
+Summary: Documentation files for gtk4-layer-shell generated by gtk-doc
%description doc
%summary.
%package vapi
-Summary: gtk4-layer-shell vapi data
+Summary: Vapi data for gtk4-layer-shell
%description vapi
%summary.
+%package devel
+Summary: Development files for gtk4-layer-shell
+Requires: gtk4-layer-shell
+
+%description devel
+%summary.
+
+
%prep
%autosetup
@@ -45,8 +54,10 @@ Summary: gtk4-layer-shell vapi data
%files
%doc README.md
%license LICENSE
-/usr/include/gtk4-layer-shell/gtk4-layer-shell.h
/usr/lib64/girepository-1.0/Gtk4LayerShell-1.0.typelib
+
+%files devel
+/usr/include/gtk4-layer-shell/gtk4-layer-shell.h
/usr/lib64/libgtk4-layer-shell.so*
/usr/lib64/pkgconfig/gtk4-layer-shell-0.pc
/usr/share/gir-1.0/Gtk4LayerShell-1.0.gir
diff --git a/anda/lib/gtk4/0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch b/anda/lib/gtk4/0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
new file mode 100644
index 0000000000..b5b0a7e23d
--- /dev/null
+++ b/anda/lib/gtk4/0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
@@ -0,0 +1,119 @@
+From 5f5fd77f096174c45f8335afe6efd6745796d9a5 Mon Sep 17 00:00:00 2001
+From: Kalev Lember
+Date: Mon, 25 Jul 2022 16:21:50 +0200
+Subject: [PATCH] Revert "Meson: Simplify pkgconfig file generator"
+
+Temporarily revert this until we figure out how to best restore
+private requires that are needed for rpm automatic dep extraction.
+
+https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4756
+
+This reverts commit 802bf4199911c811938b0454a876089bafa97dba.
+---
+ meson.build | 47 +++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 33 insertions(+), 14 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 1b8f2d0248..4fc808dbd4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -471,6 +471,9 @@ if not os_win32
+ endif
+ endif
+
++
++pc_gdk_extra_libs = []
++
+ cairo_backends = []
+ foreach backend: [ ['cairo-xlib', cairo_req, x11_enabled],
+ ['cairo-win32', cairo_req, win32_enabled],
+@@ -601,14 +604,26 @@ if x11_enabled
+ cdata.set('HAVE_RANDR15', xrandr15_dep.found())
+ endif
+
++if broadway_enabled
++ pc_gdk_extra_libs += ['-lz']
++endif
++
++if macos_enabled
++ pc_gdk_extra_libs += ['-framework Cocoa', '-framework Carbon']
++endif
++
+ extra_demo_ldflags = []
+ if win32_enabled
++ pc_gdk_extra_libs += ['-lgdi32', '-limm32', '-lshell32', '-lole32']
+ if cc.get_id() == 'msvc'
+ # Since the demo programs are now built as pure GUI programs, we
+ # need to pass in /entry:mainCRTStartup so that they will properly
+ # link on Visual Studio builds
+ extra_demo_ldflags = ['/entry:mainCRTStartup']
++ else
++ pc_gdk_extra_libs += ['-Wl,-luuid']
+ endif
++ pc_gdk_extra_libs += ['-lwinmm', '-ldwmapi', '-lsetupapi', '-lcfgmgr32', '-lhid']
+
+ # Check whether libepoxy is built with EGL support on Windows
+ endif
+@@ -826,7 +841,16 @@ gsk_private_packages = [] # all already in gdk_private_packages
+ pangoft2_pkgs = (wayland_enabled or x11_enabled) ? ['pangoft2'] : []
+ gtk_private_packages = pangoft2_pkgs
+
+-pkgs = []
++gdk_extra_libs = pc_gdk_extra_libs
++gsk_extra_libs = []
++gtk_extra_libs = []
++
++gdk_extra_cflags = []
++gsk_extra_cflags = []
++gtk_extra_cflags = []
++
++pkgs = [ 'gtk4' ]
++
+ pkg_targets = []
+ display_backends = []
+ foreach backend: [ 'broadway', 'macos', 'wayland', 'win32', 'x11', ]
+@@ -843,23 +867,18 @@ common_pc_variables = [
+ 'gtk_host=@0@-@1@'.format(host_machine.cpu_family(), host_machine.system()), # FIXME
+ ]
+
+-pkg_config.generate(libgtk,
+- filebase: 'gtk4',
+- unescaped_variables: common_pc_variables,
+- name: 'GTK',
+- description: 'GTK Graphical UI Library',
+- requires: gdk_packages + gsk_packages + gtk_packages,
+- subdirs: ['gtk-@0@'.format(gtk_api_version)],
+-)
+-meson.override_dependency('gtk4', libgtk_dep)
+-
+ foreach pkg: pkgs
+ pkg_config.generate(
+ filebase: pkg,
+ unescaped_variables: common_pc_variables,
+ name: 'GTK',
+ description: 'GTK Graphical UI Library',
+- requires: 'gtk4',
++ requires: gdk_packages + gsk_packages + gtk_packages,
++ requires_private: gdk_private_packages + gsk_private_packages + gtk_private_packages,
++ libraries: ['-L${libdir}', '-lgtk-4'],
++ libraries_private: gdk_extra_libs + gsk_extra_libs + gtk_extra_libs,
++ subdirs: ['gtk-@0@'.format(gtk_api_version)],
++ extra_cflags: gdk_extra_cflags + gsk_extra_cflags + gtk_extra_cflags,
+ )
+ meson.override_dependency(pkg, libgtk_dep)
+ endforeach
+@@ -870,10 +889,10 @@ if os_unix
+ unescaped_variables: common_pc_variables,
+ name: 'GTK',
+ description: 'GTK Unix print support',
+- requires: 'gtk4',
++ requires: ['gtk4'] + gtk_packages,
++ libraries: [],
+ subdirs: ['gtk-@0@/unix-print'.format(gtk_api_version)],
+ )
+- meson.override_dependency('gtk4-unix-print', libgtk_dep)
+ endif
+
+ subdir('po')
+--
+2.37.1
diff --git a/anda/lib/gtk4/anda.hcl b/anda/lib/gtk4/anda.hcl
new file mode 100644
index 0000000000..50cd82899d
--- /dev/null
+++ b/anda/lib/gtk4/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "terra-gtk4.spec"
+ }
+}
diff --git a/anda/lib/gtk4/settings.ini b/anda/lib/gtk4/settings.ini
new file mode 100644
index 0000000000..462e32ccd6
--- /dev/null
+++ b/anda/lib/gtk4/settings.ini
@@ -0,0 +1,2 @@
+[Settings]
+gtk-hint-font-metrics=1
diff --git a/anda/lib/gtk4/terra-gtk4.spec b/anda/lib/gtk4/terra-gtk4.spec
new file mode 100644
index 0000000000..23223fba2a
--- /dev/null
+++ b/anda/lib/gtk4/terra-gtk4.spec
@@ -0,0 +1,248 @@
+# mado: ref https://src.fedoraproject.org/rpms/gtk4/c/016dd18e8025372e85ffd732ff58f46d9b3bf642?branch=rawhide
+%if 0%{?fedora}
+%global with_broadway 1
+%endif
+
+%global glib2_version 2.72.0
+%global pango_version 1.50.0
+%global cairo_version 1.14.0
+%global gdk_pixbuf_version 2.30.0
+%global wayland_protocols_version 1.31
+%global wayland_version 1.21.0
+%global epoxy_version 1.4
+
+%global bin_version 4.0.0
+
+# Filter provides for private modules
+%global __provides_exclude_from ^%{_libdir}/gtk-4.0
+
+Name: terra-gtk4
+Version: 4.10.4
+Release: 1%{?dist}
+Summary: GTK graphical user interface library
+
+License: LGPL-2.0-or-later
+URL: https://www.gtk.org
+Source0: https://gitlab.gnome.org/GNOME/gtk/-/archive/%version/gtk-%version.tar.gz
+Source1: settings.ini
+# Temporarily revert this until we figure out how to best restore
+# private requires that are needed for rpm automatic dep extraction.
+# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4756
+Patch0: 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
+
+BuildRequires: cups-devel
+BuildRequires: desktop-file-utils
+BuildRequires: docbook-style-xsl
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: gettext
+BuildRequires: gi-docgen
+BuildRequires: meson
+BuildRequires: python3-gobject
+BuildRequires: pkgconfig(avahi-gobject)
+BuildRequires: pkgconfig(cairo) >= %{cairo_version}
+BuildRequires: pkgconfig(cairo-gobject) >= %{cairo_version}
+BuildRequires: pkgconfig(colord)
+BuildRequires: pkgconfig(egl)
+BuildRequires: pkgconfig(epoxy)
+BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf_version}
+BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires: pkgconfig(graphene-gobject-1.0)
+BuildRequires: pkgconfig(gstreamer-player-1.0)
+BuildRequires: pkgconfig(json-glib-1.0)
+BuildRequires: pkgconfig(libjpeg)
+BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libtiff-4)
+BuildRequires: pkgconfig(pango) >= %{pango_version}
+BuildRequires: pkgconfig(sysprof-4)
+BuildRequires: pkgconfig(sysprof-capture-4)
+BuildRequires: pkgconfig(tracker-sparql-3.0)
+BuildRequires: pkgconfig(wayland-client) >= %{wayland_version}
+BuildRequires: pkgconfig(wayland-cursor) >= %{wayland_version}
+BuildRequires: pkgconfig(wayland-egl) >= %{wayland_version}
+BuildRequires: pkgconfig(wayland-protocols) >= %{wayland_protocols_version}
+BuildRequires: pkgconfig(xcomposite)
+BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(xdamage)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xi)
+BuildRequires: pkgconfig(xinerama)
+BuildRequires: pkgconfig(xkbcommon)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: /usr/bin/rst2man
+BuildRequires: sassc
+
+# standard icons
+Requires: adwaita-icon-theme
+# required for icon theme apis to work
+Requires: hicolor-icon-theme
+# split out in a subpackage
+Requires: gtk-update-icon-cache
+
+Requires: cairo%?_isa >= %{cairo_version}
+Requires: cairo-gobject%?_isa >= %{cairo_version}
+Requires: glib2%?_isa >= %{glib2_version}
+Requires: libepoxy%?_isa >= %{epoxy_version}
+Requires: libwayland-client%?_isa >= %{wayland_version}
+Requires: libwayland-cursor%?_isa >= %{wayland_version}
+Requires: pango%?_isa >= %{pango_version}
+
+# required to support all the different image formats
+Requires: gdk-pixbuf2-modules%?_isa
+
+# make sure we have a reasonable gsettings backend
+Recommends: dconf%?_isa
+
+Provides: gtk4%?_isa = %version-%release
+Provides: terra-gtk4%?_isa = %version-%release
+Conflicts: gtk4
+
+%description
+GTK is a multi-platform toolkit for creating graphical user
+interfaces. Offering a complete set of widgets, GTK is suitable for
+projects ranging from small one-off tools to complete application
+suites.
+
+This package contains latest version 4 of GTK as tracked in Terra.
+
+%package devel
+Summary: Development files for GTK
+Requires: terra-gtk4%?_isa = %version-%release
+Provides: pkgconfig(gtk4) = %version-%release
+Provides: pkgconfig(terra-gtk4) = %version-%release
+
+%description devel
+This package contains the libraries and header files that are needed
+for writing applications with version 4 of the GTK widget toolkit.
+
+%package devel-docs
+Summary: Developer documentation for GTK
+BuildArch: noarch
+Requires: terra-gtk4 = %version-%release
+
+%description devel-docs
+This package contains developer documentation for version 4 of the GTK
+widget toolkit.
+
+%package devel-tools
+Summary: Developer tools for GTK
+Requires: terra-gtk4%?_isa = %version-%release
+
+%description devel-tools
+This package contains helpful applications for developers using GTK.
+
+%prep
+%autosetup -p1 -n gtk-%version
+
+%build
+export CFLAGS='-fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT %optflags'
+%meson \
+%if 0%{?with_broadway}
+ -Dbroadway-backend=true \
+%endif
+ -Dsysprof=enabled \
+ -Dtracker=enabled \
+ -Dcolord=enabled \
+ -Dgtk_doc=true \
+ -Dman-pages=true
+
+%meson_build
+
+%install
+%meson_install
+
+%find_lang gtk40
+
+%if !0%{?with_broadway}
+rm $RPM_BUILD_ROOT%{_mandir}/man1/gtk4-broadwayd.1*
+%endif
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-4.0
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/modules
+
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gtk-4.0/
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+
+%files -f gtk40.lang
+%license COPYING
+%doc AUTHORS NEWS README.md
+%{_bindir}/gtk4-launch
+%{_bindir}/gtk4-update-icon-cache
+%{_libdir}/libgtk-4.so.1*
+%dir %{_libdir}/gtk-4.0
+%dir %{_libdir}/gtk-4.0/%{bin_version}
+%{_libdir}/gtk-4.0/%{bin_version}/media/
+%{_libdir}/gtk-4.0/%{bin_version}/printbackends/
+%{_libdir}/gtk-4.0/modules
+%{_libdir}/girepository-1.0
+%{_mandir}/man1/gtk4-launch.1*
+%{_mandir}/man1/gtk4-update-icon-cache.1*
+%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.ColorChooser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.Debug.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.EmojiChooser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.FileChooser.gschema.xml
+%dir %{_datadir}/gtk-4.0
+%{_datadir}/gtk-4.0/emoji/
+%{_datadir}/gtk-4.0/settings.ini
+%if 0%{?with_broadway}
+%{_bindir}/gtk4-broadwayd
+%{_mandir}/man1/gtk4-broadwayd.1*
+%endif
+
+%files devel
+%{_libdir}/libgtk-4.so
+%{_includedir}/*
+%{_libdir}/pkgconfig/*
+%{_bindir}/gtk4-builder-tool
+%{_bindir}/gtk4-encode-symbolic-svg
+%{_bindir}/gtk4-query-settings
+%{_datadir}/gettext/
+%{_datadir}/gir-1.0
+%{_datadir}/gtk-4.0/gtk4builder.rng
+%{_datadir}/gtk-4.0/valgrind/
+%{_mandir}/man1/gtk4-builder-tool.1*
+%{_mandir}/man1/gtk4-encode-symbolic-svg.1*
+%{_mandir}/man1/gtk4-query-settings.1*
+
+%files devel-docs
+%{_datadir}/doc/gdk4/
+%{_datadir}/doc/gdk4-wayland/
+%{_datadir}/doc/gdk4-x11/
+%{_datadir}/doc/gsk4/
+%{_datadir}/doc/gtk4/
+
+%files devel-tools
+%{_bindir}/gtk4-demo
+%{_bindir}/gtk4-demo-application
+%{_bindir}/gtk4-icon-browser
+%{_bindir}/gtk4-node-editor
+%{_bindir}/gtk4-print-editor
+%{_bindir}/gtk4-widget-factory
+%{_datadir}/applications/org.gtk.gtk4.NodeEditor.desktop
+%{_datadir}/applications/org.gtk.Demo4.desktop
+%{_datadir}/applications/org.gtk.IconBrowser4.desktop
+%{_datadir}/applications/org.gtk.PrintEditor4.desktop
+%{_datadir}/applications/org.gtk.WidgetFactory4.desktop
+%{_datadir}/icons/hicolor/*/apps/org.gtk.gtk4.NodeEditor*.svg
+%{_datadir}/icons/hicolor/*/apps/org.gtk.Demo4*.svg
+%{_datadir}/icons/hicolor/*/apps/org.gtk.IconBrowser4*.svg
+%{_datadir}/icons/hicolor/*/apps/org.gtk.PrintEditor4*.svg
+%{_datadir}/icons/hicolor/*/apps/org.gtk.WidgetFactory4*.svg
+%{_datadir}/glib-2.0/schemas/org.gtk.Demo4.gschema.xml
+%{_metainfodir}/org.gtk.gtk4.NodeEditor.appdata.xml
+%{_metainfodir}/org.gtk.Demo4.appdata.xml
+%{_metainfodir}/org.gtk.IconBrowser4.appdata.xml
+%{_metainfodir}/org.gtk.PrintEditor4.appdata.xml
+%{_metainfodir}/org.gtk.WidgetFactory4.appdata.xml
+%{_mandir}/man1/gtk4-demo.1*
+%{_mandir}/man1/gtk4-demo-application.1*
+%{_mandir}/man1/gtk4-icon-browser.1*
+%{_mandir}/man1/gtk4-node-editor.1*
+%{_mandir}/man1/gtk4-widget-factory.1*
+
+%changelog
+%autochangelog
diff --git a/anda/lib/gtk4/update.rhai b/anda/lib/gtk4/update.rhai
new file mode 100644
index 0000000000..d0601e514e
--- /dev/null
+++ b/anda/lib/gtk4/update.rhai
@@ -0,0 +1,7 @@
+let txt = get("https://gitlab.gnome.org/api/v4/projects/665/repository/tags");
+for item in txt.json_arr() {
+ if item.name.starts_with("4.") {
+ rpm.version(item.name);
+ break;
+ }
+}
diff --git a/anda/lib/libappimage/libappimage.spec b/anda/lib/libappimage/libappimage.spec
index 4019221b75..f47b533de2 100644
--- a/anda/lib/libappimage/libappimage.spec
+++ b/anda/lib/libappimage/libappimage.spec
@@ -7,7 +7,7 @@ Name: libappimage
Version: %{libver_format}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Implements functionality for dealing with AppImage files
License: MIT
@@ -26,10 +26,14 @@ BuildRequires: squashfuse-devel
BuildRequires: git-core
BuildRequires: librsvg2-devel
BuildRequires: boost-devel
+BuildRequires: wget
+BuildRequires: xxd
+BuildRequires: desktop-file-utils
%description
-Implements functionality for dealing with AppImage files. It is written in C++ and is using Boost.
+Implements functionality for dealing with AppImage files.
+It is written in C++ and is using Boost.
%package devel
Summary: Development files for %{name}
@@ -59,7 +63,9 @@ mv a.h src/libappimage/utils/hashlib.h
%install
%cmake_install
-#find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find %buildroot -name '*.bat' -exec rm -f {} ';' &
+find %buildroot -name '.gitignore' -exec rm -f {} ';' &
+wait
%{?ldconfig_scriptlets}
@@ -69,7 +75,6 @@ mv a.h src/libappimage/utils/hashlib.h
%license LICENSE
%doc docs
%{_libdir}/*.so.*
-%{_libdir}/*.a
%files devel
%doc docs
@@ -77,10 +82,9 @@ mv a.h src/libappimage/utils/hashlib.h
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_libdir}/cmake/%{name}/*.cmake
-
-
+%{_libdir}/*.a
%changelog
-* Tue Oct 25 2022 Cappy Ishihara
+* Tue Oct 25 2022 Cappy Ishihara - 1.0.4~5-1
- Initial package.
diff --git a/anda/lib/libayatana-common/libayatana-common.spec b/anda/lib/libayatana-common/libayatana-common.spec
index 4ea42157c1..967278a2c6 100644
--- a/anda/lib/libayatana-common/libayatana-common.spec
+++ b/anda/lib/libayatana-common/libayatana-common.spec
@@ -2,7 +2,7 @@ Name: libayatana-common
Summary: Common functions for Ayatana System Indicators
Version: 0.9.8
Release: %autorelease
-License: GPLv3
+License: GPL-3.0
URL: https://github.com/AyatanaIndicators/libayatana-common
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -15,12 +15,13 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: vala-devel
-Buildrequires: vala
+BuildRequires: vala
BuildRequires: intltool
%description
-The Ayatana Indicators project is the continuation of Application Indicators and System Indicators,
-two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop.
+The Ayatana Indicators project is the continuation of Application Indicators
+and System Indicators, two technologies developed by Canonical Ltd. for the
+Unity7 desktop and Lomiri desktop.
%package devel
Summary: Development files for %{name}
diff --git a/anda/lib/libayatana-common/update.rhai b/anda/lib/libayatana-common/update.rhai
new file mode 100644
index 0000000000..570bed83d1
--- /dev/null
+++ b/anda/lib/libayatana-common/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh_tag("AyatanaIndicators/libayatana-common"));
diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec
index d51f9d4f9b..d57e91bf67 100644
--- a/anda/lib/libhelium/libhelium.spec
+++ b/anda/lib/libhelium/libhelium.spec
@@ -1,6 +1,6 @@
Summary: The Application Framework for tauOS apps
Name: libhelium
-Version: 1.5.21
+Version: 1.6.0
Release: 1%{?dist}
License: GPL-3.0
URL: https://github.com/tau-OS/libhelium
@@ -54,10 +54,11 @@ rm -rf %{buildroot}%{_datadir}/themes/*
%files
%license COPYING
%doc README.md
-%{_libdir}/libhelium-1.so*
+%{_libdir}/libhelium-1.so.*
%{_libdir}/girepository-1.0
%files devel
+%{_libdir}/libhelium-1.so
%{_includedir}/*
%{_datadir}/gir-1.0/*
%{_libdir}/pkgconfig/*
diff --git a/anda/lib/libindicator/anda.hcl b/anda/lib/libindicator/anda.hcl
index e10f0fb50b..b76b3d96ec 100644
--- a/anda/lib/libindicator/anda.hcl
+++ b/anda/lib/libindicator/anda.hcl
@@ -1,5 +1,5 @@
project pkg {
rpm {
- spec = "libindicator.spec"
+ spec = "terra-libindicator.spec"
}
}
diff --git a/anda/lib/libindicator/libindicator.spec b/anda/lib/libindicator/terra-libindicator.spec
similarity index 96%
rename from anda/lib/libindicator/libindicator.spec
rename to anda/lib/libindicator/terra-libindicator.spec
index 4ca5eb814b..669f39e316 100644
--- a/anda/lib/libindicator/libindicator.spec
+++ b/anda/lib/libindicator/terra-libindicator.spec
@@ -1,4 +1,4 @@
-Name: libindicator
+Name: terra-libindicator
Version: 16.10.0
Release: %autorelease
Summary: Shared functions for Ayatana indicators
@@ -57,7 +57,7 @@ developing applications that use %{name}-gtk3.
%prep
%setup -q -c
-%patch 1 -p1 -b .orig
+%patch1 -p1 -b .orig
# Remove all IDO references
# This is only needed for tools/indicator-loader.c
sed -i '6d' ./Makefile.am
@@ -143,7 +143,7 @@ install -Dm644 %{SOURCE1} %{buildroot}%{_userunitdir}/
%files
%license COPYING
-%doc AUTHORS COPYING NEWS ChangeLog
+%doc AUTHORS COPYING NEWS ChangeLog README
%{_libdir}/libindicator.so.*
%{_prefix}/lib/indicators/
%dir %{_datadir}/libindicator/
@@ -159,13 +159,16 @@ install -Dm644 %{SOURCE1} %{buildroot}%{_userunitdir}/
%{_libdir}/pkgconfig/indicator-0.4.pc
%files gtk3
-%doc AUTHORS COPYING NEWS ChangeLog
+%doc AUTHORS COPYING NEWS ChangeLog README
+%license COPYING
%{_libdir}/libindicator3.so.*
%{_prefix}/lib/indicators3/
%dir %{_datadir}/libindicator/
%dir %{_datadir}/libindicator/icons/
%files gtk3-devel
+%doc README
+%license COPYING
%dir %{_includedir}/libindicator3-0.4/
%dir %{_includedir}/libindicator3-0.4/libindicator/
%{_includedir}/libindicator3-0.4/libindicator/*.h
diff --git a/anda/lib/libunity-misc/libunity-misc.spec b/anda/lib/libunity-misc/libunity-misc.spec
index c921804e06..47dc2053f0 100644
--- a/anda/lib/libunity-misc/libunity-misc.spec
+++ b/anda/lib/libunity-misc/libunity-misc.spec
@@ -1,7 +1,7 @@
Name: libunity-misc
Version: 4.0.5
Release: %autorelease
-Summary: Misc Unity shell libs
+Summary: Misc Unity shell libraries
License: LGPL-2.0 AND LGPL-2.0 AND GPL-2.0
URL: https://launchpad.net/libunity-misc
@@ -18,7 +18,8 @@ BuildRequires: gtk3-devel
BuildRequires: glib2-devel
%description
-A simple library that implements a subset of the XPath spec to allow selecting nodes in an object tree
+A simple library that implements a subset of the XPath spec to allow selecting
+nodes in an object tree.
%package devel
Summary: Development files for %{name}
diff --git a/anda/lib/libunity/libunity.spec b/anda/lib/libunity/libunity.spec
deleted file mode 100644
index f441dc26b4..0000000000
--- a/anda/lib/libunity/libunity.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-Name: libunity
-Summary: Supporting library for Unity shell
-Version: 7.1.4+19.04
-Release: %autorelease
-
-License: GPL-3.0-or-later AND LGPL-3.0-or-later
-URL: https://launchpad.net/libunity
-# same sources as shipped in ubuntu packages
-Source0: http://archive.ubuntu.com/ubuntu/pool/main/libu/libunity/libunity_7.1.4+19.04.20190319.orig.tar.gz
-Patch0: https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/libunity/7.1.4+19.04.20190319-0ubuntu1/libunity_7.1.4+19.04.20190319-0ubuntu1.diff.gz
-Patch1: https://launchpadlibrarian.net/443817430/0001-Fix-FTB-with-recent-vala-requiring-non-public-abstra.patch
-# Patch for vala 0.53.2 portability
-Patch2: https://src.fedoraproject.org/rpms/libunity/raw/rawhide/f/libunity-7.1.4-vala-053.patch
-
-BuildRequires: automake libtool gnome-common
-BuildRequires: intltool
-BuildRequires: pkgconfig(dee-1.0)
-BuildRequires: pkgconfig(dbusmenu-glib-0.4)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gobject-introspection-1.0)
-BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: python3-devel
-BuildRequires: vala
-BuildRequires: make
-
-%description
-A library for instrumenting and integrating with all aspects of the Unity
-shell devel version with headers. Thanks to https://src.fedoraproject.org/rpms/libunity for the original RPM spec.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-%description devel
-%{summary}.
-
-%package -n python3-libunity
-Summary: Python3 bindings for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python3-gobject-base
-%description -n python3-libunity
-%{summary}.
-
-%prep
-%autosetup -c -p1
-
-%build
-NOCONFIGURE=1 \
-./autogen.sh
-
-PYTHON=%{__python3}
-export PYTHON
-
-%configure \
- --disable-silent-rules \
- --disable-static
-
-%make_build
-
-%install
-%make_install
-
-rm -fv %{buildroot}%{_libdir}/lib*.la %{buildroot}%{_libdir}/libunity/lib*.la
-
-pushd %{buildroot}
-ln -fs %{_libdir}/libunity/libunity-protocol-private.so.0.0.0 .%{_libdir}/libunity-protocol-private.so
-ln -fs %{_libdir}/libunity/libunity-protocol-private.so.0.0.0 .%{_libdir}/libunity-protocol-private.so.0
-popd
-
-%py_byte_compile %{__python3} %{buildroot}%{python3_sitearch}/gi/overrides/
-
-%ldconfig_post
-
-%postun
-%{?ldconfig}
-%if 0%{?rhel} && 0%{?rhel} < 8
-if [ $1 -eq 0 ]; then
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-%endif
-
-%files
-%doc AUTHORS README
-%license COPYING*
-%{_bindir}/libunity-tool
-%{_bindir}/unity-scope-loader
-%{_libdir}/libunity.so.*
-%{_libdir}/libunity-extras.so.*
-%{_libdir}/libunity-protocol-private.so.0
-%{_libdir}/girepository-1.0/Unity-7.0.typelib
-%{_libdir}/girepository-1.0/UnityExtras-7.0.typelib
-%dir %{_libdir}/libunity/
-%{_libdir}/libunity/libunity-protocol-private.so
-%{_libdir}/libunity/libunity-protocol-private.so.*
-%{_datadir}/glib-2.0/schemas/com.canonical.Unity.Lenses.gschema.xml
-%{_datadir}/unity/
-%{_datadir}/unity-scopes/
-
-%files -n python3-libunity
-%{python3_sitearch}/gi/overrides/Unity.py*
-%{python3_sitearch}/gi/overrides/__pycache__/*
-
-%files devel
-%{_includedir}/unity/
-%{_libdir}/libunity.so
-%{_libdir}/libunity-extras.so
-%{_libdir}/libunity-protocol-private.so
-%{_libdir}/pkgconfig/unity.pc
-%{_libdir}/pkgconfig/unity-extras.pc
-%{_libdir}/pkgconfig/unity-protocol-private.pc
-%{_datadir}/gir-1.0/Unity-7.0.gir
-%{_datadir}/gir-1.0/UnityExtras-7.0.gir
-%{_datadir}/vala/vapi/unity.*
-%{_datadir}/vala/vapi/unity-extras.*
-%{_datadir}/vala/vapi/unity-protocol.*
-%{_datadir}/vala/vapi/unity-trace.*
-
-%changelog
-%autochangelog
diff --git a/anda/lib/libusermetrics/libusermetrics.spec b/anda/lib/libusermetrics/libusermetrics.spec
index 6b931cbcc8..52b25ddfcf 100644
--- a/anda/lib/libusermetrics/libusermetrics.spec
+++ b/anda/lib/libusermetrics/libusermetrics.spec
@@ -4,7 +4,7 @@
Name: libusermetrics
Version: 1.3.0
-Release: %autorelease
+Release: 2%?dist
Summary: library for retrieving anonymous metrics about users
License: GPLv3 AND LGPLv3 AND LGPLv2
URL: https://gitlab.com/ubports/development/core/libusermetrics
@@ -23,6 +23,7 @@ BuildRequires: pkgconfig(click-0.4)
BuildRequires: pkgconfig(libqtdbustest-1)
BuildRequires: pkgconfig(libapparmor)
BuildRequires: qdjango-devel
+BuildRequires: fdupes
%description
library for retrieving anonymous metrics about users
@@ -52,9 +53,11 @@ The %{name}-doc contains documentation for %{name}.
%install
%cmake_install
+%fdupes %buildroot%_docdir/libusermetrics-doc/html/
%find_lang %{name}
%files -f %{name}.lang
+%doc ChangeLog
%license LGPL_EXCEPTION.txt LICENSE.GPL LICENSE.LGPL LICENSE.LGPL-3
%{_sysconfdir}/dbus-1/system.d/com.lomiri.UserMetrics.conf
%{_bindir}/usermetricsinput
diff --git a/anda/lib/lomiri-api/lomiri-api.spec b/anda/lib/lomiri-api/lomiri-api.spec
index 03658829b0..e321df096e 100644
--- a/anda/lib/lomiri-api/lomiri-api.spec
+++ b/anda/lib/lomiri-api/lomiri-api.spec
@@ -1,10 +1,10 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-api
-%global commit 30860779881a2a235ba454ac37a06e349af05eb3
+%global commit 9e2618e1a68f114581dad9f624bd509d46c9d984
%forgemeta
Name: lomiri-api
-Version: 0.2.0
-Release: 1%{?dist}
+Version: 0.2.1
+Release: 2%{?dist}
Summary: API for Lomiri
License: LGPL-3.0-or-later
@@ -20,6 +20,7 @@ BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: cppcheck
BuildRequires: doxygen
+BuildRequires: fdupes
%description
API to interface with the Lomiri desktop environment.
@@ -51,8 +52,10 @@ sed -i 's?lib/${CMAKE_LIBRARY_ARCHITECTURE}?%{_lib}?' CMakeLists.txt
%install
%cmake_install
+%fdupes %buildroot%_docdir/liblomiri-api
%files
+%doc README
%license COPYING
%{_libdir}/liblomiri-api.so.*
diff --git a/anda/lib/lomiri-app-launch/lomiri-app-launch.spec b/anda/lib/lomiri-app-launch/lomiri-app-launch.spec
index aee0c7abfd..ebc13f17cc 100644
--- a/anda/lib/lomiri-app-launch/lomiri-app-launch.spec
+++ b/anda/lib/lomiri-app-launch/lomiri-app-launch.spec
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit d69c7a1339e0d227bebb500b6a1fe655095ff700
+%global commit e58213c813ffda487dc4fb1226c9f866864510e4
%forgemeta
Name: lomiri-app-launch
diff --git a/anda/lib/lomiri-app-launch/update.rhai b/anda/lib/lomiri-app-launch/update.rhai
index 4bef084cc0..c2168b6685 100644
--- a/anda/lib/lomiri-app-launch/update.rhai
+++ b/anda/lib/lomiri-app-launch/update.rhai
@@ -1,3 +1,2 @@
-let o = get("https://gitlab.com/api/v4/projects/17286402/repository/tags").json_arr()[0];
-rpm.global("commit", o.commit.id);
-rpm.version(o.name);
+rpm.version(get("https://gitlab.com/api/v4/projects/17286402/repository/tags").json_arr()[0].name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/17286402/repository/commits").json_arr()[0].id);
diff --git a/anda/lib/lomiri-download-manager/lomiri-download-manager.spec b/anda/lib/lomiri-download-manager/lomiri-download-manager.spec
index 33f1ec2878..7bab9cfc75 100644
--- a/anda/lib/lomiri-download-manager/lomiri-download-manager.spec
+++ b/anda/lib/lomiri-download-manager/lomiri-download-manager.spec
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager
-%global commit 86d086292db613df0b0cbc5fc2cfcdc33c3315bb
+%global commit 2c7d6921ac56862c197958f4e5c31aa76a1a50e1
%forgemeta
Name: lomiri-download-manager
@@ -23,6 +23,7 @@ BuildRequires: qt5-qtdeclarative-devel
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(libglog)
BuildRequires: pkgconfig(liblomiri-api)
+BuildRequires: fdupes
%description
Upload Download Manager performs uploads and downloads from a centralized
@@ -33,20 +34,20 @@ Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+The %name-devel package contains libraries and header files
+for developing applications that use %{name}.
%package doc
Summary: Documentation files for %{name}
BuildArch: noarch
%description doc
-%{name}-doc contains documentation for %{name}-devel.
+The %name-doc package contains documentation for
+%{name}-devel.
%prep
%autosetup -n lomiri-download-manager-%commit
sed -e "s/-Werror//g" -i CMakeLists.txt
-sed -i 's/ -qt=qt5//' docs/qml/CMakeLists.txt
%build
%cmake -DCMAKE_INSTALL_LIBEXECDIR=%{_libdir} -DENABLE_UBUNTU_COMPAT=ON
@@ -54,11 +55,12 @@ sed -i 's/ -qt=qt5//' docs/qml/CMakeLists.txt
%install
%cmake_install
+%fdupes %buildroot%_docdir/%name/cpp/html/
%find_lang %{name}
%files -f %{name}.lang
%license COPYING
-%{_sysconfdir}/dbus-1/system.d/*.conf
+%config %{_sysconfdir}/dbus-1/system.d/*.conf
%{_bindir}/lomiri-*
%{_userunitdir}/*.service
%{_libdir}/liblomiri-download-manager-client.so.*
@@ -72,6 +74,7 @@ sed -i 's/ -qt=qt5//' docs/qml/CMakeLists.txt
%{_qt5_qmldir}/Ubuntu/
%{_datadir}/dbus-1/services/*.service
%{_datadir}/dbus-1/system-services/*.service
+%{_mandir}/man1/*.gz
%files devel
%dir %{_includedir}/lomiri/download_manager
diff --git a/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec b/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec
index c0e6130a83..768f6eb8f7 100644
--- a/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec
+++ b/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec
@@ -1,15 +1,14 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-indicator-network
-%global commit f4610298aa91b17161b5bc65b232228bf0fcab47
+%global commit ac0ae8ec8968c934f81c2664879ab10f76ab0fc2
%forgemeta
Name: lomiri-indicator-network
Version: 1.0.0
Release: %autorelease
Summary: The Network indicator for Ubuntu Touch
-License: GPLv3 AND LGPLv3
+License: GPL-3.0 AND LGPL-3.0
URL: https://gitlab.com/ubports/development/core/lomiri-indicator-network
Source0: %{url}/-/archive/%commit/lomiri-indicator-network-%commit.tar.gz
-Patch0: https://sources.debian.org/data/main/l/lomiri-indicator-network/1.0.0-1/debian/patches/1003_no-abs-paths-in-documentation.patch
BuildRequires: systemd-rpm-macros
BuildRequires: qt-devel
@@ -52,7 +51,7 @@ BuildArch: noarch
The %{name}-doc package contains documentation files for %{name}.
%prep
-%autosetup -n lomiri-indicator-network-%commit -p1
+%autosetup -n lomiri-indicator-network-%commit
%build
%cmake -DENABLE_COVERAGE=OFF -DENABLE_UBUNTU_COMPAT=ON
@@ -63,8 +62,9 @@ The %{name}-doc package contains documentation files for %{name}.
%find_lang %{name}
%files -f %{name}.lang
+%doc README.md
%license COPYING COPYING.LGPL
-%{_sysconfdir}/xdg/autostart/lomiri-indicator-network.desktop
+%config %{_sysconfdir}/xdg/autostart/lomiri-indicator-network.desktop
%{_userunitdir}/*.service
%{_libdir}/liblomiri-connectivity-qt1.so.*
%dir %{_qt5_qmldir}/Lomiri/Connectivity
@@ -75,6 +75,7 @@ The %{name}-doc package contains documentation files for %{name}.
%{_qt5_qmldir}/Ubuntu/Connectivity/qmldir
%dir %{_libexecdir}/lomiri-indicator-network
%{_libexecdir}/lomiri-indicator-network/lomiri-indicator-network-*
+%{_datadir}/dbus-1/services/com.lomiri.connectivity1.service
%{_datadir}/glib-2.0/schemas/com.lomiri.indicator.network.gschema.xml
%{_datadir}/unity/indicators/com.lomiri.indicator.network
diff --git a/anda/lib/lomiri-settings-components/lomiri-settings-components.spec b/anda/lib/lomiri-settings-components/lomiri-settings-components.spec
index 66ff7788bc..83431340f8 100644
--- a/anda/lib/lomiri-settings-components/lomiri-settings-components.spec
+++ b/anda/lib/lomiri-settings-components/lomiri-settings-components.spec
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-settings-components
-%global commit 2951ca5aa3d5d78823240d163aecb4a0aa62c535
+%global commit 5041243d56fb7aaab270b4d07284687ec33f75c6
%forgemeta
Name: lomiri-settings-components
diff --git a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec b/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec
index 85b161f036..fcf60e92fc 100644
--- a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec
+++ b/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec
@@ -1,10 +1,10 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit b996aa8e9d5add6e9d55f9a44a9fafc548d819c1
+%global commit 7df579c068335df31a704307d2bd20542233e5d2
%forgemeta
Name: lomiri-ui-toolkit
Version: 1.3.5010
-Release: %autorelease
+Release: 2%?dist
Summary: QML components to ease the creation of beautiful applications in QML for Lomiri
License: LGPL-3.0
@@ -33,6 +33,7 @@ BuildRequires: qt5-qtdeclarative-devel
BuildRequires: qt5-pim-devel
BuildRequires: python3-rpm-macros
BuildRequires: qt5-qtsvg-devel
+BuildRequires: fdupes
Requires: qt5-qtgraphicaleffects
Requires: qt5-qtfeedback
@@ -57,6 +58,7 @@ This package contains development files needed for lomiri-ui-toolkit.
%package -n python3-lomiriuitoolkit
Summary: Python3 files for Lomiri-ui-toolkit
Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildArch: noarch
%description -n python3-lomiriuitoolkit
Python3 files for Lomiri-ui-toolkit.
@@ -87,13 +89,14 @@ Examples for Lomiri-ui-toolkit.
%make_install INSTALL_ROOT=%{buildroot} STRIP=/bin/true
# Used by apicheck during tests only
rm -rf %{buildroot}%{_qt5_qmldir}/Extinct
-# Has various issues
-rm -rf %{buildroot}%{_datadir}/lomiri-ui-toolkit/doc/html
+%fdupes %buildroot%_libdir/qt5/qml/Lomiri/Components/
+%fdupes %buildroot%_libdir/qt5/examples/%name/examples/
%find_lang %{name}
%find_lang %{name}-gallery
%files -f %{name}.lang
+%doc README.md
%license COPYING
%{_libdir}/libLomiriGestures.so.*
%{_libdir}/libLomiriMetrics.so.*
@@ -129,6 +132,7 @@ rm -rf %{buildroot}%{_datadir}/lomiri-ui-toolkit/doc/html
%{_qt5_includedir}/LomiriToolkit/
%files -n python3-lomiriuitoolkit
+%doc README.md
%dir %{python3_sitelib}/lomiriuitoolkit
%{python3_sitelib}/lomiriuitoolkit/*.py
%{python3_sitelib}/lomiriuitoolkit/_custom_proxy_objects/
@@ -138,8 +142,7 @@ rm -rf %{buildroot}%{_datadir}/lomiri-ui-toolkit/doc/html
%files doc
%license COPYING.CC-BY-SA-3.0
%{_qt5_docdir}/*.qch
-%dir %{_datadir}/lomiri-ui-toolkit
-%{_datadir}/lomiri-ui-toolkit/doc/
+%{_datadir}/doc/lomiri-ui-toolkit/
%files examples -f %{name}-gallery.lang
%dir %{_qt5_examplesdir}/lomiri-ui-toolkit
diff --git a/anda/lib/lomiri-ui-toolkit/update.rhai b/anda/lib/lomiri-ui-toolkit/update.rhai
index 5c7d73e15f..4c97bcbcd3 100644
--- a/anda/lib/lomiri-ui-toolkit/update.rhai
+++ b/anda/lib/lomiri-ui-toolkit/update.rhai
@@ -1,3 +1,2 @@
-let o = get("https://gitlab.com/api/v4/projects/19057685/repository/tags").json_arr()[0];
-rpm.global("commit", o.commit.id);
-rpm.version(o.name);
+rpm.version(get("https://gitlab.com/api/v4/projects/19057685/repository/tags").json_arr()[0].name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/19057685/repository/commits").json_arr()[0].id);
diff --git a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec
index 81a15666af..904f3506de 100644
--- a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec
+++ b/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-url-dispatcher
-%global commit 0f6518439bdec30816feb0ede9d52080f50d1425
+%global commit 23c42355cfbb7ab2ad9702d0362ed5590cf994bd
%forgemeta
Name: lomiri-url-dispatcher
@@ -29,12 +29,12 @@ Requires: lomiri-ui-toolkit
ExclusiveArch: x86_64 aarch64
%description
-Lomiri-url-dispatcher is a small handler to take URLs and do what is appropriate with them.
-That could be anything from launching a web browser to just starting an
-application. This is done over DBus because application confinement doesn't
-allow for doing it from a confined application otherwise. It's important
-the that applications can't know about each other, so this is a fire and forget
-type operation.
+Lomiri-url-dispatcher is a small handler to take URLs and do what is
+appropriate with them. That could be anything from launching a web browser to
+just starting an application. This is done over DBus because application
+confinement doesn't allow for doing it from a confined application otherwise.
+It's important the that applications can't know about each other, so this is a
+fire and forget type operation.
%package devel
Summary: Lomiri-url-dispatcher development files
diff --git a/anda/lib/lomiri-url-dispatcher/update.rhai b/anda/lib/lomiri-url-dispatcher/update.rhai
index 3b89df98ff..9793815e9a 100644
--- a/anda/lib/lomiri-url-dispatcher/update.rhai
+++ b/anda/lib/lomiri-url-dispatcher/update.rhai
@@ -1,3 +1,2 @@
-let o = get("https://gitlab.com/api/v4/projects/17424894/repository/tags").json_arr()[0];
-rpm.global("commit", o.commit.id);
-rpm.version(o.name);
+rpm.version(get("https://gitlab.com/api/v4/projects/17424894/repository/tags").json_arr()[0].name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/17424894/repository/commits").json_arr()[0].id);
diff --git a/anda/lib/marble-gtk/marble-gtk.spec b/anda/lib/marble-gtk/marble-gtk.spec
index 242dfca20d..d1d5a7128d 100644
--- a/anda/lib/marble-gtk/marble-gtk.spec
+++ b/anda/lib/marble-gtk/marble-gtk.spec
@@ -17,6 +17,13 @@ Source0: %{url}/-/archive/v%{version}/marble-v%{version}.tar.gz
Just as Elementary has Granite I have Marble, my collection of useful functions
and reusable widgets.
+%package devel
+Summary: Development files for marble-gtk
+
+%description devel
+%summary.
+
+
%prep
%autosetup -n marble-v%{version}
@@ -30,14 +37,16 @@ and reusable widgets.
%files
%doc README.md
%license COPYING
-/usr/include/marble.h
-/usr/lib/debug/usr/lib64/libmarble.so*
/usr/lib64/girepository-1.0/Marble-*.typelib
-/usr/lib64/libmarble.so*
-/usr/lib64/pkgconfig/marble.pc
-/usr/share/gir-1.0/Marble-*.gir
+/usr/lib64/libmarble.so.*
/usr/share/vala/vapi/marble.*
+%files devel
+/usr/include/marble.h
+%_libdir/libmarble.so
+%_libdir/pkgconfig/marble.pc
+%_datadir/gir-1.0/Marble-%version.gir
+
%changelog
-* Sat Oct 29 2022 windowsboy111
+* Sat Oct 29 2022 windowsboy111 - 1.3.0-1
- Initial package
diff --git a/anda/lib/nlohmann-json/nlohmann-json.spec b/anda/lib/nlohmann-json/nlohmann-json.spec
index 42bdff27c1..60b6589621 100644
--- a/anda/lib/nlohmann-json/nlohmann-json.spec
+++ b/anda/lib/nlohmann-json/nlohmann-json.spec
@@ -7,12 +7,12 @@ Release: 1%{?dist}
Summary: JSON for Modern C++ (c++11) ("single header file")
-%define desc %{expand:There are myriads of JSON libraries out there, and each may even have its reason to exist.
-Our class had these design goals:
+%define desc %{expand:
+There are myriads of JSON libraries out there, and each may even have its
+reason to exist. Our class had these design goals:
- intuitive syntax.
- Trivial integration.
-- Serious testing
-}
+- Serious testing}
License: MIT
Url: https://github.com/nlohmann/json
@@ -44,6 +44,8 @@ This package contains the single header C++ file and CMake dependency files.
%cmake_install
%files devel
+%doc README.md
+%license LICENSE.MIT
%{_includedir}/nlohmann
%{_datadir}/cmake/nlohmann_json/
%{_datadir}/pkgconfig/nlohmann_json.pc
diff --git a/anda/lib/nux/nux.spec b/anda/lib/nux/nux.spec
index 64769ded05..c42fe66afb 100644
--- a/anda/lib/nux/nux.spec
+++ b/anda/lib/nux/nux.spec
@@ -71,8 +71,9 @@ install -m 0644 debian/50_check_unity_support -t %{buildroot}%{_sysconfdir}/X11/
rm -rf %{buildroot}%{_datadir}/nux/gputests
%files
+%doc README
%license COPYING COPYING.gpl COPYING.lgpl-v2.1
-%{_sysconfdir}/X11/Xsession.d/50_check_unity_support
+%config %{_sysconfdir}/X11/Xsession.d/50_check_unity_support
%{_libdir}/libnux-4.0.so.*
%{_libdir}/libnux-core-4.0.so.*
%{_libdir}/libnux-graphics-4.0.so.*
diff --git a/anda/lib/process-cpp/process-cpp.spec b/anda/lib/process-cpp/process-cpp.spec
index c543cd69f4..b78cf3ead2 100644
--- a/anda/lib/process-cpp/process-cpp.spec
+++ b/anda/lib/process-cpp/process-cpp.spec
@@ -23,6 +23,7 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(properties-cpp)
#BuildRequires: pkgconfig(Backtrace)
BuildRequires: doxygen
+BuildRequires: fdupes
%description
A simple convenience library for handling processes in C++11.
@@ -52,8 +53,10 @@ sed -i '/find_package(PkgConfig REQUIRED)/a set(THREADS_PREFER_PTHREAD_FLAG ON)'
%install
%cmake_install
+%fdupes %buildroot%_docdir/%name/html/
%files
+%doc README.md
%license COPYING
%{_libdir}/libprocess-cpp.so.*
diff --git a/anda/lib/properties-cpp-devel/properties-cpp-devel.spec b/anda/lib/properties-cpp-devel/properties-cpp-devel.spec
index defcb41511..f76973729a 100644
--- a/anda/lib/properties-cpp-devel/properties-cpp-devel.spec
+++ b/anda/lib/properties-cpp-devel/properties-cpp-devel.spec
@@ -20,12 +20,13 @@ BuildRequires: gcc
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: doxygen
BuildRequires: cmake-extras
+BuildRequires: fdupes
%description
A very simple convenience library for handling properties and signals in C++11.
%package doc
-Summary: properties-cpp documentation files
+Summary: Documentation files for properties-cpp
BuildArch: noarch
%description doc
@@ -41,8 +42,10 @@ This package contains documentation files for properties-cpp-devel.
%install
%cmake_install
+%fdupes %buildroot%_docdir/%name/html/
%files
+%doc README.md
%license COPYING
%{_libdir}/pkgconfig/properties-cpp.pc
%{_includedir}/core/*.h
diff --git a/anda/lib/qdjango/qdjango.spec b/anda/lib/qdjango/qdjango.spec
index 45931cd0a8..865965f9fa 100644
--- a/anda/lib/qdjango/qdjango.spec
+++ b/anda/lib/qdjango/qdjango.spec
@@ -13,6 +13,7 @@ BuildRequires: qt5-qtbase-devel
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: doxygen
+BuildRequires: fdupes
%description
QDjango is a web framework written in C++ and built on top of the Qt library.
@@ -45,8 +46,10 @@ The %{name}-doc contains documentation for %{name}.
%make_install INSTALL_ROOT=%{buildroot}
# Aren't needed and already ran plus contain rpaths in every single file underneath
rm -rf %{buildroot}%{_prefix}/tests
+%fdupes %buildroot/%_docdir/%name/html/search/
%files
+%doc README.md
%license LICENSE.LGPL
%{_libdir}/libqdjango-db.so.*
%{_libdir}/libqdjango-http.so.*
diff --git a/anda/lib/qmenumodel/qmenumodel.spec b/anda/lib/qmenumodel/qmenumodel.spec
index f85a169cab..1010b38c46 100644
--- a/anda/lib/qmenumodel/qmenumodel.spec
+++ b/anda/lib/qmenumodel/qmenumodel.spec
@@ -2,9 +2,10 @@ Name: qmenumodel
Version: 0.9.1
Release: %autorelease
Summary: Qt5 renderer for Ayatana Indicators
-License: LGPLv3
+License: LGPL-3.0
URL: https://github.com/AyatanaIndicators/qmenumodel
Source0: https://releases.ayatana-indicators.org/source/qmenumodel/qmenumodel-%{version}.tar.gz
+Patch0: https://gitlab.com/ubports/development/core/packaging/qmenumodel/-/raw/9062c3a3da87d6fd887c41a67dec6f8d5f34baa8/debian/patches/1001-ayatanamenumodel-add-support-for-u-int-of-all-sizes.patch
BuildRequires: cmake
BuildRequires: cmake-extras
@@ -30,7 +31,7 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
-%autosetup -n qmenumodel-%{version}
+%autosetup -n qmenumodel-%{version} -p1
%build
%cmake -DENABLE_TESTS=ON -DENABLE_COVERAGE=ON -DGENERATE_DOC=ON
@@ -40,6 +41,7 @@ developing applications that use %{name}.
%cmake_install
%files
+%doc README
%license COPYING.LGPL
%{_libdir}/libqmenumodel.so.*
%dir %{_qt5_qmldir}/QMenuModel.1
diff --git a/anda/lib/qofono/qofono.spec b/anda/lib/qofono/qofono.spec
index 8287c9754b..39da5f145b 100644
--- a/anda/lib/qofono/qofono.spec
+++ b/anda/lib/qofono/qofono.spec
@@ -58,6 +58,7 @@ export QT_SELECT=5
%postun -p /sbin/ldconfig
%files
+%doc README
%license COPYING
%{_libdir}/libqofono-qt5.so.*
%{_qt5_qmldir}/QOfono/
diff --git a/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec b/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec
index 5465f0d1ba..b468405149 100644
--- a/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec
+++ b/anda/lib/qt5-qtdbustest/qt5-qtdbustest.spec
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/libqtdbustest
-%global commit f204bb8d7e9a2ffcd159d2f51f47257a715bbd62
+%global commit 58990d63f2327d285d6ead430d03b02558257291
%forgemeta
Name: qt5-qtdbustest
@@ -8,7 +8,7 @@ Release: %autorelease
Summary: Library for testing DBus interactions using Qt5
License: LGPL-3.0
URL: https://gitlab.com/ubports/development/core/libqtdbustest
-Source0: %url/-/archive/%version/libqtdbustest-%version.tar.gz
+Source0: %url/-/archive/%commit/libqtdbustest-%commit.tar.gz
BuildRequires: cmake
BuildRequires: cmake-extras
@@ -32,7 +32,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
developing applications that use %{name}.
%prep
-%autosetup -n libqtdbustest-%version
+%autosetup -n libqtdbustest-%commit
%build
%cmake
@@ -42,6 +42,7 @@ developing applications that use %{name}.
%cmake_install
%files
+%doc README.md
%license COPYING
%{_bindir}/qdbus-simple-test-runner
%{_libdir}/libqtdbustest.so.*
diff --git a/anda/lib/qt5-qtsystems/qt5-qtsystems.spec b/anda/lib/qt5-qtsystems/qt5-qtsystems.spec
index 9100d80eab..ae765e5ede 100644
--- a/anda/lib/qt5-qtsystems/qt5-qtsystems.spec
+++ b/anda/lib/qt5-qtsystems/qt5-qtsystems.spec
@@ -46,11 +46,11 @@ Provides: %{name}-systeminfo = %{version}-%{release}
Provides: %{name}-versit = %{version}-%{release}
%description
-Qt5 Mobility Project delivers a set of new APIs to Qt with features that are well
-known from the mobile device world, in particular phones. However, these APIs
-allow the developer to use these features with ease from one framework and apply
-them to phones, netbooks and non-mobile personal computers. The framework not
-only improves many aspects of a mobile experience, because it improves the use
+Qt5 Mobility Project delivers a set of new APIs to Qt with features that are
+well known from the mobile device world, in particular phones. However, these
+APIs allow the developer to use these features with ease from one framework and
+apply them to phones, netbooks and non-mobile personal computers. The framework
+not only improves many aspects of a mobile experience, as it improves the use
of these technologies, but has applicability beyond the mobile device arena.
%package devel
diff --git a/anda/lib/qtdbusmock/qtdbusmock.spec b/anda/lib/qtdbusmock/qtdbusmock.spec
index 552fa2af19..dd9a22afd7 100644
--- a/anda/lib/qtdbusmock/qtdbusmock.spec
+++ b/anda/lib/qtdbusmock/qtdbusmock.spec
@@ -41,6 +41,7 @@ developing applications that use %{name}.
%cmake_install
%files
+%doc README.md
%license COPYING
%{_libdir}/libqtdbusmock.so.*
%dir %{_datadir}/libqtdbusmock
diff --git a/anda/lib/qtmir/qtmir.spec b/anda/lib/qtmir/qtmir.spec
index f55f15dfd6..64332e8627 100644
--- a/anda/lib/qtmir/qtmir.spec
+++ b/anda/lib/qtmir/qtmir.spec
@@ -76,7 +76,7 @@ This package contains development files needed for qtmir.
%prep
%autosetup -n qtmir-%commit -p1
-#sed -i ''
+sed -i 's!X-Ubuntu-Touch=true!X-Lomiri-Splash-Show=false!' data/xwayland.qtmir.desktop
%build
%cmake -DWerror=OFF -DWITH_MIR2=on -DWITH_CONTENTHUB=OFF
@@ -87,6 +87,7 @@ This package contains development files needed for qtmir.
%cmake_install
%files
+%doc README
%license COPYING COPYING.LESSER
%{_libdir}/libqtmirserver.so.*
%{_qt5_plugindir}/platforms/libqpa-mirserver.so
diff --git a/anda/lib/tdlib/anda.hcl b/anda/lib/tdlib/anda.hcl
new file mode 100644
index 0000000000..29e7eebe8d
--- /dev/null
+++ b/anda/lib/tdlib/anda.hcl
@@ -0,0 +1,8 @@
+project pkg {
+ rpm {
+ spec = "tdlib-nightly.spec"
+ }
+ labels {
+ nightly = "1"
+ }
+}
diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec
new file mode 100644
index 0000000000..984a3a93af
--- /dev/null
+++ b/anda/lib/tdlib/tdlib-nightly.spec
@@ -0,0 +1,106 @@
+%global commit 66234ae2537a99ec0eaf7b0857245a6e5c2d2bc9
+%global ver 1.8.14
+Name: tdlib-nightly
+Version: %ver^%commit
+Release: 1%{?dist}
+
+License: BSL-1.0
+URL: https://github.com/tdlib/td
+Summary: Cross-platform library for building Telegram clients
+Source0: %url/archive/%commit/tdlib-%commit.tar.gz
+
+BuildRequires: gperftools-devel
+BuildRequires: openssl-devel
+BuildRequires: ninja-build
+BuildRequires: zlib-devel
+BuildRequires: gcc-c++
+BuildRequires: gperf
+BuildRequires: cmake
+BuildRequires: gcc
+
+Provides: bundled(sqlite) = 3.31.0
+
+%description
+TDLib (Telegram Database library) is a cross-platform library for
+building Telegram clients. It can be easily used from almost any
+programming language.
+
+%name tracks the latest version of TDLib on
+https://github.com/tdlib/td and determines the latest version via
+the CMakeLists.txt file.
+
+%package devel
+Summary: Development files for %name
+Requires: %name%?_isa = %{?epoch:%epoch:}%version-%release
+Provides: pkgconfig(tdjson) = %ver
+
+%package static
+Summary: Static libraries for %name
+Requires: %name%?_isa = %{?epoch:%epoch:}%version-%release
+Requires: %name-devel%?_isa = %{?epoch:%epoch:}%version-%release
+
+%description devel
+%summary.
+
+%description static
+%summary.
+
+%prep
+%autosetup -n td-%commit -p1
+sed -e 's/"DEFAULT"/"PROFILE=SYSTEM"/g' -i tdnet/td/net/SslStream.cpp
+
+%build
+%cmake -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=%_lib \
+ -DTD_ENABLE_JNI:BOOL=OFF \
+ -DTD_ENABLE_DOTNET:BOOL=OFF
+%cmake_build
+
+%install
+%cmake_install
+
+%files
+%license LICENSE_1_0.txt
+%doc README.md CHANGELOG.md
+%_libdir/libtd*.so.%ver
+
+%files devel
+%_includedir/td
+%_libdir/libtd*.so
+%_libdir/cmake/Td
+%_libdir/pkgconfig/td*.pc
+
+%files static
+%_libdir/libtd*.a
+
+%changelog
+* Sun May 28 2023 windowsboy111 - 1.8.14^54b34e9180dabc017210ebe3995f01d0c2fbaef1-1
+- Repackaged for Terra
+
+* Sat Jan 21 2023 Fedora Release Engineering - 1.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Feb 15 2022 Onuralp Sezer - 1.8.0-1
+- Version 1.8.0
+
+* Sat Jan 22 2022 Fedora Release Engineering - 1.7.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Sep 14 2021 Sahana Prasad - 1.7.0-4
+- Rebuilt with OpenSSL 3.0.0
+
+* Fri Jul 23 2021 Fedora Release Engineering - 1.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering - 1.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Nov 28 2020 Vitaly Zaitsev - 1.7.0-1
+- Updated to version 1.7.0.
+
+* Wed Jul 29 2020 Fedora Release Engineering - 1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/anda/lib/tdlib/update.rhai b/anda/lib/tdlib/update.rhai
new file mode 100644
index 0000000000..b240b7f343
--- /dev/null
+++ b/anda/lib/tdlib/update.rhai
@@ -0,0 +1,10 @@
+if filters.contains("nightly") {
+ let ghreq = new_req("https://api.github.com/repos/tdlib/td/commits/HEAD");
+ let req = new_req("https://raw.githubusercontent.com/tdlib/td/master/CMakeLists.txt");
+ ghreq.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
+ let sha = json(ghreq.get()).sha;
+ rpm.global("commit", sha);
+ let v = find("\nproject\\(TDLib\\s+VERSION\\s+([\\d.]+)\\s+", req.get(), 1);
+ rpm.global("ver", v);
+ rpm.release();
+}
diff --git a/anda/lib/unity-settings-daemon/unity-settings-daemon.spec b/anda/lib/unity-settings-daemon/unity-settings-daemon.spec
index e5ac6aa4ba..a6f57fc9e8 100644
--- a/anda/lib/unity-settings-daemon/unity-settings-daemon.spec
+++ b/anda/lib/unity-settings-daemon/unity-settings-daemon.spec
@@ -66,7 +66,7 @@ sed -i '/man/d' Makefile.am
%build
# Some flag fixes an issue
-export LDFLAGS='-Wl,-O1 -Wl,-z,defs -Wl,--warn-unresolved-symbols -Wl,--as-needed'
+export LDFLAGS="$LDFLAGS -Wl,-O1 -Wl,-z,defs -Wl,--warn-unresolved-symbols -Wl,--as-needed"
NOCONFIGURE=1 \
./autogen.sh
@@ -99,7 +99,7 @@ rename 61-gnome-settings-daemon-rfkill.rules 60-gnome-settings-daemon-rfkill.rul
%files -f %{name}.lang
%license COPYING COPYING.LIB
-%{_sysconfdir}/xdg/autostart/*.desktop
+%config %{_sysconfdir}/xdg/autostart/*.desktop
%{_bindir}/unity-settings-daemon
%{_prefix}/lib/udev/rules.d/60-gnome-settings-daemon-rfkill.rules
%{_userunitdir}/unity-settings-daemon.service
diff --git a/anda/moby-extras/moby-buildx/moby-buildx.spec b/anda/moby-extras/moby-buildx/moby-buildx.spec
index 972aefb5c6..dd905febed 100644
--- a/anda/moby-extras/moby-buildx/moby-buildx.spec
+++ b/anda/moby-extras/moby-buildx/moby-buildx.spec
@@ -1,8 +1,8 @@
-%define debug_package %{nil}
+%define debug_package %nil
Name: moby-buildx
-Version: 0.10.5
-Release: 1%{?dist}
+Version: 0.11.0
+Release: 2%{?dist}
Summary: Docker CLI plugin for extended build capabilities with BuildKit
License: Apache-2.0
@@ -11,20 +11,24 @@ Source0: %{url}/archive/refs/tags/v%{version}.tar.gz
BuildRequires: go-rpm-macros
BuildRequires: git-core
+BuildRequires: gcc
Requires: docker
Provides: docker-buildx = %{version}-%{release}
-
-
%description
+buildx is a Docker CLI plugin for extended build capabilities with BuildKit.
%prep
%autosetup -n buildx-%{version}
+go mod download
%build
-go build -v -o docker-buildx ./cmd/buildx
+export CGO_ENABLED=1
+go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w -extldflags '--static-pie'" \
+ -buildmode=pie -tags 'osusergo,netgo,static_build' -v -x \
+ -o docker-buildx ./cmd/buildx
%install
@@ -38,5 +42,5 @@ install -D -m 0755 docker-buildx %{buildroot}%{_libexecdir}/docker/cli-plugins/d
%changelog
-* Wed Oct 05 2022 Cappy Ishihara
+* Wed Oct 05 2022 Cappy Ishihara - 0.9.1-1
- Initial Release
diff --git a/anda/moby-extras/moby-compose/moby-compose.spec b/anda/moby-extras/moby-compose/moby-compose.spec
index c4f7af3862..9251a8ac22 100644
--- a/anda/moby-extras/moby-compose/moby-compose.spec
+++ b/anda/moby-extras/moby-compose/moby-compose.spec
@@ -18,6 +18,7 @@ Provides: docker-compose = %{version}-%{release}
Provides: docker-compose-cli = %{version}-%{release}
%description
+A tool for running multi-container applications using the Compose file format.
%prep
diff --git a/anda/mock-configs/anda.hcl b/anda/mock-configs/anda.hcl
index 208cbd274c..94aca528bc 100644
--- a/anda/mock-configs/anda.hcl
+++ b/anda/mock-configs/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "terra-mock-configs.spec"
}
diff --git a/anda/mock-configs/terra-mock-configs.spec b/anda/mock-configs/terra-mock-configs.spec
index 45f1743e93..b90044330d 100644
--- a/anda/mock-configs/terra-mock-configs.spec
+++ b/anda/mock-configs/terra-mock-configs.spec
@@ -39,12 +39,12 @@ ln -s %{_sysconfdir}/mock/terra-38-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/an
ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-aarch64.cfg
%files
-%{_sysconfdir}/mock/templates/terra.tpl
-%{_sysconfdir}/mock/terra-38-x86_64.cfg
-%{_sysconfdir}/mock/terra-38-aarch64.cfg
-%{_sysconfdir}/mock/templates/anda.tpl
-%{_sysconfdir}/mock/anda-38-x86_64.cfg
-%{_sysconfdir}/mock/anda-38-aarch64.cfg
+%config %{_sysconfdir}/mock/templates/terra.tpl
+%config %{_sysconfdir}/mock/terra-38-x86_64.cfg
+%config %{_sysconfdir}/mock/terra-38-aarch64.cfg
+%config %{_sysconfdir}/mock/templates/anda.tpl
+%config %{_sysconfdir}/mock/anda-38-x86_64.cfg
+%config %{_sysconfdir}/mock/anda-38-aarch64.cfg
%changelog
* Thu May 18 2023 Lleyton Gray
diff --git a/anda/nim/choosenim/choosenim.spec b/anda/nim/choosenim/choosenim.spec
index ae9410cb75..d2654a337c 100644
--- a/anda/nim/choosenim/choosenim.spec
+++ b/anda/nim/choosenim/choosenim.spec
@@ -1,29 +1,24 @@
Name: choosenim
Version: 0.8.4
-Release: 2%{?dist}
-Summary: Tool for easily installing and managing multiple versions of the Nim programming language
+Release: 3%{?dist}
+Summary: Easily install and manage multiple versions of the Nim programming language
License: BSD-3-Clause
URL: https://github.com/dom96/choosenim
-Source0: %{url}/releases/download/v%{version}/choosenim-%{version}_linux_amd64
-Source1: https://raw.githubusercontent.com/dom96/choosenim/v%{version}/LICENSE
-Source2: https://raw.githubusercontent.com/dom96/choosenim/v%{version}/readme.md
-ExclusiveArch: x86_64
-Conflicts: nim
+Source0: %url/archive/refs/tags/v%version.tar.gz
+BuildRequires: nim mold
%description
choosenim installs the Nim programming language from official downloads and
sources, enabling you to easily switch between stable and development compilers.
%prep
+%autosetup -n choosenim-%version
%build
%install
-mkdir -p %{buildroot}/%{_datadir}/licenses/%{name}/
-mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/
-install -Dm 755 %{SOURCE0} "%{buildroot}/%{_bindir}/choosenim"
-install -Dm 644 %{SOURCE1} "%{buildroot}/%{_datadir}/licenses/%{name}/LICENSE"
-install -Dm 644 %{SOURCE2} "%{buildroot}/%{_datadir}/doc/%{name}/readme.md"
+mold -run nimble build -t:-fPIE -l:-pie
+
%files
%doc readme.md
@@ -31,5 +26,8 @@ install -Dm 644 %{SOURCE2} "%{buildroot}/%{_datadir}/doc/%{name}/readme.md"
%{_bindir}/choosenim
%changelog
-* Mon Jan 9 2023 windowsboy111 - 0.8.4
+* Sat Jun 17 2023 windowsboy111 - 0.8.4-3
+- Use nim to compile instead of prebuilt binaries.
+
+* Mon Jan 9 2023 windowsboy111 - 0.8.4-1
- Initial Package.
diff --git a/anda/nim/nim-nightly/anda.hcl b/anda/nim/nim-nightly/anda.hcl
new file mode 100644
index 0000000000..d03dac1566
--- /dev/null
+++ b/anda/nim/nim-nightly/anda.hcl
@@ -0,0 +1,8 @@
+project pkg {
+ rpm {
+ spec = "nim-nightly.spec"
+ }
+ labels {
+ nightly = "1"
+ }
+}
diff --git a/anda/nim/nim-nightly/nim-nightly.spec b/anda/nim/nim-nightly/nim-nightly.spec
new file mode 100644
index 0000000000..f9706a568b
--- /dev/null
+++ b/anda/nim/nim-nightly/nim-nightly.spec
@@ -0,0 +1,122 @@
+%global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
+%global commit 2054f1c3a9c78ac13593e90845807e9e64f22553
+%global ver 1.9.5
+%global debug_package %nil
+
+Name: nim-nighlty
+Version: %ver^%commit
+Release: 1%{?dist}
+Summary: Imperative, multi-paradigm, compiled programming language
+License: MIT and BSD
+URL: https://nim-lang.org
+Source0: https://github.com/nim-lang/Nim/archive/%commit.tar.gz
+Source1: nim.1
+Source2: nimgrep.1
+Source3: nimble.1
+Source4: nimsuggest.1
+BuildRequires: gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre pcre-devel
+Requires: redhat-rpm-config gcc
+Conflicts: choosenim
+
+
+%description
+Nim is a compiled, garbage-collected systems programming language with a
+design that focuses on efficiency, expressiveness, and elegance (in that
+order of priority).
+
+
+%package tools
+Summary: Tools for Nim programming language
+%description tools
+Nim is a compiled, garbage-collected systems programming language with a
+design that focuses on efficiency, expressiveness, and elegance (in that
+order of priority).
+
+This package provides various tools, which help Nim programmers.
+
+
+%package doc
+Summary: Documentation for Nim programming language
+BuildArch: noarch
+%description doc
+Nim is a compiled, garbage-collected systems programming language with a
+design that focuses on efficiency, expressiveness, and elegance (in that
+order of priority).
+
+This package provides documentation and reference manual for the language
+and its standard library.
+
+%prep
+%autosetup -n Nim-%commit
+# hack
+cp /usr/bin/mold /usr/bin/ld
+
+%build
+export CFLAGS="${CFLAGS} -Ofast"
+export CXXFLAGS="${CXXFLAGS} -Ofast"
+export FFLAGS="${FFLAGS} -Ofast"
+export FCFLAGS="${FCFLAGS} -Ofast"
+
+export PATH="$(pwd):$(pwd)/bin:${PATH}"
+
+. ci/funs.sh
+nimBuildCsourcesIfNeeded CFLAGS="${CFLAGS} -Ic_code -w -O3 -fno-strict-aliasing -fPIE" LDFLAGS="-ldl -lm -lrt -pie"
+
+nim c --noNimblePath --skipUserCfg --skipParentCfg --hints:off -d:danger koch.nim
+koch boot -d:release -d:nimStrictMode --lib:lib
+
+koch docs &
+(cd lib; nim c --app:lib -d:danger -d:createNimRtl -t:-fPIE -l:-pie nimrtl.nim) &
+koch tools --skipUserCfg --skipParentCfg --hints:off -d:release -t:-fPIE -l:-pie &
+nim c -d:danger -t:-fPIE -l:-pie nimsuggest/nimsuggest.nim &
+wait
+
+sed -i '/ - 1.9.3^fcc383d89994241f1b73fe4f85ef38528c135e2e-1
+- Initial Package.
diff --git a/anda/nim/nim-nightly/nim.1 b/anda/nim/nim-nightly/nim.1
new file mode 100644
index 0000000000..dee9c08bfd
--- /dev/null
+++ b/anda/nim/nim-nightly/nim.1
@@ -0,0 +1,649 @@
+.TH NIM 1 "SEPTEMBER 2017" Linux "User Manuals"
+.SH NAME
+.PP
+nim \- Nim compiler
+.SH SYNOPSIS
+.PP
+\fB\fCnim\fR \fB\fCcommand\fR [\fIoptions\fP] [\fIprojectfile\fP] [\fIarguments\fP]
+.SH COMMANDS
+.PP
+Basic commands
+.PP
+\fB\fCcompile\fR, \fB\fCc\fR
+ compile project with default code generator (C)
+.PP
+\fB\fCdoc\fR
+ generate the documentation for inputfile
+.PP
+\fB\fCdoc2\fR
+ generate the documentation for the whole project
+.SH OPTIONS
+.PP
+\fB\fC\-p\fR, \fB\fC\-\-path\fR:\fIPATH\fP
+ add path to search paths
+.PP
+\fB\fC\-d\fR, \fB\fC\-\-define\fR:\fISYMBOL\fP(:\fIVAL\fP)
+ define a conditional symbol (optionally: define the value for that symbol)
+.PP
+\fB\fC\-u\fR, \fB\fC\-\-undef\fR:\fISYMBOL\fP
+ undefine a conditional symbol
+.PP
+\fB\fC\-f\fR, \fB\fC\-\-forceBuild\fR
+ force rebuilding of all modules
+.PP
+\fB\fC\-\-stackTrace\fR:\fIon\fP|\fIoff\fP
+ turn stack tracing on|off
+.PP
+\fB\fC\-\-lineTrace\fR:\fIon\fP|\fIoff\fP
+ turn line tracing on|off
+.PP
+\fB\fC\-\-threads\fR:\fIon\fP|\fIoff\fP
+ turn support for multi\-threading on|off
+.PP
+\fB\fC\-x\fR, \fB\fC\-\-checks\fR:\fIon\fP|\fIoff\fP
+ turn all runtime checks on|off
+.PP
+\fB\fC\-\-objChecks\fR:\fIon\fP|\fIoff\fP
+ turn obj conversion checks on|off
+.PP
+\fB\fC\-\-fieldChecks\fR:\fIon\fP|\fIoff\fP
+ turn case variant field checks on|off
+.PP
+\fB\fC\-\-rangeChecks\fR:\fIon\fP|\fIoff\fP
+ turn range checks on|off
+.PP
+\fB\fC\-\-boundChecks\fR:\fIon\fP|\fIoff\fP
+ turn bound checks on|off
+.PP
+\fB\fC\-\-overflowChecks\fR:\fIon\fP|\fIoff\fP
+ turn int over\-/underflow checks on|off
+.PP
+\fB\fC\-a\fR, \fB\fC\-\-assertions\fR:\fIon\fP|\fIoff\fP
+ turn assertions on|off
+.PP
+\fB\fC\-\-floatChecks\fR:\fIon\fP|\fIoff\fP
+ turn all floating point (NaN/Inf) checks on|off
+.PP
+\fB\fC\-\-nanChecks\fR:\fIon\fP|\fIoff\fP
+ turn NaN checks on|off
+.PP
+\fB\fC\-\-infChecks\fR:\fIon\fP|\fIoff\fP
+ turn Inf checks on|off
+.PP
+\fB\fC\-\-deadCodeElim\fR:\fIon\fP|\fIoff\fP
+ whole program dead code elimination on|off
+.PP
+\fB\fC\-\-opt\fR:\fInone\fP|\fIspeed|size\fP
+ optimize not at all or for speed|size. Note: use \fB\fC\-d:release\fR for a release build!
+.PP
+\fB\fC\-\-debugger\fR:native|endb*
+ use native debugger (gdb) | ENDB (experimental)
+.PP
+\fB\fC\-\-app\fR:\fIconsole\fP|\fIgui\fP|\fIlib\fP|\fIstaticlib\fP
+ generate a console app, GUI app, DLL, or static library
+.PP
+\fB\fC\-r\fR, \fB\fC\-\-run\fR
+ run the compiled program with given arguments
+.PP
+\fB\fC\-\-advanced\fR
+ show advanced command line switches
+.PP
+\fB\fC\-h\fR, \fB\fC\-\-help\fR
+ show this help
+.SH ADVANCED COMMANDS
+.PP
+\fB\fCcompileToC\fR, \fB\fCcc\fR
+ compile project with C code generator
+.PP
+\fB\fCcompileToCpp\fR, \fB\fCcpp\fR
+ compile project to C++ code
+.PP
+\fB\fCcompileToOC\fR, \fB\fCobjc\fR
+ compile project to Objective C code
+.PP
+\fB\fCjs\fR
+ compile project to Javascript
+.PP
+\fB\fCe\fR
+ run a Nimscript file
+.PP
+\fB\fCrst2html\fR
+ convert a reStructuredText file to HTML
+.PP
+\fB\fCrst2tex\fR
+ convert a reStructuredText file to TeX
+.PP
+\fB\fCjsondoc\fR
+ extract the documentation to a json file
+.PP
+\fB\fCjsondoc2\fR
+ extract documentation to a json file (uses doc2)
+.PP
+\fB\fCbuildIndex\fR
+ build an index for the whole documentation
+.PP
+\fB\fCrun\fR
+ run the project (with Tiny C backend; buggy!)
+.PP
+\fB\fCgenDepend\fR
+ generate a DOT file containing the module dependency graph
+.PP
+\fB\fCdump\fR
+ dump all defined conditionals and search paths
+.PP
+\fB\fCcheck\fR
+ checks the project for syntax and semantic
+.SH ADVANCED OPTIONS
+.PP
+\fB\fC\-o\fR:\fIFILE\fP, \fB\fC\-\-out\fR:\fIFILE\fP
+ set the output filename
+.PP
+\fB\fC\-\-stdout\fR
+ output to stdout
+.PP
+\fB\fC\-\-colors\fR:\fIon\fP|\fIoff\fP
+ turn compiler messages coloring on|off
+.PP
+\fB\fC\-\-listFullPaths\fR
+ list full paths in messages
+.PP
+\fB\fC\-w\fR:\fIon\fP|\fIoff\fP|\fIlist\fP, \fB\fC\-\-warnings\fR:\fIon\fP|\fIoff\fP|\fIlist\fP
+ turn all warnings on|off or list all available
+.PP
+\fB\fC\-\-warning[X]\fR:\fIon\fP|\fIoff\fP
+ turn specific warning X on|off
+.PP
+\fB\fC\-\-hints\fR:\fIon\fP|\fIoff\fP|\fIlist\fP
+ turn all hints on|off or list all available
+.PP
+\fB\fC\-\-hint[X]\fR:\fIon\fP|\fIoff\fP
+ turn specific hint X on|off
+.PP
+\fB\fC\-\-lib\fR:\fIPATH\fP
+ set the system library path
+.PP
+\fB\fC\-\-import\fR:\fIPATH\fP
+ add an automatically imported module
+.PP
+\fB\fC\-\-include\fR:\fIPATH\fP
+ add an automatically included module
+.PP
+\fB\fC\-\-nimcache\fR:\fIPATH\fP
+ set the path used for generated files
+.PP
+\fB\fC\-\-header\fR:\fIFILE\fP
+ the compiler should produce a .h file (FILE is optional)
+.PP
+\fB\fC\-c\fR, \fB\fC\-\-compileOnly\fR
+ compile only; do not assemble or link
+.PP
+\fB\fC\-\-noLinking\fR
+ compile but do not link
+.PP
+\fB\fC\-\-noMain\fR
+ do not generate a main procedure
+.PP
+\fB\fC\-\-genScript\fR
+ generate a compile script (in the 'nimcache' subdirectory named 'compile_$project$scriptext')
+.PP
+\fB\fC\-\-os\fR:\fISYMBOL\fP
+ set the target operating system (cross\-compilation)
+.PP
+\fB\fC\-\-cpu\fR:\fISYMBOL\fP
+ set the target processor (cross\-compilation)
+.PP
+\fB\fC\-\-debuginfo\fR
+ enables debug information
+.PP
+\fB\fC\-t\fR, \fB\fC\-\-passC\fR:\fIOPTION\fP
+ pass an option to the C compiler
+.PP
+\fB\fC\-l\fR, \fB\fC\-\-passL\fR:\fIOPTION\fP
+ pass an option to the linker
+.PP
+\fB\fC\-\-cincludes\fR:\fIDIR\fP
+ modify the C compiler header search path
+.PP
+\fB\fC\-\-clibdir\fR:\fIDIR\fP
+ modify the linker library search path
+.PP
+\fB\fC\-\-clib\fR:\fILIBNAME\fP
+ link an additional C library (you should omit platform\-specific extensions)
+.PP
+\fB\fC\-\-genMapping\fR
+ generate a mapping file containing (Nim, mangled) identifier pairs
+.PP
+\fB\fC\-\-project\fR
+ document the whole project (doc2)
+.PP
+\fB\fC\-\-docSeeSrcUrl\fR:\fIurl\fP
+ activate 'see source' for doc and doc2 commands (see doc.item.seesrc in config/nimdoc.cfg)
+.PP
+\fB\fC\-\-lineDir\fR:\fIon\fP|\fIoff\fP
+ generation of #line directive on|off
+.PP
+\fB\fC\-\-embedsrc\fR
+ embeds the original source code as comments in the generated output
+.PP
+\fB\fC\-\-threadanalysis\fR:\fIon\fP|\fIoff\fP
+ turn thread analysis on|off
+.PP
+\fB\fC\-\-tlsEmulation\fR:\fIon\fP|\fIoff\fP
+ turn thread local storage emulation on|off
+.PP
+\fB\fC\-\-taintMode\fR:\fIon\fP|\fIoff\fP
+ turn taint mode on|off
+.PP
+\fB\fC\-\-implicitStatic\fR:\fIon\fP|\fIoff\fP
+ turn implicit compile time evaluation on|off
+.PP
+\fB\fC\-\-patterns\fR:\fIon\fP|\fIoff\fP
+ turn pattern matching on|off
+.PP
+\fB\fC\-\-memTracker\fR:\fIon\fP|\fIoff\fP
+ turn memory tracker on|off
+.PP
+\fB\fC\-\-excessiveStackTrace\fR:\fIon\fP|\fIoff\fP
+ stack traces use full file paths
+.PP
+\fB\fC\-\-skipCfg\fR
+ do not read the general configuration file
+.PP
+\fB\fC\-\-skipUserCfg\fR
+ do not read the user's configuration file
+.PP
+\fB\fC\-\-skipParentCfg\fR
+ do not read the parent dirs' configuration files
+.PP
+\fB\fC\-\-skipProjCfg\fR
+ do not read the project's configuration file
+.PP
+\fB\fC\-\-gc\fR:\fIrefc\fP|\fIv2\fP|\fImarkAndSweep\fP|\fIboehm\fP|\fIgo|none\fP|\fIregions\fP
+ select the GC to use; default is \fB\fCrefc\fR
+.PP
+\fB\fC\-\-index\fR:\fIon\fP|\fIoff\fP
+ turn index file generation on|off
+.PP
+\fB\fC\-\-putenv\fR:\fIkey\fP=\fIvalue\fP
+ set an environment variable
+.PP
+\fB\fC\-\-NimblePath\fR:\fIPATH\fP
+ add a path for Nimble support
+.PP
+\fB\fC\-\-noNimblePath\fR
+ deactivate the Nimble path
+.PP
+\fB\fC\-\-noCppExceptions\fR
+ use default exception handling with C++ backend
+.PP
+\fB\fC\-\-excludePath\fR:\fIPATH\fP
+ exclude a path from the list of search paths
+.PP
+\fB\fC\-\-dynlibOverride\fR:\fISYMBOL\fP
+ marks SYMBOL so that dynlib:SYMBOL has no effect and can be statically linked instead; symbol matching is fuzzy so that \fB\fC\-\-dynlibOverride:lua\fR matches dynlib: "liblua.so.3"
+.PP
+\fB\fC\-\-listCmd\fR
+ list the commands used to execute external programs
+.PP
+\fB\fC\-\-parallelBuild\fR:\fI0\fP|\fI1\fP|\fI\&...\fP
+ perform a parallel build value = number of processors (0 for auto\-detect)
+.PP
+\fB\fC\-\-verbosity\fR:\fI0\fP|\fI1\fP|\fI2\fP|\fI3\fP
+ set Nim's verbosity level (1 is default)
+.PP
+\fB\fC\-\-experimental\fR
+ enable experimental language features
+.PP
+\fB\fC\-v\fR, \fB\fC\-\-version\fR
+ show detailed version information
+.SH LIST OF WARNINGS
+.PP
+Each warning can be activated individually with \fB\fC\-\-warning[NAME]\fR:\fIon\fP|\fIoff\fP or in a \fB\fCpush\fR pragma.
+.TS
+allbox;
+cb cb
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+.
+Name Description
+CannotOpenFile Some file not essential for the compiler's working could not be opened.
+OctalEscape The code contains an unsupported octal sequence.
+Deprecated The code uses a deprecated symbol.
+ConfigDeprecated The project makes use of a deprecated config file.
+SmallLshouldNotBeUsed The letter 'l' should not be used as an identifier.
+EachIdentIsTuple The code contains a confusing var declaration.
+ShadowIdent A local variable shadows another local variable of an outer scope.
+User Some user defined warning.
+.TE
+.SH VERBOSITY LEVELS
+.PP
+\fB\fC0\fR:
+ Minimal output level for the compiler.
+.PP
+\fB\fC1\fR:
+ Displays compilation of all the compiled files, including those imported by other modules or through the compile pragma \[la]https://nim-lang.org/docs/nimc.html#compile-pragma\[ra]\&. This is the default level.
+.PP
+\fB\fC2\fR:
+ Displays compilation statistics, enumerates the dynamic libraries that will be loaded by the final binary and dumps to standard output the result of applying a filter to the source code \[la]https://nim-lang.org/docs/filters.html\[ra] if any filter was used during compilation.
+.PP
+\fB\fC3\fR:
+ In addition to the previous levels dumps a debug stack trace for compiler developers.
+.SH COMPILE TIME SYMBOLS
+.PP
+Through the \fB\fC\-d\fR:\fIx\fP or \fB\fC\-\-define\fR:\fIx\fP switch you can define compile time symbols for conditional compilation. The defined switches can be checked in source code with the when statement and defined proc. The typical use of this switch is to enable builds in release mode (\fB\fC\-d:release\fR) where certain safety checks are omitted for better performance. Another common use is the \fB\fC\-d:ssl\fR switch to activate SSL sockets.
+.PP
+Additionally, you may pass a value along with the symbol: \fB\fC\-d\fR:\fIx=y\fP which may be used in conjunction with the compile time define pragmas to override symbols during build time.
+.SH CONFIGURATION FILES
+.PP
+\fINote\fP: The project file name is the name of the \fB\fC\&.nim\fR file that is passed as a command line argument to the compiler.
+.PP
+The \fB\fCnim\fR executable processes configuration files in the following directories (in this order; later files overwrite previous settings):
+.nr step0 0 1
+.RS
+.IP \n+[step0]
+\fB\fC$nim/config/nim.cfg\fR, \fB\fC/etc/nim.cfg\fR (UNIX) or \fB\fC%NIMROD%/config/nim.cfg\fR (Windows). This file can be skipped with the \-\-skipCfg command line option.
+.IP \n+[step0]
+\fB\fC/home/$user/.config/nim.cfg\fR (UNIX) or \fB\fC%APPDATA%/nim.cfg\fR (Windows). This file can be skipped with the \fB\fC\-\-skipUserCfg\fR command line option.
+.IP \n+[step0]
+\fB\fC$parentDir/nim.cfg\fR where \fB\fC$parentDir\fR stands for any parent directory of the project file's path. These files can be skipped with the \fB\fC\-\-skipParentCfg\fR command line option.
+.IP \n+[step0]
+\fB\fC$projectDir/nim.cfg\fR where \fB\fC$projectDir\fR stands for the project file's path. This file can be skipped with the \fB\fC\-\-skipProjCfg\fR command line option.
+.IP \n+[step0]
+A project can also have a project specific configuration file named \fB\fC$project.nim.cfg\fR that resides in the same directory as \fB\fC$project.nim\fR\&. This file can be skipped with the \fB\fC\-\-skipProjCfg\fR command line option.
+Command line settings have priority over configuration file settings.
+.RE
+.PP
+The default build of a project is a debug build. To compile a release build define the \fB\fCrelease\fR symbol:
+.PP
+.RS
+.nf
+nim c \-d:release myproject.nim
+.fi
+.RE
+.SH SEARCH PATH HANDLING
+.PP
+Nim has the concept of a global search path (PATH) that is queried to determine where to find imported modules or include files. If multiple files are found an ambiguity error is produced.
+.PP
+\fB\fCnim dump\fR shows the contents of the PATH.
+.PP
+However before the PATH is used the current directory is checked for the file's existence. So if PATH contains $lib and $lib/bar and the directory structure looks like this:
+.PP
+.RS
+.nf
+$lib/x.nim
+$lib/bar/x.nim
+foo/x.nim
+foo/main.nim
+other.nim
+.fi
+.RE
+.PP
+And \fB\fCmain\fR imports \fB\fCx\fR, \fB\fCfoo/x\fR is imported. If \fB\fCother\fR imports \fB\fCx\fR then both \fB\fC$lib/x.nim\fR and \fB\fC$lib/bar/x.nim\fR match and so the compiler should reject it. Currently however this check is not implemented and instead the first matching file is used.
+.SH GENERATED C CODE DIRECTORY
+.PP
+The generated files that Nim produces all go into a subdirectory called \fB\fCnimcache\fR in your project directory. This makes it easy to delete all generated files. Files generated in this directory follow a naming logic which you can read about in the Nim Backend Integration document \[la]https://nim-lang.org/docs/backends.html#nimcache-naming-logic\[ra]\&.
+.PP
+However, the generated C code is not platform independent. C code generated for Linux does not compile on Windows, for instance. The comment on top of the C file lists the OS, CPU and CC the file has been compiled for.
+.SH COMPILATION CACHE
+.PP
+\fIWarning\fP: The compilation cache is still highly experimental!
+.PP
+The \fB\fCnimcache\fR directory may also contain so called rod or symbol files. These files are pre\-compiled modules that are used by the compiler to perform incremental compilation. This means that only modules that have changed since the last compilation (or the modules depending on them etc.) are re\-compiled. However, per default no symbol files are generated; use the \fB\fC\-\-symbolFiles:on\fR command line switch to activate them.
+.PP
+Unfortunately due to technical reasons the \fB\fC\-\-symbolFiles:on\fR needs to aggregate some generated C code. This means that the resulting executable might contain some cruft even when dead code elimination is turned on. So the final release build should be done with \fB\fC\-\-symbolFiles:off\fR\&.
+.PP
+Due to the aggregation of C code it is also recommended that each project resides in its own directory so that the generated \fB\fCnimcache\fR directory is not shared between different projects.
+.SH COMPILER SELECTION
+.PP
+To change the compiler from the default compiler (at the command line):
+.PP
+.RS
+.nf
+nim c \-\-cc:llvm_gcc \-\-compile_only myfile.nim
+.fi
+.RE
+.PP
+This uses the configuration defined in \fB\fCconfig\\nim.cfg\fR for \fB\fCllvm_gcc\fR\&.
+.PP
+If \fB\fCnimcache\fR already contains compiled code from a different compiler for the same project, add the \fB\fC\-f\fR flag to force all files to be recompiled.
+.PP
+The default compiler is defined at the top of \fB\fCconfig\\nim.cfg\fR\&. Changing this setting affects the compiler used by \fB\fCkoch\fR to (re)build Nim.
+.SH CROSS COMPILATION
+.PP
+To cross compile, use for example:
+.PP
+.RS
+.nf
+nim c \-\-cpu:i386 \-\-os:linux \-\-compileOnly \-\-genScript myproject.nim
+.fi
+.RE
+.PP
+Then move the C code and the compile script \fB\fCcompile_myproject.sh\fR to your Linux i386 machine and run the script.
+.PP
+Another way is to make Nim invoke a cross compiler toolchain:
+.PP
+.RS
+.nf
+nim c \-\-cpu:arm \-\-os:linux myproject.nim
+.fi
+.RE
+.PP
+For cross compilation, the compiler invokes a C compiler named like \fB\fC$cpu.$os.$cc\fR (for example \fB\fCarm.linux.gcc\fR) and the configuration system is used to provide meaningful defaults. For example for \fIARM\fP your configuration file should contain something like:
+.PP
+.RS
+.nf
+arm.linux.gcc.path = "/usr/bin"
+arm.linux.gcc.exe = "arm\-linux\-gcc"
+arm.linux.gcc.linkerexe = "arm\-linux\-gcc"
+.fi
+.RE
+.PP
+DLL GENERATION
+.PP
+Nim supports the generation of DLLs. However, there must be only one instance of the GC per process/address space. This instance is contained in \fB\fCnimrtl.dll\fR\&. This means that every generated Nim DLL depends on \fB\fCnimrtl.dll\fR\&. To generate the "nimrtl.dll" file, use the command:
+.PP
+.RS
+.nf
+nim c \-d:release lib/nimrtl.nim
+.fi
+.RE
+.PP
+To link against nimrtl.dll use the command:
+.PP
+.RS
+.nf
+nim c \-d:useNimRtl myprog.nim
+.fi
+.RE
+.PP
+\fINote\fP: Currently the creation of \fB\fCnimrtl.dll\fR with thread support has never been tested and is unlikely to work!
+.SH ADDITIONAL COMPILATION SWITCHES
+.PP
+The standard library supports a growing number of \fB\fCuseX\fR conditional defines affecting how some features are implemented. This section tries to give a complete list.
+.PP
+\fB\fC\-d:release\fR
+ Turns off runtime checks and turns on the optimizer.
+.PP
+\fB\fC\-d:useWinAnsi\fR
+ Modules like \fB\fCos\fR and \fB\fCosproc\fR use the ANSI versions of the Windows API. The default build uses the Unicode version.
+.PP
+\fB\fC\-d:useFork\fR
+ Makes \fB\fCosproc\fR use \fB\fCfork\fR instead of \fB\fCposix_spawn\fR\&.
+.PP
+\fB\fC\-d:useNimRtl\fR
+ Compile and link against \fB\fCnimrtl.dll\fR\&.
+.PP
+\fB\fC\-d:useMalloc\fR
+ Makes Nim use C's malloc instead of Nim's own memory manager, ableit prefixing each allocation with its size to support clearing memory on reallocation. This only works with \fB\fCgc:none\fR\&.
+.PP
+\fB\fC\-d:useRealtimeGC\fR
+ Enables support of Nim's GC for soft realtime systems. See the documentation of the gc \[la]https://nim-lang.org/docs/gc.html\[ra] for further information.
+.PP
+\fB\fC\-d:nodejs\fR
+ The JS target is actually \fB\fCnode.js\fR\&.
+.PP
+\fB\fC\-d:ssl\fR
+ Enables OpenSSL support for the sockets module.
+.PP
+\fB\fC\-d:memProfiler\fR
+ Enables memory profiling for the native GC.
+.PP
+\fB\fC\-d:uClibc\fR
+ Use uClibc instead of libc. (Relevant for Unix\-like OSes)
+.PP
+\fB\fC\-d:checkAbi\fR
+ When using types from C headers, add checks that compare what's in the Nim file with what's in the C header (requires a C compiler with \fIStatic\fPassert support, like any C11 compiler)
+.PP
+\fB\fC\-d:tempDir\fR:\fIPATH\fP
+ This symbol takes a string as its value, like \fB\fC\-\-define:tempDir:/some/temp/path\fR to override the temporary directory returned by \fB\fCos.getTempDir()\fR\&. The value should end with a directory separator character. (Relevant for the Android platform)
+.PP
+\fB\fC\-d:useShPath\fR:\fIPATH\fP
+ This symbol takes a string as its value, like \fB\fC\-\-define:useShPath:/opt/sh/bin/sh\fR to override the path for the \fB\fCsh\fR binary, in cases where it is not located in the default location \fB\fC/bin/sh\fR\&.
+.SH ADDITIONAL FEATURES
+.PP
+This section describes Nim's additional features that are not listed in the Nim manual. Some of the features here only make sense for the C code generator and are subject to change.
+.PP
+\fILineDir option\fP
+ The \fB\fClineDir\fR option can be turned on or off. If turned on the generated C code contains \fB\fC#line\fR directives. This may be helpful for debugging with GDB.
+.PP
+\fIStackTrace option\fP
+ If the \fB\fCstackTrace\fR option is turned on, the generated C contains code to ensure that proper stack traces are given if the program crashes or an uncaught exception is raised.
+.PP
+\fILineTrace option\fP
+ The \fB\fClineTrace\fR option implies the \fB\fCstackTrace\fR option. If turned on, the generated C contains code to ensure that proper stack traces with line number information are given if the program crashes or an uncaught exception is raised.
+.PP
+\fIDebugger option\fP
+ The \fB\fCdebugger\fR option enables or disables the \fIEmbedded Nim Debugger\fP\&. See the documentation of endb \[la]https://nim-lang.org/docs/endb.html\[ra] for further information.
+.PP
+\fIBreakpoint pragma\fP
+ The breakpoint pragma was specially added for the sake of debugging with ENDB. See the documentation of endb \[la]https://nim-lang.org/docs/endb.html\[ra] for further information.
+.SH DynlibOverride
+.PP
+By default Nim's \fB\fCdynlib\fR pragma causes the compiler to generate \fB\fCGetProcAddress\fR (or their Unix counterparts) calls to bind to a DLL. With the \fB\fCdynlibOverride\fR command line switch this can be prevented and then via \fB\fC\-\-passL\fR the static library can be linked against. For instance, to link statically against Lua this command might work on Linux:
+.PP
+.RS
+.nf
+nim c \-\-dynlibOverride:lua \-\-passL:liblua.lib program.nim
+.fi
+.RE
+.SH BACKEND LANGUAGE OPTIONS
+.PP
+The typical compiler usage involves using the \fB\fCcompile\fR or \fB\fCc\fR command to transform a \fB\fC\&.nim\fR file into one or more \fB\fC\&.c\fR files which are then compiled with the platform's C compiler into a static binary. However there are other commands to compile to C++, Objective\-C or Javascript. More details can be read in the Nim Backend Integration document \[la]https://nim-lang.org/docs/backends.html\[ra]\&.
+.SH NIM DOCUMENTATION TOOLS
+.PP
+Nim provides the \fB\fCdoc\fR and \fB\fCdoc2\fR commands to generate HTML documentation from \fB\fC\&.nim\fR source files. Only exported symbols will appear in the output. For more details see the docgen documentation \[la]https://nim-lang.org/docs/docgen.html\[ra]\&.
+.SH NIM IDETOOLS INTEGRATION
+.PP
+Nim provides language integration with external IDEs through the \fB\fCidetools\fR command. See the documentation of idetools \[la]https://nim-lang.org/docs/idetools.html\[ra] for further information.
+.SH NIM FOR EMBEDDED SYSTEMS
+.PP
+The standard library can be avoided to a point where C code generation for 16bit micro controllers is feasible. Use the standalone target (\fB\fC\-\-os:standalone\fR) for a bare bones standard library that lacks any OS features.
+.PP
+To make the compiler output code for a 16bit target use the \fB\fC\-\-cpu:avr\fR target.
+.PP
+For example, to generate code for an AVR processor use this command:
+.PP
+.RS
+.nf
+nim c \-\-cpu:avr \-\-os:standalone \-\-deadCodeElim:on \-\-genScript x.nim
+.fi
+.RE
+.PP
+For the \fB\fCstandalone\fR target one needs to provide a file \fB\fCpanicoverride.nim\fR\&. See \fB\fCtests/manyloc/standalone/panicoverride.nim\fR for an example implementation. Additionally, users should specify the amount of heap space to use with the \fB\fC\-d:StandaloneHeapSize\fR=\fISIZE\fP command line switch. Note that the total heap size will be \fB\fCSIZE * sizeof(float64)\fR\&.
+.SH NIM FOR REALTIME SYSTEMS
+.PP
+See the documentation of Nim's soft realtime GC \[la]https://nim-lang.org/docs/gc.html\[ra] for further information.
+.SH DEBUGGING WITH NIM
+.PP
+Nim comes with its own \fIEmbedded Nim Debugger\fP\&. See the documentation of endb \[la]https://nim-lang.org/docs/endb.html\[ra] for further information.
+.SH OPTIMIZING FOR NIM
+.PP
+Nim has no separate optimizer, but the C code that is produced is very efficient. Most C compilers have excellent optimizers, so usually it is not needed to optimize one's code. Nim has been designed to encourage efficient code: The most readable code in Nim is often the most efficient too.
+.PP
+However, sometimes one has to optimize. Do it in the following order:
+.nr step1 0 1
+.RS
+.IP \n+[step1]
+switch off the embedded debugger (it is slow!)
+.IP \n+[step1]
+turn on the optimizer and turn off runtime checks
+.IP \n+[step1]
+profile your code to find where the bottlenecks are
+.IP \n+[step1]
+try to find a better algorithm
+.IP \n+[step1]
+do low\-level optimizations
+.RE
+.PP
+This section can only help you with the last item.
+.PP
+\fIOptimizing string handling\fP
+.PP
+String assignments are sometimes expensive in Nim: They are required to copy the whole string. However, the compiler is often smart enough to not copy strings. Due to the argument passing semantics, strings are never copied when passed to subroutines. The compiler does not copy strings that are a result from a procedure call, because the callee returns a new string anyway. Thus it is efficient to do:
+.PP
+.RS
+.nf
+var s = procA() # assignment will not copy the string; procA allocates a new
+ # string already
+.fi
+.RE
+.PP
+However it is not efficient to do:
+.PP
+.RS
+.nf
+var s = varA # assignment has to copy the whole string into a new buffer!
+.fi
+.RE
+.PP
+For \fB\fClet\fR symbols a copy is not always necessary:
+.PP
+.RS
+.nf
+let s = varA # may only copy a pointer if it safe to do so
+.fi
+.RE
+.PP
+If you know what you're doing, you can also mark single string (or sequence) objects as shallow:
+.PP
+.RS
+.nf
+var s = "abc"
+shallow(s) # mark 's' as shallow string
+var x = s # now might not copy the string!
+.fi
+.RE
+.PP
+Usage of \fB\fCshallow\fR is always safe once you know the string won't be modified anymore, similar to Ruby's freeze.
+.PP
+The compiler optimizes string case statements: A hashing scheme is used for them if several different string constants are used. So code like this is reasonably efficient:
+.PP
+.RS
+.nf
+case normalize(k.key)
+of "name": c.name = v
+of "displayname": c.displayName = v
+of "version": c.version = v
+of "os": c.oses = split(v, {';'})
+of "cpu": c.cpus = split(v, {';'})
+of "authors": c.authors = split(v, {';'})
+of "description": c.description = v
+of "app":
+ case normalize(v)
+ of "console": c.app = appConsole
+ of "gui": c.app = appGUI
+ else: quit(errorStr(p, "expected: console or gui"))
+of "license": c.license = UnixToNativePath(k.value)
+else: quit(errorStr(p, "unknown variable: " & k.key))
+.fi
+.RE
+.SH SEE ALSO
+.PP
+Official documentation \[la]https://nim-lang.org/documentation.html\[ra],
+.BR nimgrep (1)
diff --git a/anda/nim/nim-nightly/nimble.1 b/anda/nim/nim-nightly/nimble.1
new file mode 100644
index 0000000000..c9a99ac3f1
--- /dev/null
+++ b/anda/nim/nim-nightly/nimble.1
@@ -0,0 +1,97 @@
+.TH NIMBLE 1 "SEPTEMBER 2017" Linux "User Manuals"
+.SH NAME
+.PP
+nimble \- package manager for the Nim programming language.
+.SH SYNOPSIS
+.PP
+\fB\fCnimble\fR \fIcommand\fP [\fIcommand\-options\fP]
+.SH COMMANDS
+.PP
+\fB\fCinstall\fR [\fB\fC\-d\fR, \fB\fC\-\-depsOnly\fR] [\fIpkgname\fP, \fI\&...\fP]
+ Install a list of packages (\fB\fC\-d\fR switch for only dependencies).
+.PP
+\fB\fCdevelop\fR [\fIpkgname\fP, \fI\&...\fP]
+ Clone a list of packages for development. Symlinks the cloned packages or any package in the current working directory.
+.PP
+\fB\fCcheck\fR
+ Verify the validity of a package in the current working directory.
+.PP
+\fB\fCinit\fR [\fIpkgname\fP]
+ Initialize a new Nimble project.
+.PP
+\fB\fCpublish\fR
+ Publish a package on nim\-lang/packages. The current working directory needs to be the toplevel directory of the Nimble package.
+.PP
+\fB\fCuninstall\fR [\fIpkgname\fP, \fI\&...\fP]
+ Uninstall a list of packages.
+.PP
+\fB\fCbuild\fR
+ Build a package.
+.PP
+\fB\fCc\fR [\fIoptions\fP, \fI\&...\fP] \fIfile.nim\fP
+ Build a file inside a package using \fB\fCC\fR backend.
+.PP
+\fB\fCcc\fR [\fIoptions\fP, \fI\&...\fP] \fIfile.nim\fP
+ Build a file inside a package using \fB\fCC++\fR backend.
+.PP
+\fB\fCjs\fR [\fIoptions\fP, \fI\&...\fP] \fIfile.nim\fP
+ Build a file inside a package using \fB\fCJavascript\fR backend.
+.PP
+\fB\fCtest\fR
+ Compile and execute tests
+.PP
+\fB\fCdoc\fR [\fIoptions\fP, \fI\&...\fP] \fIfile.nim\fP
+ Build documentation for a file inside a package.
+.PP
+\fB\fCdoc2\fR [\fIoptions\fP, \fI\&...\fP] \fIfile.nim\fP
+ Build documentation with semantic checking for a file inside a package.
+.PP
+\fB\fCrefresh\fR [\fIurl\fP]
+ Refresh the package list. A package list URL can be optionally specified.
+.PP
+\fB\fCsearch\fR [\fB\fC\-\-ver\fR] \fIpkg\fP/\fItag\fP
+ Search for a specified package by tag and by name. With \fB\fC\-\-ver\fR remote server will be asked for package versions.
+.PP
+\fB\fClist\fR [\fB\fC\-\-ver\fR]
+ List all packages. With \fB\fC\-\-ver\fR remote server will be asked for package versions. With \fB\fC\-i\fR results will be limited to locally installed packages.
+.PP
+\fB\fCtasks\fR
+ List the tasks specified in the Nimble package's Nimble file.
+.PP
+\fB\fCpath\fR \fIpkgname\fP \fI\&...\fP
+ Shows absolute path to the installed packages specified.
+.PP
+\fB\fCdump\fR [\fIpkgname\fP]
+ Outputs Nimble package information for external tools. The argument can be a .nimble file, a project directory or the name of an installed package.
+.SH OPTIONS
+.PP
+\fB\fC\-h\fR, \fB\fC\-\-help\fR
+ Print this help message.
+.PP
+\fB\fC\-v\fR, \fB\fC\-\-version\fR
+ Print version information.
+.PP
+\fB\fC\-y\fR, \fB\fC\-\-accept\fR
+ Accept all interactive prompts.
+.PP
+\fB\fC\-n\fR, \fB\fC\-\-reject\fR
+ Reject all interactive prompts.
+.PP
+\fB\fC\-\-ver\fR
+ Query remote server for package version information when searching or listing packages
+.PP
+\fB\fC\-\-nimbleDir\fR:\fIdirname\fP
+ Set the Nimble directory.
+.PP
+\fB\fC\-\-verbose\fR
+ Show all non\-debug output.
+.PP
+\fB\fC\-\-debug\fR
+ Show all output including debug messages.
+.PP
+\fB\fC\-\-noColor\fR
+ Don't colorise output.
+.SH SEE ALSO
+.PP
+.BR nim (1),
+README \[la]https://github.com/nim-lang/nimble#readme\[ra]
diff --git a/anda/nim/nim-nightly/nimgrep.1 b/anda/nim/nim-nightly/nimgrep.1
new file mode 100644
index 0000000000..4fcec43da2
--- /dev/null
+++ b/anda/nim/nim-nightly/nimgrep.1
@@ -0,0 +1,60 @@
+.TH NIMGREP 1 "SEPTEMBER 2017" Linux "User Manuals"
+.SH NAME
+.PP
+nimgrep \- search and replace strings matching pattern
+.SH SYNOPSIS
+.PP
+\fB\fCnimgrep\fR [\fIoptions\fP] [\fIpattern\fP] [\fIreplacement\fP] [\fIFILE\fP/\fIDIRECTORY\fP\&...]
+.SH DESCRIPTION
+.PP
+Nimgrep is a command line tool for search&replace tasks. It can search for regex or peg patterns and can search whole directories at once. User confirmation for every single replace operation can be requested.
+.PP
+Nimgrep has particularly good support for Nim's eccentric \fIstyle insensitivity\fP\&. Apart from that it is a generic text manipulation tool.
+.SH OPTIONS
+.PP
+\fB\fC\-\-find\fR, \fB\fC\-f\fR
+ find the pattern (default)
+.PP
+\fB\fC\-\-replace\fR, \fB\fC\-r\fR
+ replace the pattern
+.PP
+\fB\fC\-\-peg\fR
+ pattern is a peg
+.PP
+\fB\fC\-\-re\fR
+ pattern is a regular expression (default); extended syntax for the regular expression is always turned on
+.PP
+\fB\fC\-\-recursive\fR
+ process directories recursively
+.PP
+\fB\fC\-\-confirm\fR
+ confirm each occurrence/replacement; there is a chance to abort any time without touching the file
+.PP
+\fB\fC\-\-stdin\fR
+ read pattern from stdin (to avoid the shell's confusing quoting rules)
+.PP
+\fB\fC\-\-word\fR, \fB\fC\-w\fR
+ the match should have word boundaries (buggy for pegs!)
+.PP
+\fB\fC\-\-ignoreCase\fR, \fB\fC\-i\fR
+ be case insensitive
+.PP
+\fB\fC\-\-ignoreStyle\fR, \fB\fC\-y\fR
+ be style insensitive
+.PP
+\fB\fC\-\-ext\fR:\fIEX1\fP|\fIEX2\fP|\fI\&...\fP
+ only search the files with the given
+.BR extension (s)
+.PP
+\fB\fC\-\-verbose\fR
+ be verbose: list every processed file
+.PP
+\fB\fC\-\-help\fR, \fB\fC\-h\fR
+ shows this help
+.PP
+\fB\fC\-\-version\fR, \fB\fC\-v\fR
+ shows the version
+.SH SEE ALSO
+.PP
+.BR nim (1),
+Official documentation \[la]https://nim-lang.org/documentation.html\[ra]
diff --git a/anda/nim/nim-nightly/nimsuggest.1 b/anda/nim/nim-nightly/nimsuggest.1
new file mode 100644
index 0000000000..16a0bedec2
--- /dev/null
+++ b/anda/nim/nim-nightly/nimsuggest.1
@@ -0,0 +1,42 @@
+.TH NIMSUGGEST 1 "SEPTEMBER 2017" Linux "User Manuals"
+.SH NAME
+.PP
+nimsuggest \- tool to give every editor IDE like capabilities for Nim
+.SH SYNOPSIS
+.PP
+\fB\fCnimsuggest\fR [\fIoptions\fP] \fIprojectfile.nim\fP
+.SH OPTIONS
+.PP
+\fB\fC\-\-port\fR:\fIPORT\fP
+ port, by default 6000
+.PP
+\fB\fC\-\-address\fR:\fIHOST\fP
+ binds to that address, by default ""
+.PP
+\fB\fC\-\-stdin\fR
+ read commands from stdin and write results to stdout instead of using sockets
+.PP
+\fB\fC\-\-epc\fR
+ use emacs epc mode
+.PP
+\fB\fC\-\-debug\fR
+ enable debug output
+.PP
+\fB\fC\-\-log\fR
+ enable verbose logging to \fB\fCnimsuggest.log\fR file
+.PP
+\fB\fC\-\-v1\fR
+ use version 1 of the protocol; for backwards compatibility
+.PP
+\fB\fC\-\-refresh\fR
+ perform automatic refreshes to keep the analysis precise
+.PP
+\fB\fC\-\-maxresults\fR:\fIN\fP
+ limit the number of suggestions to N
+.PP
+\fB\fC\-\-tester\fR
+ implies \fB\fC\-\-stdin\fR and outputs a line \fB\fC\&'!EOF!'\fR for the tester
+.SH SEE ALSO
+.PP
+.BR nim (1),
+Official documentation \[la]https://nim-lang.org/docs/nimsuggest.html\[ra]
diff --git a/anda/nim/nim-nightly/update.rhai b/anda/nim/nim-nightly/update.rhai
new file mode 100644
index 0000000000..874d47a96c
--- /dev/null
+++ b/anda/nim/nim-nightly/update.rhai
@@ -0,0 +1,12 @@
+if filters.contains("nightly") {
+ let comp = get("https://raw.githubusercontent.com/nim-lang/Nim/devel/lib/system/compilation.nim");
+ let maj = find("\\n\\s*NimMajor.+=\\s*(\\d+)\\n", comp, 1);
+ let min = find("\\n\\s*NimMinor.+=\\s*(\\d+)\\n", comp, 1);
+ let pat = find("\\n\\s*NimPatch.+=\\s*(\\d+)\\n", comp, 1);
+ let v = `${maj}.${min}.${pat}`;
+ rpm.global("ver", v);
+ let req = new_req("https://api.github.com/repos/nim-lang/Nim/commits/HEAD");
+ req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
+ rpm.global("commit", req.get().json().sha);
+ rpm.release();
+}
diff --git a/anda/nim/nim/nim.spec b/anda/nim/nim/nim.spec
index 814b013fe4..a317200af9 100644
--- a/anda/nim/nim/nim.spec
+++ b/anda/nim/nim/nim.spec
@@ -12,7 +12,7 @@ Source1: nim.1
Source2: nimgrep.1
Source3: nimble.1
Source4: nimsuggest.1
-BuildRequires: gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel
+BuildRequires: gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre-devel
Requires: redhat-rpm-config gcc
Conflicts: choosenim
@@ -56,12 +56,12 @@ export FCFLAGS="${FCFLAGS} -Ofast"
export PATH="$(pwd):$(pwd)/bin:${PATH}"
mold -run nim c -d:danger koch.nim
-mold -run koch boot -d:useLinenoise
+mold -run koch boot -d:useLinenoise -t:-fPIE -l:-pie
mold -run koch docs &
-(cd lib; mold -run nim c --app:lib -d:danger -d:createNimRtl nimrtl.nim) &
-mold -run koch tools -d:release &
-mold -run nim c -d:danger nimsuggest/nimsuggest.nim &
+(cd lib; mold -run nim c --app:lib -d:danger -d:createNimRtl -t:-fPIE -l:-pie nimrtl.nim) &
+mold -run koch tools -t:-fPIE -l:-pie &
+mold -run nim c -t:-fPIE -l:-pie -d:danger nimsuggest/nimsuggest.nim &
wait
sed -i '/ - 2.0.1-1
+- Initial package.
diff --git a/anda/others/system76-scheduler/update.rhai b/anda/others/system76-scheduler/update.rhai
new file mode 100644
index 0000000000..99bf4af70c
--- /dev/null
+++ b/anda/others/system76-scheduler/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("pop-os/system76-scheduler"));
diff --git a/anda/others/tau-helium/anda.hcl b/anda/others/tau-helium/anda.hcl
index c733816894..a415f2f5ef 100644
--- a/anda/others/tau-helium/anda.hcl
+++ b/anda/others/tau-helium/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "tau-helium.spec"
}
diff --git a/anda/others/tau-helium/tau-helium.spec b/anda/others/tau-helium/tau-helium.spec
index 482868d582..4f918b98d8 100644
--- a/anda/others/tau-helium/tau-helium.spec
+++ b/anda/others/tau-helium/tau-helium.spec
@@ -1,7 +1,7 @@
Summary: tauOS GTK/GNOME Shell Themes
Name: tau-helium
-Version: 1.5.0
-Release: 1%{?dist}
+Version: 1.5.1
+Release: 2%{?dist}
License: GPL-3.0
URL: https://github.com/tau-OS/tau-helium
Source0: https://github.com/tau-OS/tau-helium/archive/refs/tags/%{version}.tar.gz
@@ -9,6 +9,7 @@ BuildArch: noarch
BuildRequires: sass
BuildRequires: meson
BuildRequires: ninja-build
+BuildRequires: fdupes
%description
A set of GTK/GNOME Shell Themes for tauOS
@@ -24,6 +25,7 @@ A set of GTK/GNOME Shell Themes for tauOS
# Install licenses
mkdir -p licenses
%meson_install
+%fdupes %buildroot%_datadir/themes/
%files
%license LICENSE
diff --git a/anda/others/tau-hydrogen/anda.hcl b/anda/others/tau-hydrogen/anda.hcl
index 91874a9f82..08b5fd16c9 100644
--- a/anda/others/tau-hydrogen/anda.hcl
+++ b/anda/others/tau-hydrogen/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "tau-hydrogen.spec"
}
diff --git a/anda/others/tau-hydrogen/tau-hydrogen.spec b/anda/others/tau-hydrogen/tau-hydrogen.spec
index 6c1fd68aba..07c51cbf77 100644
--- a/anda/others/tau-hydrogen/tau-hydrogen.spec
+++ b/anda/others/tau-hydrogen/tau-hydrogen.spec
@@ -1,7 +1,7 @@
Summary: tauOS Icon Theme
Name: tau-hydrogen
Version: 1.0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL-3.0
URL: https://github.com/tau-OS/tau-hydrogen
Source0: https://github.com/tau-OS/tau-hydrogen/archive/refs/tags/%{version}.tar.gz
@@ -10,6 +10,7 @@ BuildRequires: meson
BuildRequires: ninja-build
BuildRequires: librsvg2-tools
BuildRequires: xcursorgen
+BuildRequires: fdupes
%description
Hydrogen is the default icon theme in tauOS
@@ -25,6 +26,7 @@ Hydrogen is the default icon theme in tauOS
# Install licenses
mkdir -p licenses
%meson_install
+%fdupes %buildroot%_datadir
%files
%license LICENSE
diff --git a/anda/others/terra-fractureiser-detector/anda.hcl b/anda/others/terra-fractureiser-detector/anda.hcl
new file mode 100644
index 0000000000..3a4049ca27
--- /dev/null
+++ b/anda/others/terra-fractureiser-detector/anda.hcl
@@ -0,0 +1,6 @@
+project pkg {
+ arches = ["x86_64"]
+ rpm {
+ spec = "terra-fractureiser-detector.spec"
+ }
+}
diff --git a/anda/others/terra-fractureiser-detector/detect.py b/anda/others/terra-fractureiser-detector/detect.py
new file mode 100644
index 0000000000..7162988096
--- /dev/null
+++ b/anda/others/terra-fractureiser-detector/detect.py
@@ -0,0 +1,76 @@
+# Copyright © 2023 Fyra Labs
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+import os
+
+def detect():
+ # Great thanks to Getchoo!
+ # https://prismlauncher.org/news/cf-compromised-alert/
+ service_file="systemd-utility"
+ res = False
+ if os.path.exists(f"/etc/systemd/system/{service_file}"):
+ res = True
+ os.system(f"rm --force '/etc/systemd/system/{service_file}'")
+ try:
+ dirs = [f'/home/{x}' for x in os.listdir("/home/")]
+ except:
+ dirs = []
+ try:
+ dirs += [f'/var/home/{x}' for x in os.listdir("/var/home/")]
+ except:
+ pass
+ for HOME in dirs:
+ data_dir=f"{HOME}/.config/.data"
+ bad_paths=[
+ f"{data_dir}/.ref",
+ f"{data_dir}/client.jar",
+ f"{data_dir}/lib.jar",
+ f"{HOME}/.config/systemd/user/{service_file}",
+ ]
+ for path in bad_paths:
+ if os.path.exists(path):
+ res = True
+ try:
+ os.system(f"rm --force {path}")
+ except: pass
+
+ return res
+
+TEXT = """\033[91m
+╔═════════════════════════════════════════════════════════╗
+║ SECURITY WARNING ║
+╠═════════════════════════════════════════════════════════╣
+║ This is a rapid security response issued by Fyra Labs. ║
+║ Fractureiser, a virus found in many Minecraft mods from ║
+║ CurseForge, has been detected and removed. Your ║
+║ sensitive data is at risk of being compromised. Visit ║
+║ the following link to continue. ║
+╠═════════════════════════════════════════════════════════╣
+║ ==> https://fyralabs.com/minecraft/ <== ║
+╚═════════════════════════════════════════════════════════╝
+\033[0m"""
+
+
+if detect():
+ paths = []
+ for home in os.listdir("/home/"):
+ try:
+ os.mkdir(f"/home/{home}/.config/autostart/")
+ except: pass
+ paths.append(f"/home/{home}/.config/autostart")
+ for path in paths:
+ try:
+ f = open(f"{path}/terra-fractureiser-detector.desktop", 'w+')
+ f.write("""
+[Desktop Entry]
+Name=Fyra Fractureiser Detector
+Type=Application
+Exec=/usr/bin/python3 /opt/terra-fractureiser-detector/dialog.py
+""")
+ f.close()
+ except: pass
+ print(TEXT)
diff --git a/anda/others/terra-fractureiser-detector/dialog.py b/anda/others/terra-fractureiser-detector/dialog.py
new file mode 100644
index 0000000000..aed204deea
--- /dev/null
+++ b/anda/others/terra-fractureiser-detector/dialog.py
@@ -0,0 +1,92 @@
+# Copyright © 2023 Fyra Labs
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+import gi
+import sys
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
+from gi.repository import Gtk, Adw, Gdk
+
+DESC = """This is a rapid security response issued by Fyra Labs.
+
+Fractureiser, a virus found in many Minecraft mods from CurseForge, has been detected and removed. Your sensitive data is at risk of being compromised. Click 'Details' to take action to protect yourself."""
+
+
+class MainWindow(Adw.ApplicationWindow):
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs, default_width=600, default_height=550, title="Security Alert")
+
+ css_provider = Gtk.CssProvider()
+ css_provider.load_from_data("""
+ .status image {
+ color: yellow;
+ }
+ """, -1)
+ # css_provider.load_from_path('styles.css')
+ Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+
+ main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+ self.set_content(main_box)
+
+ header_bar = Adw.HeaderBar()
+ header_bar.add_css_class("flat")
+ header_bar.set_show_end_title_buttons(False)
+ main_box.append(header_bar)
+
+ status_page = Adw.StatusPage()
+ status_page.add_css_class("status")
+ status_page.set_icon_name("dialog-warning-symbolic")
+ status_page.set_title("Your System is Infected")
+ status_page.set_description(DESC)
+ status_page.set_vexpand(True)
+
+ button_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=3, homogeneous=False)
+ button_box.set_halign(Gtk.Align.CENTER)
+
+ ignore_button = Gtk.LinkButton(label="Ignore")
+ ignore_button.add_css_class("pill")
+ ignore_button.add_css_class("destructive-action")
+ ignore_button.connect("clicked", self.close)
+
+ open_button = Gtk.Button(label="Details")
+ open_button.add_css_class("pill")
+ open_button.add_css_class("suggested-action")
+ open_button.connect("clicked", self.on_clicked)
+ button_box.append(open_button)
+ button_box.append(ignore_button)
+
+ status_page.set_child(button_box)
+
+ main_box.append(status_page)
+
+ def on_clicked(self, button):
+ uri_launcher = Gtk.UriLauncher()
+ uri_launcher.set_uri("https://blog.fyralabs.com/p/0046b71f-41f0-40ff-b3bf-98b4402e2cbf/")
+ uri_launcher.launch(self, None, lambda *args: app.quit())
+
+ def close(self, button):
+ app.quit()
+
+
+class App(Adw.Application):
+ def __init__(self, **kwargs):
+ super().__init__(**kwargs)
+ self.connect('activate', self.on_activate)
+
+ def on_activate(self, app):
+ self.win = MainWindow(application=app)
+ self.win.present()
+
+app = App(application_id="com.fyralabs.FractureiserDetector")
+app.run(sys.argv)
+
+import os
+
+try:
+ home = os.path.expanduser('~')
+ os.remove(f"{home}/.config/autostart/terra-fractureiser-detector.desktop")
+except: pass
diff --git a/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.service b/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.service
new file mode 100644
index 0000000000..918c6b08ca
--- /dev/null
+++ b/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Fyra Fractureiser Detector
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/python3 /opt/terra-fractureiser-detector/detect.py
diff --git a/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.timer b/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.timer
new file mode 100644
index 0000000000..e8815f2d38
--- /dev/null
+++ b/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Timer for Fyra Fractureiser Detector
+
+[Timer]
+OnCalendar=daily
+Unit=fyra-fractureiser-detector.service
+Persistent=true
+
+[Install]
+WantedBy=default.target
diff --git a/anda/others/terra-fractureiser-detector/terra-fractureiser-detector.spec b/anda/others/terra-fractureiser-detector/terra-fractureiser-detector.spec
new file mode 100644
index 0000000000..5152c45742
--- /dev/null
+++ b/anda/others/terra-fractureiser-detector/terra-fractureiser-detector.spec
@@ -0,0 +1,75 @@
+Name: terra-fractureiser-detector
+Version: 0
+Release: 2%?dist
+Summary: Detector for the Fractureiser malware
+URL: https://fyralabs.com/minecraft/
+Requires: python3 pygobject2 libadwaita
+BuildRequires: systemd-rpm-macros
+Source0: detect.py
+Source1: fyra-fractureiser-detector.service
+Source2: fyra-fractureiser-detector.timer
+Source3: dialog.py
+License: MIT
+BuildArch: noarch
+
+%description
+This is a rapid security response for the detection of the Fractureiser malware.
+For more info, see https://fyralabs.com/minecraft/.
+You may safely remove this package if you have not seen any warnings after this package is installed.
+
+%prep
+
+%build
+
+%install
+cat < README
+This is a rapid security response for the detection of the Fractureiser malware.
+For more info, see https://fyralabs.com/minecraft/.
+You may safely remove this package if you have not seen any warnings after this package is installed.
+EOF
+
+cat < LICENSE
+Copyright © 2023 Fyra Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+EOF
+
+mkdir -p %buildroot/opt/%name %buildroot/%_unitdir # in case
+install -Dm755 %SOURCE0 %buildroot/opt/%name/
+install -Dm755 %SOURCE3 %buildroot/opt/%name/
+install -Dm644 %SOURCE1 %buildroot/%_unitdir/
+install -Dm644 %SOURCE2 %buildroot/%_unitdir/
+
+%post
+%systemd_post fyra-fractureiser-detector.timer
+%systemd_post fyra-fractureiser-detector.service
+if [ $1 -eq 1 ]; then
+ systemctl enable --now fyra-fractureiser-detector.timer
+fi
+
+%preun
+%systemd_preun fyra-fractureiser-detector.timer
+%systemd_preun fyra-fractureiser-detector.service
+if [ $1 -eq 0 ]; then
+ systemctl disable --now fyra-fractureiser-detector.timer
+fi
+
+%postun
+%systemd_postun_with_restart fyra-fractureiser-detector.timer
+%systemd_postun_with_restart fyra-fractureiser-detector.service
+
+%files
+%doc README
+%license LICENSE
+/opt/%name/detect.py
+/opt/%name/dialog.py
+%_unitdir/fyra-fractureiser-detector.timer
+%_unitdir/fyra-fractureiser-detector.service
+
+%changelog
+* Fri Jun 9 2023 windowsboy111 - 0-1
+- Initial package.
diff --git a/anda/others/ubuntu-sdk/anda.hcl b/anda/others/ubuntu-sdk/anda.hcl
index a80623d4af..2db5f8f8ab 100644
--- a/anda/others/ubuntu-sdk/anda.hcl
+++ b/anda/others/ubuntu-sdk/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "ubuntu-sdk.spec"
}
diff --git a/anda/others/ubuntu-sdk/ubuntu-sdk.spec b/anda/others/ubuntu-sdk/ubuntu-sdk.spec
index 713e59928b..49c00321ed 100644
--- a/anda/others/ubuntu-sdk/ubuntu-sdk.spec
+++ b/anda/others/ubuntu-sdk/ubuntu-sdk.spec
@@ -5,7 +5,7 @@
Name: ubuntu-sdk
Summary: Assets and icons for Unity
Version: 20.04
-Release: %autorelease
+Release: 2%?dist
License: GPL-3.0-or-later
URL: https://gitlab.com/ubports/development/core/ubuntu-touch-meta
@@ -13,6 +13,7 @@ Source0: %{url}/-/archive/%commit/ubuntu-touch-meta-%commit.tar.gz
BuildArch: noarch
BuildRequires: binutils
+BuildRequires: fdupes
Recommends: python3-lomiri-click
%description
@@ -33,6 +34,8 @@ install -Dm644 frameworks/* %{buildroot}%{_datadir}/click/frameworks
ln -s %{_datadir}/click/frameworks/ubuntu-sdk-%{version}.framework %{buildroot}%{_datadir}/click/frameworks/current
ln -s %{_datadir}/ubports/changelogs/%{version} %{buildroot}%{_datadir}/ubports/changelogs/current
+%fdupes %buildroot%_datadir/click/frameworks/
+
%files
%license COPYING
%{_datadir}/ubports/changelogs/
diff --git a/anda/others/unity-greeter/unity-greeter.spec b/anda/others/unity-greeter/unity-greeter.spec
index 767333de64..9d27597d98 100644
--- a/anda/others/unity-greeter/unity-greeter.spec
+++ b/anda/others/unity-greeter/unity-greeter.spec
@@ -1,11 +1,13 @@
+%global rn 1
+
Name: unity-greeter
-Version: 22.04.1
+Version: 23.10.1
Release: %autorelease
Summary: Unity Greeter for Lightdm
License: GPL-3.0
URL: https://launchpad.net/unity-greeter
-Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/unity-greeter_%{version}-0ubuntu2.tar.xz
+Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/unity-greeter_%version-0ubuntu%rn.tar.xz
Patch1: 0001-Remove-libido.patch
BuildRequires: automake libtool gnome-common
@@ -27,7 +29,8 @@ Requires: unity-settings-daemon
Requires: lightdm%{?_isa}
%description
-The greeter (login screen) application for Unity. It is implemented as a LightDM greeter.
+The greeter (login screen) application for Unity.
+It is implemented as a LightDM greeter.
%prep
%autosetup -p1
diff --git a/anda/others/unity-greeter/update.rhai b/anda/others/unity-greeter/update.rhai
index c056f96829..a82d2c0faf 100644
--- a/anda/others/unity-greeter/update.rhai
+++ b/anda/others/unity-greeter/update.rhai
@@ -1,3 +1,5 @@
let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/?C=N;O=D");
-let v = find("unity-greeter_([\\d.+]+)-0ubuntu2", html, 1);
+let v = find("unity-greeter_([\\d.+]+)-0ubuntu(\\d+)", html, 1);
+let rn = find("unity-greeter_([\\d.+]+)-0ubuntu(\\d+)", html, 2);
rpm.version(v);
+rpm.global("rn", rn);
diff --git a/anda/others/unity-scope-home/unity-scope-home.spec b/anda/others/unity-scope-home/unity-scope-home.spec
index 65b79e1b49..3d9c527ee3 100644
--- a/anda/others/unity-scope-home/unity-scope-home.spec
+++ b/anda/others/unity-scope-home/unity-scope-home.spec
@@ -22,10 +22,11 @@ BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libsoup-gnome-2.4)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(unity)
-BuildRequires: pkgconfig(unity-protocol-private)
+BuildRequires: pkgconfig(unity-protocol-private) libunity
BuildRequires: pkgconfig(unity-extras)
%description
+%summary.
Theme and icons for Unity.
%prep
diff --git a/anda/others/unity-session/anda.hcl b/anda/others/unity-session/anda.hcl
index bbc9f4f8f8..d32f7a1f8e 100644
--- a/anda/others/unity-session/anda.hcl
+++ b/anda/others/unity-session/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "unity-session.spec"
}
diff --git a/anda/others/unity-session/unity-session.spec b/anda/others/unity-session/unity-session.spec
index 15315efae4..06fd14e087 100644
--- a/anda/others/unity-session/unity-session.spec
+++ b/anda/others/unity-session/unity-session.spec
@@ -1,9 +1,9 @@
-%define _ubuntu_rel 1ubuntu2
+%define _ubuntu_rel 1ubuntu1
Name: unity-session
Summary: Lightdm profile for Unity 7
-Version: 43.0
-Release: %autorelease
+Version: 44.0
+Release: 1%{?dist}
License: GPL-2.0
URL: https://packages.ubuntu.com/jammy/unity-session
@@ -41,7 +41,7 @@ install -p -m755 %{SOURCE1} %{buildroot}%{_libexecdir}/run-systemd-session
%files
%license COPYING
-%{_sysconfdir}/xdg/autostart/nemo-unity-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/nemo-unity-autostart.desktop
%{_userunitdir}/gnome-session.service
%{_userunitdir}/unity-session.target
%{_libexecdir}/run-systemd-session
diff --git a/anda/others/unity-session/update.rhai b/anda/others/unity-session/update.rhai
new file mode 100644
index 0000000000..c9b52665bd
--- /dev/null
+++ b/anda/others/unity-session/update.rhai
@@ -0,0 +1,5 @@
+let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/g/gnome-session/?C=N;O=D");
+let v = find("unity-session_([\\d.]+)-(.+?)_all.deb", html, 1);
+let r = find("unity-session_([\\d.]+)-(.+?)_all.deb", html, 2);
+rpm.version(v);
+rpm.define("_ubuntu_rel", r);
diff --git a/anda/others/uxplay/anda.hcl b/anda/others/uxplay/anda.hcl
new file mode 100644
index 0000000000..9a43e44b5a
--- /dev/null
+++ b/anda/others/uxplay/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "uxplay.spec"
+ }
+}
diff --git a/anda/others/uxplay/update.rhai b/anda/others/uxplay/update.rhai
new file mode 100644
index 0000000000..03a2e63fec
--- /dev/null
+++ b/anda/others/uxplay/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("FDH2/UxPlay"));
diff --git a/anda/others/uxplay/uxplay.spec b/anda/others/uxplay/uxplay.spec
new file mode 100644
index 0000000000..7859c88312
--- /dev/null
+++ b/anda/others/uxplay/uxplay.spec
@@ -0,0 +1,63 @@
+Name: uxplay
+Version: 1.65
+Release: 1%?dist
+Summary: AirPlay Unix mirroring server
+License: GPL-3.0
+URL: https://github.com/FDH2/UxPlay
+Source0: %url/archive/refs/tags/v%version.tar.gz
+Requires: openssl libplist avahi gstreamer1-plugin-libav gstreamer1-plugins-bad-free gstreamer1-plugins-good gstreamer1-plugins-base
+Recommends: gstreamer1-vaapi
+BuildRequires: cmake desktop-file-utils systemd-rpm-macros gcc gcc-c++ openssl-devel avahi-compat-libdns_sd-devel
+BuildRequires: pkgconfig(gstreamer-1.0) pkgconfig(gstreamer-sdp-1.0) pkgconfig(gstreamer-video-1.0) pkgconfig(gstreamer-app-1.0) pkgconfig(libplist-2.0)
+
+%description
+%summary.
+
+%prep
+%autosetup -n UxPlay-%version
+cat < %name.desktop
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=UxPlay
+GenericName=AirPlay server
+Exec=%_bindir/uxplay
+Icon=computer-apple-ipad-symbolic
+Terminal=true
+Categories=AudioVideo;
+Comment=%summary
+EOF
+
+%build
+%cmake . -DNO_MARCH_NATIVE=ON
+%cmake_build --config Release
+
+
+%install
+mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_mandir/man1
+install -Dm755 redhat-linux-build/%name %buildroot%_bindir/
+install -Dm644 %name.desktop %buildroot%_datadir/applications/
+
+mv %name.1 %buildroot%_mandir/man1/%name.1
+
+%post
+%systemd_post avahi-daemon.service
+
+%preun
+%systemd_preun avahi-daemon.service
+
+%postun
+%systemd_postun_with_restart avahi-daemon.service
+
+%check
+desktop-file-validate %name.desktop
+
+%files
+%license LICENSE
+%doc README.*
+%_bindir/%name
+%_datadir/applications/%name.desktop
+%_mandir/man1/*
+
+%changelog
+%autochangelog
diff --git a/anda/others/xpadneo/anda.hcl b/anda/others/xpadneo/anda.hcl
new file mode 100644
index 0000000000..a05aac8e28
--- /dev/null
+++ b/anda/others/xpadneo/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+ rpm {
+ spec = "xpadneo.spec"
+ }
+}
diff --git a/anda/others/xpadneo/modules-load-d-xpadneo.conf b/anda/others/xpadneo/modules-load-d-xpadneo.conf
new file mode 100644
index 0000000000..9a5fd2d346
--- /dev/null
+++ b/anda/others/xpadneo/modules-load-d-xpadneo.conf
@@ -0,0 +1 @@
+hid_xpadneo
diff --git a/anda/others/xpadneo/update.rhai b/anda/others/xpadneo/update.rhai
new file mode 100644
index 0000000000..0a63919e92
--- /dev/null
+++ b/anda/others/xpadneo/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("atar-axis/xpadneo"));
diff --git a/anda/others/xpadneo/xpadneo.spec b/anda/others/xpadneo/xpadneo.spec
new file mode 100644
index 0000000000..b8f92b6822
--- /dev/null
+++ b/anda/others/xpadneo/xpadneo.spec
@@ -0,0 +1,100 @@
+%if 0%{?fedora}
+%global buildforkernels akmod
+%global debug_package %{nil}
+%endif
+
+Name: xpadneo
+Version: 0.9.5
+Release: 1%?dist
+Summary: Advanced Linux Driver for Xbox One Wireless Gamepad
+Group: System Environment/Kernel
+License: GPL-3.0
+URL: https://github.com/atar-axis/xpadneo
+Source0: %url/archive/v%version/%name-%version.tar.gz
+Source1: modules-load-d-xpadneo.conf
+
+%global srcname hid-%name
+
+BuildRequires: gcc
+BuildRequires: make
+BuildRequires: kmodtool
+BuildRequires: systemd-rpm-macros
+
+Requires: bash
+Requires: bluez bluez-tools
+
+Provides: %{name}-kmod-common = %{version}-%{release}
+Requires: %{name}-kmod >= %{version}
+Obsoletes: %{name} < 0.9.1-2
+
+# kmodtool does its magic here
+%{expand:%(kmodtool --target %{_target_cpu} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+
+%description
+Advanced Linux Driver for Xbox One Wireless Controller
+
+%package kmod
+Summary: Kernel module (kmod) for %{name}
+Requires: kernel-devel
+
+%description kmod
+This is the first driver for the Xbox One Wireless Gamepad (which is shipped with the Xbox One S).
+
+%prep
+# error out if there was something wrong with kmodtool
+%{?kmodtool_check}
+
+# print kmodtool output for debugging purposes:
+kmodtool --target %{_target_cpu} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+
+%setup -q
+
+for kernel_version in %{?kernel_versions} ; do
+ cp -a hid-xpadneo/src _kmod_build_${kernel_version%%___*}
+done
+
+%build
+for kernel_version in %{?kernel_versions} ; do
+ make V=1 %{?_smp_mflags} -C ${kernel_version##*___} M=${PWD}/_kmod_build_${kernel_version%%___*} VERSION=v%{version} modules
+done
+
+%install
+for kernel_version in %{?kernel_versions}; do
+ mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 755 _kmod_build_${kernel_version%%___*}/hid-xpadneo.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ chmod a+x %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/*.ko
+done
+%{?akmod_install}
+
+install -Dm644 hid-xpadneo/etc-modprobe.d/xpadneo.conf %{buildroot}%{_modprobedir}/60-xpadneo.conf
+install -Dm644 %{SOURCE1} %{buildroot}%{_modulesloaddir}/xpadneo.conf
+install -Dm644 hid-xpadneo/etc-udev-rules.d/60-xpadneo.rules %{buildroot}%{_udevrulesdir}/60-xpadneo.rules
+
+%files
+%doc NEWS.md docs/README.md docs/CONFIGURATION.md
+%license LICENSE
+%{_modprobedir}/60-xpadneo.conf
+%{_modulesloaddir}/xpadneo.conf
+%{_udevrulesdir}/60-xpadneo.rules
+
+%changelog
+* Wed Oct 12 2022 Jan Drögehoff - 0.9.5-1
+- Update to 0.9.5
+
+* Mon Jul 04 2022 Jan Drögehoff - 0.9.4-1
+- Update to 0.9.4
+
+* Sun May 29 2022 Jan Drögehoff - 0.9.2-1
+- Update to 0.9.2
+
+* Thu Jun 17 2021 Jan Drögehoff - 0.9.1-2
+- Move from DKMS to Akmods
+
+* Fri May 21 2021 Jan Drögehoff - 0.9.1-1
+- Update to 0.9.1
+
+* Mon Dec 28 21:58:05 CET 2020 Jan Drögehoff - 0.9-2
+- remove configure script
+
+* Mon Dec 28 21:01:47 CET 2020 Jan Drögehoff - 0.9-1
+- Initial Spec
diff --git a/anda/python/orjson/anda.hcl b/anda/python/orjson/anda.hcl
deleted file mode 100644
index 10beac604e..0000000000
--- a/anda/python/orjson/anda.hcl
+++ /dev/null
@@ -1,5 +0,0 @@
-project pkg {
- rpm {
- spec = "python3-orjson.spec"
- }
-}
diff --git a/anda/python/orjson/python3-orjson.spec b/anda/python/orjson/python3-orjson.spec
deleted file mode 100644
index 94ab6215be..0000000000
--- a/anda/python/orjson/python3-orjson.spec
+++ /dev/null
@@ -1,45 +0,0 @@
-%global debug_package %{nil}
-
-Name: python3-orjson
-Version: 3.8.12
-Release: 1%{?dist}
-Summary: Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy
-License: MIT OR Apache-2.0
-URL: https://github.com/ijl/orjson
-Source0: %{url}/archive/refs/tags/%{version}.tar.gz
-BuildRequires: python3-installer python3.11 python3-pip maturin cargo
-%{?python_provide:%python_provide python3-orjson}
-Provides: python3.11dist(orjson) = %{version}
-
-%description
-orjson is a fast, correct JSON library for Python. It benchmarks as the fastest Python library
-for JSON and is more correct than the standard json library or other third-party libraries. It
-serializes dataclass, datetime, numpy, and UUID instances natively.
-
-%prep
-%autosetup -n orjson-%{version}
-
-%build
-maturin build --release --strip
-
-%install
-sed 's@^\s+"repository":.+?^@@' setup.py > setup.py
-python3.11 -m installer --destdir="%{buildroot}" target/wheels/*.whl
-rm -rf %{python3_sitelib}/orjson/__pycache__
-
-%files
-%doc README.md
-%license /usr/lib64/python*/site-packages/orjson-%{version}.dist-info/license_files/LICENSE-MIT
-%license /usr/lib64/python*/site-packages/orjson-%{version}.dist-info/license_files/LICENSE-APACHE
-/usr/lib64/python*/site-packages/orjson-%{version}.dist-info/METADATA
-/usr/lib64/python*/site-packages/orjson-%{version}.dist-info/RECORD
-/usr/lib64/python*/site-packages/orjson-%{version}.dist-info/WHEEL
-/usr/lib64/python*/site-packages/orjson/__init__.py
-/usr/lib64/python*/site-packages/orjson/__init__.pyi
-/usr/lib64/python*/site-packages/orjson/__pycache__/__init__.cpython-*.pyc
-/usr/lib64/python*/site-packages/orjson/orjson.cpython-*-linux-gnu.so
-/usr/lib64/python*/site-packages/orjson/py.typed
-
-%changelog
-* Sun Jan 08 2023 windowsboy111 - 3.8.4-1
-- Initial package.
diff --git a/anda/python/orjson/update.rhai b/anda/python/orjson/update.rhai
deleted file mode 100644
index b3cb7a6345..0000000000
--- a/anda/python/orjson/update.rhai
+++ /dev/null
@@ -1 +0,0 @@
-rpm.version(gh("ijl/orjson"));
diff --git a/anda/python/protobuf/python3-protobuf.spec b/anda/python/protobuf/python3-protobuf.spec
index 5f5959a047..824044c9f2 100644
--- a/anda/python/protobuf/python3-protobuf.spec
+++ b/anda/python/protobuf/python3-protobuf.spec
@@ -2,7 +2,7 @@
%global pypi_name protobuf
Name: python-%{pypi_name}
-Version: 4.23.1
+Version: 4.23.3
Release: 1%{?dist}
Summary: Protocol Buffers
diff --git a/anda/python/python3-protobuf/anda.hcl b/anda/python/python3-protobuf/anda.hcl
deleted file mode 100644
index 4937260dad..0000000000
--- a/anda/python/python3-protobuf/anda.hcl
+++ /dev/null
@@ -1,5 +0,0 @@
-project pkg {
- rpm {
- spec = "python3-python3-protobuf.spec"
- }
-}
diff --git a/anda/python/python3-protobuf/python3-python3-protobuf.spec b/anda/python/python3-protobuf/python3-python3-protobuf.spec
deleted file mode 100644
index 83439e0ce8..0000000000
--- a/anda/python/python3-protobuf/python3-python3-protobuf.spec
+++ /dev/null
@@ -1,68 +0,0 @@
-# Created by pyp2rpm-3.3.8
-%global pypi_name python3-protobuf
-
-Name: python3-%{pypi_name}
-Version: 2.5.0
-Release: 1%{?dist}
-Summary: Protocol Buffers
-
-License: New BSD License
-URL: https://developers.google.com/protocol-buffers/
-Source0: %{pypi_source}
-BuildArch: noarch
-
-BuildRequires: python3-devel
-BuildRequires: python3dist(setuptools)
-
-%description
-Protocol Buffers are Google's data interchange format.
-
-%prep
-%autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-
-# so apparently they decided to mix tabs and spaces
-# dirty fix
-sed "s@\t@ @g" google/protobuf/internal/cpp_message.py > google/protobuf/internal/cpp_message.py
-
-%build
-%py3_build
-
-%install
-%py3_install
-
-%dnl %check
-%dnl %{__python3} setup.py test
-
-%files
-%doc README.txt
-%{python3_sitelib}/google/protobuf/compiler/plugin_pb2.py
-%{python3_sitelib}/google/protobuf/descriptor.py
-%{python3_sitelib}/google/protobuf/descriptor_database.py
-%{python3_sitelib}/google/protobuf/descriptor_pb2.py
-%{python3_sitelib}/google/protobuf/descriptor_pool.py
-%{python3_sitelib}/google/protobuf/internal/api_implementation.py
-%{python3_sitelib}/google/protobuf/internal/containers.py
-%{python3_sitelib}/google/protobuf/internal/cpp_message.py
-%{python3_sitelib}/google/protobuf/internal/decoder.py
-%{python3_sitelib}/google/protobuf/internal/encoder.py
-%{python3_sitelib}/google/protobuf/internal/enum_type_wrapper.py
-%{python3_sitelib}/google/protobuf/internal/message_listener.py
-%{python3_sitelib}/google/protobuf/internal/python_message.py
-%{python3_sitelib}/google/protobuf/internal/type_checkers.py
-%{python3_sitelib}/google/protobuf/internal/utils.py
-%{python3_sitelib}/google/protobuf/internal/wire_format.py
-%{python3_sitelib}/google/protobuf/message.py
-%{python3_sitelib}/google/protobuf/message_factory.py
-%{python3_sitelib}/google/protobuf/reflection.py
-%{python3_sitelib}/google/protobuf/service.py
-%{python3_sitelib}/google/protobuf/service_reflection.py
-%{python3_sitelib}/google/protobuf/text_format.py
-%{python3_sitelib}/google
-%{python3_sitelib}/python3_protobuf-%{version}-py%{python3_version}-*.pth
-%{python3_sitelib}/python3_protobuf-%{version}-py%{python3_version}.egg-info
-
-%changelog
-* Sun Jan 08 2023 windowsboy111 - 2.5.0-1
-- Initial package.
diff --git a/anda/python/python3-protobuf/update.rhai b/anda/python/python3-protobuf/update.rhai
deleted file mode 100644
index 40afc1f5ff..0000000000
--- a/anda/python/python3-protobuf/update.rhai
+++ /dev/null
@@ -1 +0,0 @@
-rpm.version(pypi("python3-protobuf"));
diff --git a/anda/python/rich/anda.hcl b/anda/python/rich/anda.hcl
deleted file mode 100644
index 5f7fc18098..0000000000
--- a/anda/python/rich/anda.hcl
+++ /dev/null
@@ -1,5 +0,0 @@
-project pkg {
- rpm {
- spec = "python3-rich.spec"
- }
-}
diff --git a/anda/python/rich/python3-rich.spec b/anda/python/rich/python3-rich.spec
deleted file mode 100644
index 4d4c27a928..0000000000
--- a/anda/python/rich/python3-rich.spec
+++ /dev/null
@@ -1,51 +0,0 @@
-# Created by pyp2rpm-3.3.8
-%global pypi_name rich
-%global pypi_version 13.3.5
-
-Name: python-%{pypi_name}
-Version: %{pypi_version}
-Release: 1%{?dist}
-Summary: Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal
-
-License: None
-URL: https://github.com/Textualize/rich
-Source0: https://github.com/Textualize/rich/archive/refs/tags/v%version.tar.gz
-BuildArch: noarch
-
-BuildRequires: python3-devel poetry python3-installer
-BuildRequires: python3dist(setuptools)
-
-%description
-%{summary}.
-
-%package -n python3-%{pypi_name}
-Summary: %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
-
-Requires: (python3dist(ipywidgets) >= 7.5.1 with python3dist(ipywidgets) < 9~~)
-Requires: (python3dist(markdown-it-py) >= 2.2 with python3dist(markdown-it-py) < 3~~)
-Requires: (python3dist(pygments) >= 2.13 with python3dist(pygments) < 3~~)
-Requires: (python3dist(typing-extensions) >= 4 with python3dist(typing-extensions) < 5~~)
-%description -n python3-%{pypi_name}
-%{summary}.
-
-
-%prep
-%autosetup -n %{pypi_name}-%{pypi_version}
-
-%build
-poetry build
-
-%install
-python3.11 -m installer --destdir="%{buildroot}" dist/*.whl
-rm -rf %{python3_sitelib}/*/__pycache__
-
-%files -n python3-%{pypi_name}
-%license LICENSE
-%doc README.md
-%{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}*
-
-%changelog
-* Sun Mar 19 2023 windowsboy111 - 13.3.2-1
-- Initial package.
diff --git a/anda/python/rich/update.rhai b/anda/python/rich/update.rhai
deleted file mode 100644
index 31089aced0..0000000000
--- a/anda/python/rich/update.rhai
+++ /dev/null
@@ -1 +0,0 @@
-rpm.global("pypi_version", pypi("rich"));
diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec
index 49b879d895..319c3c3821 100644
--- a/anda/python/ruff/python3-ruff.spec
+++ b/anda/python/ruff/python3-ruff.spec
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: python3-ruff
-Version: 0.0.269
+Version: 0.0.272
Release: 1%{?dist}
Summary: An extremely fast Python linter, written in Rust
License: MIT
@@ -11,7 +11,8 @@ BuildRequires: python3-installer python3.11 python3-pip maturin cargo
Provides: python3.11dist(ruff) = %{version}
%description
-Ruff aims to be orders of magnitude faster than alternative tools while integrating more functionality behind a single, common interface.
+Ruff aims to be orders of magnitude faster than alternative tools while
+integrating more functionality behind a single, common interface.
%prep
%autosetup -n ruff-%{version}
diff --git a/anda/rust/bandwhich/rust-bandwhich.spec b/anda/rust/bandwhich/rust-bandwhich.spec
index da9c2c1fa2..7a46df52be 100644
--- a/anda/rust/bandwhich/rust-bandwhich.spec
+++ b/anda/rust/bandwhich/rust-bandwhich.spec
@@ -4,8 +4,7 @@
Name: rust-bandwhich
Version: 0.20.0
Release: %autorelease
-Summary: Display current network utilization by process, connection and remote IP/hostname
-
+Summary: Show network utilization by process/connection/hostname/IP
License: MIT
URL: https://crates.io/crates/bandwhich
Source: %{crates_source}
diff --git a/anda/rust/bandwhich/update.rhai b/anda/rust/bandwhich/update.rhai
new file mode 100644
index 0000000000..5eed94f7c1
--- /dev/null
+++ b/anda/rust/bandwhich/update.rhai
@@ -0,0 +1 @@
+rpm.version(crates("bandwhich"));
diff --git a/anda/rust/bat-extras/.gitignore b/anda/rust/bat-extras/.gitignore
deleted file mode 100644
index 79b8e8a9dd..0000000000
--- a/anda/rust/bat-extras/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-anda-build/
\ No newline at end of file
diff --git a/anda/rust/bat-extras/anda.hcl b/anda/rust/bat-extras/anda.hcl
index 7c1a71766b..35b35cb215 100644
--- a/anda/rust/bat-extras/anda.hcl
+++ b/anda/rust/bat-extras/anda.hcl
@@ -1,4 +1,5 @@
project pkg {
+ arches = ["x86_64"]
rpm {
spec = "bat-extras.spec"
}
diff --git a/anda/rust/bat-extras/bat-extras.spec b/anda/rust/bat-extras/bat-extras.spec
index 077691e149..ae99f30c29 100644
--- a/anda/rust/bat-extras/bat-extras.spec
+++ b/anda/rust/bat-extras/bat-extras.spec
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: bat-extras
-Version: 2023.03.21
+Version: 2023.06.15
Release: 1%{?dist}
Summary: Bash scripts that integrate bat with various command line tools
@@ -11,6 +11,7 @@ Source0: https://github.com/eth-p/bat-extras/archive/refs/tags/v%{version
BuildRequires: bash
Requires: bash
+BuildArch: noarch
%description
%{summary}.
@@ -29,6 +30,8 @@ Requires: bash
mkdir -p %{buildroot}%{_mandir}/man1/
cp -v man/* %{buildroot}%{_mandir}/man1/
+chmod -x %_mandir/man1/*
+
%files
%license LICENSE.md
@@ -38,5 +41,5 @@ cp -v man/* %{buildroot}%{_mandir}/man1/
%{_mandir}/man1/*
%changelog
-* Mon Oct 03 2022 Cappy Ishihara
+* Mon Oct 03 2022 Cappy Ishihara - 2022.07.27-1
- Initial release
diff --git a/anda/rust/detox/anda.hcl b/anda/rust/detox/anda.hcl
deleted file mode 100644
index 5d1e8e449a..0000000000
--- a/anda/rust/detox/anda.hcl
+++ /dev/null
@@ -1,5 +0,0 @@
-project pkg {
- rpm {
- spec = "rust-detox.spec"
- }
-}
diff --git a/anda/rust/detox/rust-detox.spec b/anda/rust/detox/rust-detox.spec
deleted file mode 100644
index 9a21c46586..0000000000
--- a/anda/rust/detox/rust-detox.spec
+++ /dev/null
@@ -1,48 +0,0 @@
-# Generated by rust2rpm 23
-%bcond_without check
-
-%global crate detox
-
-Name: rust-detox
-Version: 0.1.2
-Release: %autorelease
-Summary: Quickly clean up your development directories on disk
-
-License: MIT
-URL: https://crates.io/crates/detox
-Source: %{crates_source}
-
-BuildRequires: anda-srpm-macros rust-packaging >= 21
-
-%global _description %{expand:
-Quickly clean up your development directories on disk.}
-
-%description %{_description}
-
-%package -n %{crate}
-Summary: %{summary}
-
-%description -n %{crate} %{_description}
-
-%files -n %{crate}
-%license LICENSE
-%doc README.md
-%{_bindir}/detox
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep_online
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/anda/rust/detox/update.rhai b/anda/rust/detox/update.rhai
deleted file mode 100644
index 2f8a12eff3..0000000000
--- a/anda/rust/detox/update.rhai
+++ /dev/null
@@ -1 +0,0 @@
-rpm.version(crates("detox"));
diff --git a/anda/rust/felix/rust-felix.spec b/anda/rust/felix/rust-felix.spec
index 4477a8f875..c288355612 100644
--- a/anda/rust/felix/rust-felix.spec
+++ b/anda/rust/felix/rust-felix.spec
@@ -2,7 +2,7 @@
%global crate felix
Name: rust-felix
-Version: 2.2.8
+Version: 2.4.0
Release: 1%{?dist}
Summary: Tui file manager with vim-like key mapping
diff --git a/anda/rust/gitoxide/rust-gitoxide.spec b/anda/rust/gitoxide/rust-gitoxide.spec
index e8f8a59e5b..301ac1623c 100644
--- a/anda/rust/gitoxide/rust-gitoxide.spec
+++ b/anda/rust/gitoxide/rust-gitoxide.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 23
+# Generated by rust2rpm 24
%bcond_without check
%global crate gitoxide
Name: rust-gitoxide
-Version: 0.25.0
-Release: 1%{?dist}
+Version: 0.26.0
+Release: %autorelease
Summary: Command-line application for interacting with git repositories
License: MIT OR Apache-2.0
@@ -15,7 +15,7 @@ Source: %{crates_source}
BuildRequires: openssl-devel cmake anda-srpm-macros rust-packaging >= 21
%global _description %{expand:
-Command-line application for interacting with git repositories.}
+A command-line application for interacting with git repositories.}
%description %{_description}
@@ -32,6 +32,322 @@ Summary: %{summary}
%{_bindir}/ein
%{_bindir}/gix
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
+
+%files devel
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+cache-efficiency-debug-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+cache-efficiency-debug-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "cache-efficiency-debug" feature of the "%{crate}" crate.
+
+%files -n %{name}+cache-efficiency-debug-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+crosstermion-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+crosstermion-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "crosstermion" feature of the "%{crate}" crate.
+
+%files -n %{name}+crosstermion-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+document-features-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+document-features-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "document-features" feature of the "%{crate}" crate.
+
+%files -n %{name}+document-features-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+fast-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+fast-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "fast" feature of the "%{crate}" crate.
+
+%files -n %{name}+fast-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+fast-safe-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+fast-safe-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "fast-safe" feature of the "%{crate}" crate.
+
+%files -n %{name}+fast-safe-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+futures-lite-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+futures-lite-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "futures-lite" feature of the "%{crate}" crate.
+
+%files -n %{name}+futures-lite-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+gitoxide-core-async-client-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+gitoxide-core-async-client-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "gitoxide-core-async-client" feature of the "%{crate}" crate.
+
+%files -n %{name}+gitoxide-core-async-client-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+gitoxide-core-blocking-client-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+gitoxide-core-blocking-client-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "gitoxide-core-blocking-client" feature of the "%{crate}" crate.
+
+%files -n %{name}+gitoxide-core-blocking-client-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+gitoxide-core-tools-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+gitoxide-core-tools-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "gitoxide-core-tools" feature of the "%{crate}" crate.
+
+%files -n %{name}+gitoxide-core-tools-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+gitoxide-core-tools-query-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+gitoxide-core-tools-query-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "gitoxide-core-tools-query" feature of the "%{crate}" crate.
+
+%files -n %{name}+gitoxide-core-tools-query-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+http-client-curl-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+http-client-curl-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "http-client-curl" feature of the "%{crate}" crate.
+
+%files -n %{name}+http-client-curl-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+http-client-reqwest-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+http-client-reqwest-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "http-client-reqwest" feature of the "%{crate}" crate.
+
+%files -n %{name}+http-client-reqwest-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+is-terminal-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+is-terminal-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "is-terminal" feature of the "%{crate}" crate.
+
+%files -n %{name}+is-terminal-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+lean-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+lean-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "lean" feature of the "%{crate}" crate.
+
+%files -n %{name}+lean-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+lean-async-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+lean-async-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "lean-async" feature of the "%{crate}" crate.
+
+%files -n %{name}+lean-async-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+max-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+max-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "max" feature of the "%{crate}" crate.
+
+%files -n %{name}+max-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+max-control-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+max-control-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "max-control" feature of the "%{crate}" crate.
+
+%files -n %{name}+max-control-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+max-pure-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+max-pure-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "max-pure" feature of the "%{crate}" crate.
+
+%files -n %{name}+max-pure-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+pretty-cli-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+pretty-cli-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "pretty-cli" feature of the "%{crate}" crate.
+
+%files -n %{name}+pretty-cli-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+prodash-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+prodash-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "prodash" feature of the "%{crate}" crate.
+
+%files -n %{name}+prodash-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+prodash-render-line-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+prodash-render-line-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "prodash-render-line" feature of the "%{crate}" crate.
+
+%files -n %{name}+prodash-render-line-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+prodash-render-line-crossterm-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+prodash-render-line-crossterm-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "prodash-render-line-crossterm" feature of the "%{crate}" crate.
+
+%files -n %{name}+prodash-render-line-crossterm-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+prodash-render-tui-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+prodash-render-tui-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "prodash-render-tui" feature of the "%{crate}" crate.
+
+%files -n %{name}+prodash-render-tui-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+small-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+small-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "small" feature of the "%{crate}" crate.
+
+%files -n %{name}+small-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep_online
diff --git a/anda/rust/gping/rust-gping.spec b/anda/rust/gping/rust-gping.spec
index 2658596f59..07f12f5201 100644
--- a/anda/rust/gping/rust-gping.spec
+++ b/anda/rust/gping/rust-gping.spec
@@ -4,7 +4,7 @@
%global crate gping
Name: rust-gping
-Version: 1.11.0
+Version: 1.12.0
Release: 1%{?dist}
Summary: Ping, but with a graph
diff --git a/anda/rust/hyperfine/anda.hcl b/anda/rust/hyperfine/anda.hcl
deleted file mode 100644
index 8ebddb2ab8..0000000000
--- a/anda/rust/hyperfine/anda.hcl
+++ /dev/null
@@ -1,5 +0,0 @@
-project pkg {
- rpm {
- spec = "rust-hyperfine.spec"
- }
-}
diff --git a/anda/rust/hyperfine/hyperfine-fix-metadata-auto.diff b/anda/rust/hyperfine/hyperfine-fix-metadata-auto.diff
deleted file mode 100644
index 790baab87e..0000000000
--- a/anda/rust/hyperfine/hyperfine-fix-metadata-auto.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- hyperfine-1.16.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ hyperfine-1.16.0/Cargo.toml 2023-03-15T13:37:20.618831+00:00
-@@ -100,9 +100,6 @@
- [features]
- windows_process_extensions_main_thread_handle = []
-
--[target."cfg(all(windows, not(windows_process_extensions_main_thread_handle)))".dependencies.once_cell]
--version = "1.17"
--
- [target."cfg(not(windows))".dependencies.libc]
- version = "0.2"
-
-@@ -110,13 +107,3 @@
- version = "0.26.2"
- features = ["zerocopy"]
-
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = [
-- "processthreadsapi",
-- "minwindef",
-- "winnt",
-- "jobapi2",
-- "tlhelp32",
-- "handleapi",
--]
diff --git a/anda/rust/hyperfine/rust-hyperfine.spec b/anda/rust/hyperfine/rust-hyperfine.spec
deleted file mode 100644
index 2eaec87a27..0000000000
--- a/anda/rust/hyperfine/rust-hyperfine.spec
+++ /dev/null
@@ -1,53 +0,0 @@
-# Generated by rust2rpm 24
-%bcond_without check
-
-%global crate hyperfine
-
-Name: rust-hyperfine
-Version: 1.16.1
-Release: 1%{?dist}
-Summary: Command-line benchmarking tool
-
-# Upstream license specification: MIT/Apache-2.0
-License: MIT OR Apache-2.0
-URL: https://crates.io/crates/hyperfine
-Source: %{crates_source}
-# Automatically generated patch to strip foreign dependencies
-Patch: hyperfine-fix-metadata-auto.diff
-
-BuildRequires: anda-srpm-macros rust-packaging >= 21
-
-%global _description %{expand:
-A command-line benchmarking tool.}
-
-%description %{_description}
-
-%package -n %{crate}
-Summary: %{summary}
-
-%description -n %{crate} %{_description}
-
-%files -n %{crate}
-%license LICENSE-APACHE
-%license LICENSE-MIT
-%doc CHANGELOG.md
-%doc README.md
-%{_bindir}/hyperfine
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep_online
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/anda/rust/hyperfine/update.rhai b/anda/rust/hyperfine/update.rhai
deleted file mode 100644
index 5942d0c4db..0000000000
--- a/anda/rust/hyperfine/update.rhai
+++ /dev/null
@@ -1 +0,0 @@
-rpm.version(crates("hyperfine"));
diff --git a/anda/rust/kondo/rust-kondo.spec b/anda/rust/kondo/rust-kondo.spec
index 268c1fd444..9fbedd3da7 100644
--- a/anda/rust/kondo/rust-kondo.spec
+++ b/anda/rust/kondo/rust-kondo.spec
@@ -6,12 +6,12 @@
Name: rust-kondo
Version: 0.6
Release: 1%{?dist}
-Summary: Filesystem cleaning tool that recursively searches directories for known project structures and determines how much space you could save by deleting the unnecessary files
+Summary: Filesystem cleaning tool for projects
License: MIT
URL: https://crates.io/crates/kondo
Source0: https://github.com/tbillington/kondo/releases/download/v%{version}/kondo-x86_64-unknown-linux-gnu.tar.gz
-Source1: https://github.com/tbillington/kondo/blob/v%{version}/LICENSE
+Source1: https://raw.githubusercontent.com/tbillington/kondo/v%version/LICENSE
ExclusiveArch: x86_64
BuildRequires: anda-srpm-macros rust-packaging >= 21
@@ -29,6 +29,7 @@ Summary: %{summary}
%description -n %{crate} %{_description}
%files -n %{crate}
+%doc README.md
%license LICENSE
/usr/bin/kondo
@@ -39,7 +40,8 @@ tar xf %{SOURCE0}
%install
install -Dm755 kondo %{buildroot}/usr/bin/kondo
-install -Dm644 %{SOURCE1} %{buildroot}/%{_datadir}/licenses/%{crate}/LICENSE
+install -Dm644 %{SOURCE1} %{buildroot}/%_docdir/kondo/README.md
+install -Dm644 %{SOURCE1} %{buildroot}/%{_datadir}/licenses/kondo/LICENSE
%changelog
%autochangelog
diff --git a/anda/rust/maturin/anda.hcl b/anda/rust/maturin/anda.hcl
index 413a17552e..6152003a22 100644
--- a/anda/rust/maturin/anda.hcl
+++ b/anda/rust/maturin/anda.hcl
@@ -1,5 +1,5 @@
project pkg {
rpm {
- spec = "rust-maturin.spec"
+ spec = "rust-terra-maturin.spec"
}
}
diff --git a/anda/rust/maturin/rust-maturin.spec b/anda/rust/maturin/rust-terra-maturin.spec
similarity index 97%
rename from anda/rust/maturin/rust-maturin.spec
rename to anda/rust/maturin/rust-terra-maturin.spec
index 97d2c5cfd6..001a4bde44 100644
--- a/anda/rust/maturin/rust-maturin.spec
+++ b/anda/rust/maturin/rust-terra-maturin.spec
@@ -1,8 +1,8 @@
# Generated by rust2rpm 24
%global crate maturin
-Name: rust-maturin
-Version: 0.15.3
+Name: rust-terra-maturin
+Version: 1.1.0
Release: 1%{?dist}
Summary: Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages
@@ -11,6 +11,7 @@ URL: https://crates.io/crates/maturin
Source: %{crates_source}
BuildRequires: pkgconfig anda-srpm-macros cargo-rpm-macros >= 24
+Conflicts: rust-maturin
%global _description %{expand:
Build and publish crates with pyo3, rust-cpython and cffi bindings as
@@ -18,12 +19,13 @@ well as rust binaries as python packages.}
%description %{_description}
-%package -n %{crate}
+%package -n terra-%{crate}
Summary: %{summary}
+Conflicts: %crate
-%description -n %{crate} %{_description}
+%description -n terra-%{crate} %{_description}
-%files -n %{crate}
+%files -n terra-%{crate}
%license license-apache
%license license-mit
%doc Changelog.md
@@ -41,11 +43,6 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
-%license %{crate_instdir}/license-apache
-%license %{crate_instdir}/license-mit
-%doc %{crate_instdir}/Changelog.md
-%doc %{crate_instdir}/Code-of-Conduct.md
-%doc %{crate_instdir}/README.md
%{crate_instdir}/
%package -n %{name}+default-devel
diff --git a/anda/rust/pop-launcher/pop-launcher.spec b/anda/rust/pop-launcher/pop-launcher.spec
index 8bee3c1d6b..33a3b8ee91 100644
--- a/anda/rust/pop-launcher/pop-launcher.spec
+++ b/anda/rust/pop-launcher/pop-launcher.spec
@@ -24,6 +24,7 @@ ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging >= 21
BuildRequires: external:crate:just
BuildRequires: anda-srpm-macros
+BuildRequires: fdupes
%global _description %{expand:
Library for writing plugins and frontends for pop-launcher.}
@@ -36,11 +37,13 @@ Library for writing plugins and frontends for pop-launcher.}
%cargo_prep_online
%build
-
just
%install
just rootdir=%{buildroot} install
+chmod +x %buildroot%_prefix/lib/pop-launcher/scripts/{session,system76-power}/*.sh
+
+%fdupes %buildroot%_prefix/
%if %{with check}
%check
@@ -49,6 +52,8 @@ just rootdir=%{buildroot} install
%files
+%doc README.md
+%license LICENSE
%{_bindir}/pop-launcher
%{_prefix}/lib/pop-launcher/
diff --git a/anda/rust/rnote/rnote.spec b/anda/rust/rnote/rnote.spec
index 1e2e63c3e2..ecbf97dd94 100644
--- a/anda/rust/rnote/rnote.spec
+++ b/anda/rust/rnote/rnote.spec
@@ -1,11 +1,11 @@
Name: rnote
-Version: 0.6.0
+Version: 0.7.0
Release: 1%{?dist}
Summary: Sketch and take handwritten notes.
License: GPL-3.0
URL: https://github.com/flxzt/rnote
-Source0: %{url}/releases/download/v%{version}/rnote-%{version}.tar.xz
-Requires: libadwaita poppler-glib glib2 gtk4
+Source0: %{url}/archive/refs/tags/v%version.tar.gz
+Requires: gtk4
BuildRequires: cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python
BuildRequires: pkgconfig(glib-2.0) >= 2.66
BuildRequires: pkgconfig(gtk4) >= 4.7
@@ -13,7 +13,10 @@ BuildRequires: pkgconfig(libadwaita-1) >= 1.2
BuildRequires: pkgconfig(poppler-glib) >= 22.07
%description
-Rnote is an open-source vector-based drawing app for sketching, handwritten notes and to annotate documents and pictures. Targeted at students, teachers and those who own a drawing tablet, it provides features like PDF and picture import and export, an infinite canvas and an adaptive UI for big and small screens.
+Rnote is an open-source vector-based drawing app for sketching, handwritten
+notes and to annotate documents and pictures. Targeted at students, teachers
+and those who own a drawing tablet, it provides features like PDF and picture
+import/export, an infinite canvas and an adaptive UI for big and small screens.
%prep
%autosetup -n rnote-%{version}
@@ -32,21 +35,21 @@ Rnote is an open-source vector-based drawing app for sketching, handwritten note
%doc README.md
%license LICENSE
-/usr/bin/rnote
-/usr/lib/debug/usr/bin/rnote-*.debug
-/usr/share/applications/com.github.flxzt.rnote.desktop
-/usr/share/glib-2.0/schemas/com.github.flxzt.rnote.gschema.xml
-/usr/share/icons/hicolor/scalable/apps/com.github.flxzt.rnote.svg
-/usr/share/icons/hicolor/symbolic/apps/com.github.flxzt.rnote-symbolic.svg
-/usr/share/locale/*/LC_MESSAGES/rnote.mo
-/usr/share/metainfo/com.github.flxzt.rnote.metainfo.xml
-/usr/share/mime/packages/com.github.flxzt.rnote.xml
-/usr/share/rnote/*
+%_bindir/rnote
+%_datadir/applications/com.github.flxzt.rnote.desktop
+%_datadir/glib-2.0/schemas/com.github.flxzt.rnote.gschema.xml
+%_datadir/icons/hicolor/scalable/apps/com.github.flxzt.rnote.svg
+%_datadir/icons/hicolor/scalable/mimetypes/application-rnote.svg
+%_datadir/icons/hicolor/symbolic/apps/com.github.flxzt.rnote-symbolic.svg
+%_datadir/locale/*/LC_MESSAGES/rnote.mo
+%_datadir/metainfo/com.github.flxzt.rnote.metainfo.xml
+%_datadir/mime/packages/com.github.flxzt.rnote.xml
+%_datadir/rnote/
%changelog
-* Wed Nov 2 2022 windowsboy111
+* Wed Nov 2 2022 windowsboy111 - 0.5.7-1
- Fix requires
-* Sun Oct 23 2022 windowsboy111