diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index cc6228735a..37c9d7ee75 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -17,17 +17,12 @@ jobs: outputs: build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }} container: - image: registry.fedoraproject.org/fedora:37 + image: ghcr.io/terrapkg/builder:main options: --cap-add=SYS_ADMIN --privileged # check out the repo steps: - - name: Set up dependencies - run: | - sudo dnf install -y dnf-plugins-core - sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra37.repo - sudo dnf install -y anda mock rpm-build git-core - # add to safe directory - git config --global --add safe.directory "$GITHUB_WORKSPACE" + - name: Set workspace as safe + run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Checkout uses: actions/checkout@v3 with: @@ -68,15 +63,9 @@ jobs: #if: ${{ matrix.changed_folders != '' }} runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} container: - image: registry.fedoraproject.org/fedora:37 + image: ghcr.io/terrapkg/builder:main options: --cap-add=SYS_ADMIN --privileged steps: - - name: Install repositories - run: | - sudo dnf install -y dnf-plugins-core - sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build mock-scm - - uses: terrapkg/anda-build@main with: name: "${{ matrix.pkg.pkg }}" @@ -84,9 +73,6 @@ jobs: 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: Install Subatomic client - run: sudo dnf install -y subatomic-cli - - name: Upload packages to subatomic run: | subatomic-cli upload --prune \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e56a2dfa27..d3c9b294e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,15 +25,9 @@ jobs: fail-fast: false runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} container: - image: registry.fedoraproject.org/fedora:37 + image: ghcr.io/terrapkg/builder:main options: --cap-add=SYS_ADMIN --privileged steps: - - name: Install repositories - run: | - sudo dnf install -y dnf-plugins-core - sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build mock-scm - - uses: terrapkg/anda-build@main with: name: "${{ matrix.pkg }}pkg" @@ -41,9 +35,6 @@ jobs: 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: Install Subatomic client - run: sudo dnf install -y subatomic-cli - - name: Upload packages to subatomic run: | subatomic-cli upload --prune \ diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 59753a5545..9800f36cac 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -6,11 +6,9 @@ jobs: lint: runs-on: ubuntu-latest container: - image: registry.fedoraproject.org/fedora:37 + image: ghcr.io/terrapkg/builder:main steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Install dependencies - run: dnf install -y rpmlint - name: Lint spec files run: rpmlint $(find anda -type f -name "*.spec" -type f) diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml index d475694999..9bbabd2d4a 100644 --- a/.github/workflows/mass-rebuild.yml +++ b/.github/workflows/mass-rebuild.yml @@ -40,7 +40,7 @@ jobs: #if: ${{ matrix.changed_folders != '' }} runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} container: - image: registry.fedoraproject.org/fedora:37 + image: ghcr.io/terrapkg/builder:main options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout @@ -55,12 +55,6 @@ jobs: else echo "EXISTS=false" >> $GITHUB_OUTPUT fi - - name: Install repositories - if: steps.check_files.outputs.EXISTS == 'true' - run: | - sudo dnf install -y dnf-plugins-core - sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build - uses: terrapkg/anda-build@main if: steps.check_files.outputs.EXISTS == 'true' @@ -70,10 +64,6 @@ jobs: 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: Install Subatomic client - if: steps.check_files.outputs.EXISTS == 'true' - run: sudo dnf install -y subatomic-cli - - name: Upload packages to subatomic if: steps.check_files.outputs.EXISTS == 'true' run: | diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml index e37de2101b..971980cbb5 100644 --- a/.github/workflows/update-comps.yml +++ b/.github/workflows/update-comps.yml @@ -12,16 +12,9 @@ jobs: update-comps: runs-on: ubuntu-latest container: - image: fedora:37 + image: ghcr.io/terrapkg/builder:main steps: - uses: actions/checkout@v3 - - name: Install repositories - run: | - sudo dnf install -y dnf-plugins-core - sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra37.repo - - name: Install dependencies - run: | - sudo dnf install -y subatomic-cli - name: Push to subatomic run: | subatomic-cli upload-comps \ diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 1fba08d61f..de4c9550b1 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -11,27 +11,21 @@ jobs: autoupdate: runs-on: ubuntu-latest container: - image: registry.fedoraproject.org/fedora:37 + image: ghcr.io/terrapkg/builder:main options: --cap-add=SYS_ADMIN --privileged steps: - - name: Install packages - run: | - sudo dnf install -y dnf-plugins-core - sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra37.repo - dnf install -y rpmdevtools git python anda - - name: Checkout uses: actions/checkout@v3 with: fetch-depth: 2 ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} - + - name: Install SSH signing key run: | mkdir -p ${{ runner.temp }} echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key chmod 0700 ${{ runner.temp }}/signing_key - + - name: Run Update (anda) run: anda update -vv env: diff --git a/CODEOWNERS b/CODEOWNERS index a838442c91..80bada7762 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -9,8 +9,6 @@ /SECURITY.md @lleyton /anda.hcl @lleyton /comps.xml @lleyton -/requirements.txt @windowsboy111 -/update.sh @windowsboy111 # Package maintainers /anda/lib/libbismuth @lainsce @@ -29,4 +27,4 @@ /anda/srpm-macros @korewaChino /anda/rust/starship @korewaChino /anda/rust/zellij @korewaChino -/anda/audio/distrho @korewaChino \ No newline at end of file +/anda/audio/distrho @korewaChino diff --git a/anda/apps/anki-bin/anda.hcl b/anda/apps/anki-bin/anda.hcl new file mode 100644 index 0000000000..162cf64da4 --- /dev/null +++ b/anda/apps/anki-bin/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "anki-bin.spec" + } +} diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec new file mode 100644 index 0000000000..a91b81f283 --- /dev/null +++ b/anda/apps/anki-bin/anki-bin.spec @@ -0,0 +1,54 @@ +Name: anki-bin +Version: 2.1.56 +Release: 3%{?dist} +Summary: Flashcard program for using space repetition learning (Installed with wheel) +License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY +URL: https://apps.ankiweb.net/ +BuildRequires: python3-installer python3.11 +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 +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 +Source2: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/runanki.py +Source3: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.desktop +Source4: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png +Source5: https://raw.githubusercontent.com/ankitects/anki/%{version}/LICENSE +Source6: https://raw.githubusercontent.com/ankitects/anki/%{version}/README.md + +%description +Anki is a program designed to help you remember facts (such as words +and phrases in a foreign language) as easily, quickly and efficiently +as possible. Anki is based on a theory called spaced repetition. + +%prep + +%build + +%install +python3.11 -m installer --destdir="%{buildroot}" %{SOURCE0} +python3.11 -m installer --destdir="%{buildroot}" %{SOURCE1} +install -Dm755 %{SOURCE2} "%{buildroot}/usr/bin/anki" +install -Dm644 %{SOURCE3} "%{buildroot}/usr/share/applications/anki.desktop" +install -Dm644 %{SOURCE4} "%{buildroot}/usr/share/pixmaps/anki.png" +install -Dm644 %{SOURCE5} "%{buildroot}/%{_datadir}/licenses/%{name}/LICENSE" +install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md" + + +%files +%license LICENSE +%doc README.md +/usr/bin/anki +/usr/lib64/python*/site-packages/_aqt/ +/usr/lib64/python*/site-packages/anki-%{version}.dist-info/ +/usr/lib64/python*/site-packages/anki/ +/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/ +/usr/lib64/python*/site-packages/aqt/ +/usr/share/applications/anki.desktop +/usr/share/pixmaps/anki.png + +%changelog +* Wed Jan 11 2023 windowsboy111 +- Initial package diff --git a/anda/apps/anki-bin/update.rhai b/anda/apps/anki-bin/update.rhai new file mode 100644 index 0000000000..06eb9c5883 --- /dev/null +++ b/anda/apps/anki-bin/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("ankitects/anki")); diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 233486e9aa..6294c21bb9 100644 --- a/anda/apps/anki-qt5/anki-qt5.spec +++ b/anda/apps/anki-qt5/anki-qt5.spec @@ -1,6 +1,6 @@ Name: anki-qt5 Version: 2.1.56 -Release: %autorelease +Release: 2%{?dist} Summary: Flashcard program for using space repetition learning License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY URL: https://apps.ankiweb.net/ @@ -9,7 +9,6 @@ BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-sen 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 -Obsoletes: anki <= 2.1.15 BuildArch: noarch Conflicts: anki Patch0: 0001-No-update.patch @@ -39,22 +38,27 @@ done install -Dm644 qt/bundle/lin/anki.desktop %{buildroot}/%{_datadir}/applications/anki.desktop install -Dm644 qt/bundle/lin/anki.png %{buildroot}/%{_datadir}/pixmaps/anki.png -sed "s*^#!/usr/bin/python\$*#!/usr/bin/python3*" %{buildroot}/%{_bindir}/anki > %{buildroot}/%{_bindir}/anki +sed "s*^#!/usr/bin/python\$*#!/usr/bin/python3*" %{buildroot}/%{_bindir}/anki > %{buildroot}/%{_bindir}/anki1 +rm %{buildroot}/%{_bindir}/anki +mv %{buildroot}/%{_bindir}/anki1 %{buildroot}/%{_bindir}/anki +chmod 755 %{buildroot}%{_bindir}/anki + +find %{buildroot} -iname __pycache__ | xargs -r rm -rf +find %{buildroot} -iname direct_url.json | xargs -r rm -rf %files %license LICENSE* %doc README* %{_bindir}/anki -%{_datadir}/pixmaps/anki.png %{_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/ - %changelog * Tue Jan 3 2023 windowsboy111 - Initial package diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index 5cae07cd62..990dc4ae48 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -1,6 +1,6 @@ Name: anki Version: 2.1.56 -Release: %autorelease +Release: 2%{?dist} Summary: Flashcard program for using space repetition learning License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY URL: https://apps.ankiweb.net/ @@ -38,11 +38,15 @@ done install -Dm644 qt/bundle/lin/anki.desktop %{buildroot}/%{_datadir}/applications/anki.desktop install -Dm644 qt/bundle/lin/anki.png %{buildroot}/%{_datadir}/pixmaps/anki.png -sed "s*^#!/usr/bin/python\$*#!/usr/bin/python3*" %{buildroot}/%{_bindir}/anki > %{buildroot}/%{_bindir}/anki +sed "s*^#!/usr/bin/python\$*#!/usr/bin/python3*" %{buildroot}/%{_bindir}/anki > %{buildroot}/%{_bindir}/anki1 +rm %{buildroot}/%{_bindir}/anki +mv %{buildroot}/%{_bindir}/anki1 %{buildroot}/%{_bindir}/anki find %{buildroot} -iname __pycache__ | xargs -r rm -rf find %{buildroot} -iname direct_url.json | xargs -r rm -rf +chmod 755 %{buildroot}%{_bindir}/anki + %files %license LICENSE* diff --git a/anda/apps/discord-canary-openasar/anda.hcl b/anda/apps/discord-canary-openasar/anda.hcl new file mode 100644 index 0000000000..752fe9e2d4 --- /dev/null +++ b/anda/apps/discord-canary-openasar/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "discord-canary-openasar.spec" + } + labels { + nightly = "1" + } +} diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec new file mode 100644 index 0000000000..f70ca3860d --- /dev/null +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -0,0 +1,49 @@ +%define debug_package %{nil} +%define commit 40b27dd1b8dd48277207db1b165c220c3441484c + +Name: discord-canary-openasar +Version: 0.0.146 +Release: 3%{?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 +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 +Requires: libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver +ExclusiveArch: x86_64 + +%description +%{summary}. + +%prep +%autosetup -n DiscordCanary + +%build +sed "s@discord-canary@discord-canary-openasar@g" discord-canary.desktop > a +sed "s@Discord Canary@Discord Canary OpenAsar@g" a > discord-canary.desktop + +%install +rm -rf $RPM_BUILD_ROOT +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 +cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-canary-openasar/app.asar + + +%files +%{_datadir}/discord-canary-openasar/ +%{_datadir}/applications/discord-canary-openasar.desktop +%{_datadir}/pixmaps/discord-canary-openasar.png + + +%changelog +* Wed Jan 18 2023 windowsboy111 - 0.0.146-1 +- Renamed from openasar-canary to discord-canary-openasar +- Fix issues after removing discord-canary package +- Bundle discord-canary + +* Thu Oct 20 2022 Cappy Ishihara +- diff --git a/anda/apps/openasar-canary/update.rhai b/anda/apps/discord-canary-openasar/update.rhai similarity index 55% rename from anda/apps/openasar-canary/update.rhai rename to anda/apps/discord-canary-openasar/update.rhai index 2f32054a79..34baa14f1a 100644 --- a/anda/apps/openasar-canary/update.rhai +++ b/anda/apps/discord-canary-openasar/update.rhai @@ -5,3 +5,6 @@ if filters.contains("nightly") { rpm.define("commit", sha); rpm.release(); } +let html = get("https://discordapp.com/api/download/canary?platform=linux&format=tar.gz"); +let newver = find("https://dl-canary\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1); +rpm.version(newver); diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index fd31b37fc2..45827907be 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -1,3 +1,5 @@ +%define debug_package %{nil} + Name: discord-canary Version: 0.0.146 Release: 1%{?dist} diff --git a/anda/apps/discord/anda.hcl b/anda/apps/discord/anda.hcl new file mode 100644 index 0000000000..69b5995858 --- /dev/null +++ b/anda/apps/discord/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "discord.spec" + } +} diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec new file mode 100644 index 0000000000..35269ee770 --- /dev/null +++ b/anda/apps/discord/discord.spec @@ -0,0 +1,44 @@ +%define debug_package %{nil} + +Name: discord +Version: 0.0.24 +Release: 1%{?dist} +Summary: Free Voice and Text Chat for Gamers. +URL: 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: 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. + +%prep +%autosetup -n Discord + +%build + +%install +rm -rf $RPM_BUILD_ROOT +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 + +%files +%{_datadir}/discord/ +%{_datadir}/applications/discord.desktop +%{_datadir}/pixmaps/discord.png + +%changelog +* Thu Jan 19 2023 windowsboy111 - 0.0.143-1 +- Initial package diff --git a/anda/apps/discord/update.rhai b/anda/apps/discord/update.rhai new file mode 100644 index 0000000000..cabf84bbc9 --- /dev/null +++ b/anda/apps/discord/update.rhai @@ -0,0 +1,3 @@ +let html = get("https://discordapp.com/api/download?platform=linux&format=tar.gz"); +let newver = find("https://dl\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1); +rpm.version(newver); diff --git a/anda/apps/openasar-canary/anda.hcl b/anda/apps/openasar-canary/anda.hcl deleted file mode 100644 index 6708ead2f5..0000000000 --- a/anda/apps/openasar-canary/anda.hcl +++ /dev/null @@ -1,8 +0,0 @@ -project "pkg" { - rpm { - spec = "openasar-canary.spec" - } - labels { - nightly = "1" - } -} diff --git a/anda/apps/openasar-canary/openasar-canary.spec b/anda/apps/openasar-canary/openasar-canary.spec deleted file mode 100644 index 2f70cd2e32..0000000000 --- a/anda/apps/openasar-canary/openasar-canary.spec +++ /dev/null @@ -1,41 +0,0 @@ -%define commit 0b1d4685cb2c94f42441fc616eb24e69eda04647 - -Name: openasar-canary -Version: nightly.%{autogitdate} -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 - -License: MIT -URL: https://github.com/GooseMod/OpenAsar -Source0: %{url}/releases/download/nightly/app.asar - -Requires: discord-canary - -%description -%{summary}. - -%prep - - -%build - - -%install -mkdir -p %{buildroot}%{_datadir}/openasar-canary -cp -v %{SOURCE0} %{buildroot}%{_datadir}/openasar-canary/app.asar - - -# trigger on discord-canary -%triggerin -- discord-canary -cp %{_datadir}/openasar-canary/app.asar %{_datadir}/discord-canary/resources/app.asar - - - -%files -%{_datadir}/openasar-canary/app.asar - - - -%changelog -* Thu Oct 20 2022 Cappy Ishihara -- diff --git a/anda/dart/dart.spec b/anda/dart/dart.spec index f1721e0f26..d02af7138b 100644 --- a/anda/dart/dart.spec +++ b/anda/dart/dart.spec @@ -1,5 +1,5 @@ Name: dart -Version: 2.18.6 +Version: 2.18.7 Release: 1%{?dist} Summary: The Dart Language License: BSD-3-Clause diff --git a/anda/dart/update.rhai b/anda/dart/update.rhai new file mode 100644 index 0000000000..158569138a --- /dev/null +++ b/anda/dart/update.rhai @@ -0,0 +1,2 @@ +let obj = get("https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION").json(); +rpm.version(obj.version); diff --git a/anda/desktops/elementary/pantheon-tweaks/anda.hcl b/anda/desktops/elementary/pantheon-tweaks/anda.hcl new file mode 100644 index 0000000000..6e4828ef3b --- /dev/null +++ b/anda/desktops/elementary/pantheon-tweaks/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "pantheon-tweaks.spec" + } +} diff --git a/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec b/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec new file mode 100644 index 0000000000..ec081b0268 --- /dev/null +++ b/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec @@ -0,0 +1,39 @@ +Name: pantheon-tweaks +Version: 1.0.4 +Release: %autorelease +Summary: A system settings panel for the Pantheon desktop environment +License: GPL-3.0 +URL: https://github.com/pantheon-tweaks/pantheon-tweaks +Source0: %{url}/archive/refs/tags/%{version}.tar.gz +BuildRequires: vala switchboard-devel pkgconfig(gee-0.8) pkgconfig(glib-2.0) +BuildRequires: granite-devel >= 6.0.0 pkgconfig(gtk+-3.0) meson vala +Requires: glib2 gtk3 libgee granite + +%description +A system settings panel for the Pantheon Desktop that +lets you easily and safely customise your desktop's appearance. + +%prep +%autosetup + +%build +%meson +%meson_build + +%install +%meson_install + +%files +%doc README.md +%license COPYING + +/usr/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 +%{_datadir}/metainfo/pantheon-tweaks.appdata.xml + + +%changelog +* Tue Jan 17 2023 windowsboy111 +- Initial package diff --git a/anda/desktops/elementary/pantheon-tweaks/update.rhai b/anda/desktops/elementary/pantheon-tweaks/update.rhai new file mode 100644 index 0000000000..feadafd1ef --- /dev/null +++ b/anda/desktops/elementary/pantheon-tweaks/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("pantheon-tweaks/pantheon-tweaks")); 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 53c6bb63ce..3c15186316 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 c04bda6d929bfb8aff7407ff68132cae6dfa2964 +%global commit 57c6148dc47da74c6c5fa0e2336db18a868e459a %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec index 7d2cbcd54f..3abf32a937 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: 17.0.2 +Version: 17.0.4 Release: 1%{?dist} Summary: A custom font based on iosevka diff --git a/anda/fonts/manrope/.gitignore b/anda/fonts/manrope/.gitignore new file mode 100644 index 0000000000..ad8d3e2ce3 --- /dev/null +++ b/anda/fonts/manrope/.gitignore @@ -0,0 +1,4 @@ +*.tar.gz +*.zip +*.rpm +*.log \ No newline at end of file diff --git a/anda/fonts/manrope/README.md b/anda/fonts/manrope/README.md new file mode 100644 index 0000000000..a00893803b --- /dev/null +++ b/anda/fonts/manrope/README.md @@ -0,0 +1,3 @@ +# manrope-fonts + +Manrope – modern geometric sans-serif, packaged for use in tauOS diff --git a/anda/fonts/manrope/anda.hcl b/anda/fonts/manrope/anda.hcl new file mode 100644 index 0000000000..2538f123c5 --- /dev/null +++ b/anda/fonts/manrope/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "manrope-fonts.spec" + } +} \ No newline at end of file diff --git a/anda/fonts/manrope/manrope-fonts.spec b/anda/fonts/manrope/manrope-fonts.spec new file mode 100644 index 0000000000..dbd5281ede --- /dev/null +++ b/anda/fonts/manrope/manrope-fonts.spec @@ -0,0 +1,48 @@ +Summary: A modernist sans serif font +Name: manrope-fonts +Version: 1 +Release: 3%{?dist} +License: OFL +URL: https://manropefont.com/ + +Source0: https://manropefont.com/manrope.zip +Source1: README.md +BuildArch: noarch + +%description +Manrope – modern geometric sans-serif + +%prep +yes A | %autosetup -c + +%build + +%install +install -d %{buildroot}%{_datadir}/fonts/manrope +install -pm 644 fonts/otf/*.otf %{buildroot}%{_datadir}/fonts/manrope +install -pm 644 fonts/ttf/*.ttf %{buildroot}%{_datadir}/fonts/manrope +install -pm 644 fonts/variable/Manrope* %{buildroot}%{_datadir}/fonts/manrope + +install -pm 0644 %SOURCE1 README.md + +# Install licenses +mkdir -p licenses +install -pm 0644 %SOURCE1 licenses/LICENSE + +%files +%doc README.md +%doc documentation.html +%license licenses/LICENSE +%{_datadir}/fonts/manrope/* + + +%changelog +* Tue Jan 10 2023 Cappy Ishihara - 1-3 +- Ported from tauOS + + +* Sat May 14 2022 Jamie Murphy - 1-1 +- Fix specfile + +* Sat May 14 2022 Lains - 1-1 +- Initial release diff --git a/anda/fonts/nerd-fonts/nerd-fonts.spec b/anda/fonts/nerd-fonts/nerd-fonts.spec index 08f4c74546..aa13b6334c 100644 --- a/anda/fonts/nerd-fonts/nerd-fonts.spec +++ b/anda/fonts/nerd-fonts/nerd-fonts.spec @@ -2,20 +2,31 @@ %global desc Nerd Fonts is a project that patches developer targeted fonts with a high number of glyphs (icons). Name: nerd-fonts -Version: 2.2.2 +Version: 2.3.1 Release: %autorelease URL: https://nerdfonts.com/ -Source0: https://github.com/ryanoasis/nerd-fonts/archive/refs/tags/v%{version}.tar.gz +Source0: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%{version}/readme.md +Source1: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%{version}/LICENSE License: OFLv1.1 Summary: All packaged Nerd fonts +BuildArch: noarch Requires: %{lua: local x = "" local ver = rpm.expand("%{version}") for font in (rpm.expand("%{flist}")):gmatch("[^ ]+") do - x = x .. font:lower().."="..ver.." " + x = x .. font:lower().."-nerd-fonts".."="..ver.." " end print(x) } +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 + print("Source"..n..url..font..".zip\n") + n = n + 1 +end +} %description %{desc} Specifically to add a high number of extra glyphs from popular @@ -33,31 +44,28 @@ end %global debug_package %{nil} %prep -%autosetup -n %{name}-%{version} +cp %{SOURCE0} . +cp %{SOURCE1} . %build -find patched-fonts -name "* Windows Compatible.*" -delete -find patched-fonts -name "font-info.md" -delete -find patched-fonts -name "readme.md" -delete - -search() { - for folder in $1/*; do - if [[ -d "$folder/complete" ]]; then - mv $folder/complete/* $folder/ - rmdir $folder/complete - else - if [[ -d $folder ]]; then - search $folder - fi - fi - done - return 0 -} -search patched-fonts %install -mkdir -p %{buildroot}/%{_datadir}/fonts/nerd-fonts/ -cp -r patched-fonts/* %{buildroot}/%{_datadir}/fonts/nerd-fonts/ +mkdir -p %{buildroot}/usr/share/fonts/nerd-fonts/ +%{lua: +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.."}") + 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 & +wait %files diff --git a/anda/fonts/vl-gothic/vl-gothic-fonts.spec b/anda/fonts/vl-gothic/vl-gothic-fonts.spec index 825a339717..5e48b2e748 100644 --- a/anda/fonts/vl-gothic/vl-gothic-fonts.spec +++ b/anda/fonts/vl-gothic/vl-gothic-fonts.spec @@ -20,7 +20,7 @@ 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 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 diff --git a/anda/games/prismlauncher-nightly/0001-find-cmark-with-pkgconfig.patch b/anda/games/prismlauncher-nightly/0001-find-cmark-with-pkgconfig.patch new file mode 100644 index 0000000000..d41ef66bec --- /dev/null +++ b/anda/games/prismlauncher-nightly/0001-find-cmark-with-pkgconfig.patch @@ -0,0 +1,79 @@ +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 0b60bacb04..71dfc9cf22 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 61144f7a219995fa29531683ed36e8e4002848b5 +%global commit 1a35fec1341323950eb5cb4ee1d2791b2241db67 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 @@ -49,6 +49,7 @@ Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commi Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz +Patch0: 0001-find-cmark-with-pkgconfig.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules @@ -69,6 +70,7 @@ BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} BuildRequires: cmake(Qt6Core5Compat) %endif +BuildRequires: pkgconfig(libcmark) BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -96,7 +98,7 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep -%autosetup -n PrismLauncher-%{commit} +%autosetup -p1 -n PrismLauncher-%{commit} tar -xzf %{SOURCE1} -C libraries tar -xvf %{SOURCE2} -C libraries @@ -177,6 +179,12 @@ fi %changelog +* Sun Jan 15 2023 seth - 7.0^20230115.f1247d2-1 +- add 0001-find-cmark-with-pkgconfig.patch + +* Fri Jan 13 2023 seth - 7.0^20230113.3de681d-1 +- add cmark as a build dep + * Tue Jan 03 2023 seth - 7.0^20230102.4b12c85-1 - add qlogging categories 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 new file mode 100644 index 0000000000..d41ef66bec --- /dev/null +++ b/anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch @@ -0,0 +1,79 @@ +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 139c0704be..2a3e67118d 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 61144f7a219995fa29531683ed36e8e4002848b5 +%global commit 1a35fec1341323950eb5cb4ee1d2791b2241db67 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 @@ -49,6 +49,7 @@ Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commi Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz +Patch0: 0001-find-cmark-with-pkgconfig.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules @@ -69,6 +70,7 @@ BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} BuildRequires: cmake(Qt6Core5Compat) %endif +BuildRequires: pkgconfig(libcmark) BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -97,7 +99,7 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep -%autosetup -n PrismLauncher-%{commit} +%autosetup -p1 -n PrismLauncher-%{commit} tar -xzf %{SOURCE1} -C libraries tar -xvf %{SOURCE2} -C libraries @@ -178,6 +180,12 @@ fi %changelog +* Sun Jan 15 2023 seth - 7.0^20230115.f1247d2-1 +- add 0001-find-cmark-with-pkgconfig.patch + +* Fri Jan 13 2023 seth - 7.0^20230113.3de681d-1 +- add cmark as a build dep + * Tue Jan 03 2023 seth - 7.0^20230102.4b12c85-1 - add qlogging categories diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 2e1a5affb0..0dd4cedb0c 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.2.21 +Version: 1.2.51 Release: 1%{?dist} License: GPLv3 URL: https://github.com/tau-OS/libhelium diff --git a/anda/nim/choosenim/choosenim.spec b/anda/nim/choosenim/choosenim.spec index aab65fa07a..ae9410cb75 100644 --- a/anda/nim/choosenim/choosenim.spec +++ b/anda/nim/choosenim/choosenim.spec @@ -1,6 +1,6 @@ Name: choosenim Version: 0.8.4 -Release: %autorelease +Release: 2%{?dist} Summary: Tool for easily installing and managing multiple versions of the Nim programming language License: BSD-3-Clause URL: https://github.com/dom96/choosenim @@ -21,9 +21,9 @@ sources, enabling you to easily switch between stable and development compilers. %install mkdir -p %{buildroot}/%{_datadir}/licenses/%{name}/ mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/ -install -Dm 755 %{SOURCE0} -t "%{buildroot}/%{_bindir}/choosenim" -install -Dm 644 %{SOURCE1} -t "%{buildroot}/%{_datadir}/licenses/%{name}/LICENSE" -install -Dm 644 %{SOURCE2} -t "%{buildroot}/%{_datadir}/doc/%{name}/readme.md" +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" %files %doc readme.md diff --git a/anda/nim/nim/nim.spec b/anda/nim/nim/nim.spec index 2fd6f46a16..131adb1b60 100644 --- a/anda/nim/nim/nim.spec +++ b/anda/nim/nim/nim.spec @@ -1,5 +1,5 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global debug_package %{nil} +%global debug_package %{nil} Name: nim Version: 1.6.10 @@ -68,10 +68,10 @@ sed -i '/= 2.9.12 BuildRequires: pkgconfig(librsvg-2.0) >= 2.54.0 BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(graphene-gobject-1.0) +BuildRequires: pkgconfig(gee-0.8) Source0: %{url}/-/archive/v%{version}/blackbox-v%{version}.tar.gz %description diff --git a/anda/others/tau-helium/tau-helium.spec b/anda/others/tau-helium/tau-helium.spec index 9bc8c1aa78..ba7213749c 100644 --- a/anda/others/tau-helium/tau-helium.spec +++ b/anda/others/tau-helium/tau-helium.spec @@ -1,6 +1,6 @@ Summary: tauOS GTK/GNOME Shell Themes Name: tau-helium -Version: 1.1.41 +Version: 1.1.62 Release: 1%{?dist} License: GPLv3 URL: https://github.com/tau-OS/tau-helium diff --git a/anda/python/orjson/python3-orjson.spec b/anda/python/orjson/python3-orjson.spec index f67e07df4d..f2cd95a18a 100644 --- a/anda/python/orjson/python3-orjson.spec +++ b/anda/python/orjson/python3-orjson.spec @@ -1,13 +1,15 @@ +%global debug_package %{nil} + Name: python3-orjson Version: 3.8.5 -Release: %autorelease +Release: 2%{?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 -BuildArch: noarch -BuildRequires: maturin cargo python3.11 python3-pip -Requires: libc +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 @@ -21,12 +23,22 @@ serializes dataclass, datetime, numpy, and UUID instances natively. maturin build --release --strip %install -pip 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 LICENSE-APACHE -%license LICENSE-MIT +%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 diff --git a/anda/python/protobuf/python3-protobuf.spec b/anda/python/protobuf/python3-protobuf.spec index 8511e7781a..e98e5cc272 100644 --- a/anda/python/protobuf/python3-protobuf.spec +++ b/anda/python/protobuf/python3-protobuf.spec @@ -36,9 +36,6 @@ rm -rf %{pypi_name}.egg-info %install %py3_install -%check -%{__python3} setup.py test - %files -n python3-%{pypi_name} %license LICENSE %doc README.md diff --git a/anda/python/python3-protobuf/python3-python3-protobuf.spec b/anda/python/python3-protobuf/python3-python3-protobuf.spec index 137675ddf2..83439e0ce8 100644 --- a/anda/python/python3-protobuf/python3-python3-protobuf.spec +++ b/anda/python/python3-protobuf/python3-python3-protobuf.spec @@ -7,7 +7,7 @@ Release: 1%{?dist} Summary: Protocol Buffers License: New BSD License -URL: http://code.google.com/p/protobuf/ +URL: https://developers.google.com/protocol-buffers/ Source0: %{pypi_source} BuildArch: noarch @@ -32,8 +32,8 @@ sed "s@\t@ @g" google/protobuf/internal/cpp_message.py > google/protobuf/inte %install %py3_install -#%check -#%{__python3} setup.py test +%dnl %check +%dnl %{__python3} setup.py test %files %doc README.txt diff --git a/anda/rust/joshuto/anda.hcl b/anda/rust/joshuto/anda.hcl new file mode 100644 index 0000000000..90901a334a --- /dev/null +++ b/anda/rust/joshuto/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "rust-joshuto.spec" + } +} diff --git a/anda/rust/joshuto/rust-joshuto.spec b/anda/rust/joshuto/rust-joshuto.spec new file mode 100644 index 0000000000..dfc6222dad --- /dev/null +++ b/anda/rust/joshuto/rust-joshuto.spec @@ -0,0 +1,48 @@ +# Generated by rust2rpm 23 +%bcond_without check + +%global crate joshuto + +Name: rust-joshuto +Version: 0.9.4 +Release: %autorelease +Summary: Terminal file manager inspired by ranger + +License: LGPL-3.0 +URL: https://crates.io/crates/joshuto +Source: %{crates_source} + +BuildRequires: anda-srpm-macros rust-packaging >= 21 + +%global _description %{expand: +Terminal file manager inspired by ranger.} + +%description %{_description} + +%package -n %{crate} +Summary: %{summary} + +%description -n %{crate} %{_description} + +%files -n %{crate} +%license LICENSE +%doc README.md +%{_bindir}/joshuto + +%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/joshuto/update.rhai b/anda/rust/joshuto/update.rhai new file mode 100644 index 0000000000..a43949c704 --- /dev/null +++ b/anda/rust/joshuto/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("joshuto")); diff --git a/anda/tools/fuc/anda.hcl b/anda/tools/fuc/anda.hcl new file mode 100644 index 0000000000..be1a58f807 --- /dev/null +++ b/anda/tools/fuc/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "fuc.spec" + } +} diff --git a/anda/tools/fuc/fuc.spec b/anda/tools/fuc/fuc.spec new file mode 100644 index 0000000000..08f1a5e84a --- /dev/null +++ b/anda/tools/fuc/fuc.spec @@ -0,0 +1,58 @@ +%global debug_package %{nil} + +Name: fuc +Version: 1.1.3 +Release: %autorelease +Summary: Modern, performance focused unix commands +URL: https://github.com/SUPERCILEX/fuc +Source0: https://raw.githubusercontent.com/SUPERCILEX/fuc/%{version}/README.md +Source1: https://raw.githubusercontent.com/SUPERCILEX/fuc/%{version}/LICENSE +%ifarch x86_64 +Source2: %{url}/releases/download/%{version}/rmz-x86_64-unknown-linux-gnu +Source3: %{url}/releases/download/%{version}/cpz-x86_64-unknown-linux-gnu +%elifarch aarch64 +Source2: %{url}/releases/download/%{version}/rmz-aarch64-unknown-linux-gnu +Source3: %{url}/releases/download/%{version}/cpz-aarch64-unknown-linux-gnu +%endif +License: Apache-2.0 +Requires: cpz rmz + +%description +Fast Unix Commands, +the FUC-ing project providing modern unix commands focused on performance. + +%package -n rmz +Summary: Fast `rm` command from the FUC project + +%description -n rmz +%{summary}. See the `fuc` package. + +%package -n cpz +Summary: Fast `cp` command from the FUC project + +%description -n cpz +%{summary}. See the `fuc` package. + +%prep + +%build + +%install +install -Dm644 %{SOURCE0} "%{buildroot}/%{_datadir}/doc/%{name}/README.md" +install -Dm644 %{SOURCE1} "%{buildroot}/%{_datadir}/licenses/%{name}/LICENSE" +install -Dm755 %{SOURCE2} %{buildroot}/usr/bin/rmz +install -Dm755 %{SOURCE3} %{buildroot}/usr/bin/cpz + +%files +%doc README.md +%license LICENSE + +%files -n rmz +/usr/bin/rmz + +%files -n cpz +/usr/bin/cpz + +%changelog +* Wed Jan 18 2023 windowsboy111 +- Initial package diff --git a/anda/tools/fuc/update.rhai b/anda/tools/fuc/update.rhai new file mode 100644 index 0000000000..f6a1b02b70 --- /dev/null +++ b/anda/tools/fuc/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("SUPERCILEX/fuc")); diff --git a/anda/tools/vala-language-server-nightly/anda.hcl b/anda/tools/vala-language-server-nightly/anda.hcl new file mode 100644 index 0000000000..613d80c672 --- /dev/null +++ b/anda/tools/vala-language-server-nightly/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "vala-language-server-nightly.spec" + } +} diff --git a/anda/tools/vala-language-server-nightly/update.rhai b/anda/tools/vala-language-server-nightly/update.rhai new file mode 100644 index 0000000000..e0a8ec4eed --- /dev/null +++ b/anda/tools/vala-language-server-nightly/update.rhai @@ -0,0 +1,11 @@ +let req = new_req("https://api.github.com/repos/vala-lang/vala-language-server/commits/HEAD"); +req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`); +let _sha = json(req.get()) @ "sha"; +let sha = _sha.str(); +let cur = find("%global commit (.+)", rpm.f, 1); +if sha != cur { + print(`vala-language-server-nightly: ${cur} -> ${sha}`); + rpm.f = sub("%global commit (.+)", `%global commit ${sha}`, rpm.f); +} else { + print("vala-language-server-nightly: Up to date!"); +} diff --git a/anda/tools/vala-language-server-nightly/vala-language-server-nightly.spec b/anda/tools/vala-language-server-nightly/vala-language-server-nightly.spec new file mode 100644 index 0000000000..da5361e1de --- /dev/null +++ b/anda/tools/vala-language-server-nightly/vala-language-server-nightly.spec @@ -0,0 +1,73 @@ +%global real_name vala-language-server + +%global commit 7577ffb269cd31da8815b7eadd72867965a2c742 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +%global commit_date %(date '+%Y%m%d') +%global snapshot_info %{commit_date}.%{shortcommit} + +Name: vala-language-server-nightly +Summary: Language server for the Vala programming language +Version: 0.48.5^%{snapshot_info} +Release: 1%{?dist} +# The entire source is LGPLv2+, except plugins/gnome-builder/vala_langserv.py, which is GPLv3+. +# It is not installed when the "plugins" meson option is set to false. +# Since GNOME Builder 41, the VLS the plugin has been included. +License: LGPLv2+ + +URL: https://github.com/vala-lang/vala-language-server +Source0: https://github.com/vala-lang/vala-language-server/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz + +BuildRequires: cmake +BuildRequires: gcc +BuildRequires: meson +BuildRequires: ninja-build +BuildRequires: vala >= 0.48.12 +BuildRequires: vala-devel >= 0.48.12 + +BuildRequires: pkgconfig(gee-0.8) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(json-glib-1.0) >= 1.4.4 +BuildRequires: pkgconfig(jsonrpc-glib-1.0) >= 3.28 +BuildRequires: pkgconfig(scdoc) + +Requires: glib2-static%{?_isa} +Requires: json-glib%{?_isa} +Requires: jsonrpc-glib%{?_isa} +Requires: libgee%{?_isa} +Requires: libvala%{?_isa} >= 0.48.12 + +Recommends: gobject-introspection-devel + +Suggests: gnome-builder + +Conflicts: vala-language-server +Provides: vala-language-server = 0.48.5^%{snapshot_info} +Provides: vala-language-server%{?_isa} = 0.48.5^%{snapshot_info} + +%description +Provides code intelligence for Vala (and also Genie). +Used with an editor and a plugin that supports the Language Server Protocol. + + +%prep +%autosetup -n %{real_name}-%{commit} + +%build +%meson -Dplugins=false +%meson_build +%install +%meson_install +%files +%license COPYING +%doc README.md + +%{_bindir}/%{real_name} +%{_mandir}/man1/%{real_name}.1* + +%changelog +* Sat Jan 14 2023 lleyton +- Initial package