diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 19c1dcde34..3e3103c9a2 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -78,10 +78,8 @@ jobs: echo "## AppStream MetaInfo Validation" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo '```xml' >> $GITHUB_STEP_SUMMARY - for file in output/test.xml.gz; do - appstreamcli validate $file >> $GITHUB_STEP_SUMMARY || true - echo "" >> $GITHUB_STEP_SUMMARY - done + appstreamcli validate output/test.xml.gz >> $GITHUB_STEP_SUMMARY || true + echo "" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY - name: Export logs @@ -117,7 +115,7 @@ jobs: echo "#### \`$file\`" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo '```xml' >> $GITHUB_STEP_SUMMARY - zcat "$file" >> $GITHUB_STEP_SUMMARY + zcat "$file" >> $GITHUB_STEP_SUMMARY || true echo '```' >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY done diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index f3137c04ab..a9e1f51bbe 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -45,7 +45,7 @@ jobs: pkg: ${{ fromJson(inputs.packages) }} version: ["rawhide"] fail-fast: false - runs-on: ${{ inputs.custom_builder && inputs.custom_builder || (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && format('cirun-x86-64-lg--{0}', github.run_id) || 'ubuntu-22.04' }} + runs-on: ${{ inputs.custom_builder && inputs.custom_builder || (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'cirun-arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && format('cirun-x86-64-lg--{0}', github.run_id) || 'ubuntu-22.04' }} container: image: ghcr.io/terrapkg/builder:f${{ matrix.version }} options: --cap-add=SYS_ADMIN --privileged diff --git a/README.md b/README.md index 54093e8368..2c71d59f8c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Terra is a rolling-release Fedora repository for all the software you need. With Terra, you can install the latest packages knowing that quality and security are assured. -See the introduction at [our website](https://terra.fyralabs.com). +See the introduction at [our website](https://terrapkg.com). This monorepo contains the package manifests for all packages in Terra. diff --git a/anda/apps/auto-cpufreq/anda.hcl b/anda/apps/auto-cpufreq/anda.hcl new file mode 100644 index 0000000000..850557c4c1 --- /dev/null +++ b/anda/apps/auto-cpufreq/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "auto-cpufreq.spec" + } +} diff --git a/anda/apps/auto-cpufreq/auto-cpufreq.spec b/anda/apps/auto-cpufreq/auto-cpufreq.spec new file mode 100644 index 0000000000..501b88edf3 --- /dev/null +++ b/anda/apps/auto-cpufreq/auto-cpufreq.spec @@ -0,0 +1,87 @@ +%global _desc Automatic CPU speed & power optimizer for Linux. + +Name: python-auto-cpufreq +Version: 3.0.0 +Release: 2%?dist +Summary: Automatic CPU speed & power optimizer for Linux +License: LGPL-3.0-or-later +URL: https://foolcontrol.org/?p=4603 +Source0: https://github.com/AdnanHodzic/auto-cpufreq/archive/refs/tags/v%{version}.tar.gz +Patch0: prevent-install-and-copy.patch + +BuildRequires: python3-devel +BuildRequires: python3-wheel +BuildRequires: python3-setuptools +BuildRequires: python3-pip +BuildRequires: python3-installer +BuildRequires: systemd-rpm-macros +BuildRequires: python3-poetry-core +BuildRequires: python3-poetry-dynamic-versioning +BuildArch: noarch + +Packager: Owen Zimmerman + +%description +%_desc + +%package -n python3-auto-cpufreq +Summary: %{summary} +%{?python_provide:%python_provide python3-auto-cpufreq} + +%description -n python3-auto-cpufreq +%_desc + +%prep +%git_clone https://github.com/AdnanHodzic/auto-cpufreq.git %{version} +%patch -P0 -p1 + +%build +%pyproject_wheel + +%install +%pyproject_install +%pyproject_save_files auto_cpufreq +mkdir -p %{buildroot}%{_datadir}/polkit-1/actions/ +install -Dm644 scripts/org.auto-cpufreq.pkexec.policy %{buildroot}%{_datadir}/polkit-1/actions/ +install -Dm644 images/icon.png %{buildroot}%{_hicolordir}/512x512/apps/auto-cpufreq.png +install -Dm644 images/icon.png %{buildroot}%{_datadir}/%{name}/icon.png + +mkdir -p %{buildroot}%{_datadir}/auto-cpufreq/scripts/ +mkdir -p %{buildroot}/opt/auto-cpufreq/ +mkdir -p %{buildroot}%{_appsdir}/ +mkdir -p %{buildroot}%{_unitdir}/ + +install -Dm755 scripts/auto-cpufreq-install.sh %{buildroot}%{_datadir}/auto-cpufreq/scripts/ +install -Dm755 scripts/auto-cpufreq-remove.sh %{buildroot}%{_datadir}/auto-cpufreq/scripts/ +install -Dm644 scripts/auto-cpufreq.service %{buildroot}%{_unitdir}/auto-cpufreq.service +install -Dm755 scripts/cpufreqctl.sh %{buildroot}%{_datadir}/auto-cpufreq/scripts/ +install -Dm644 scripts/style.css %{buildroot}%{_datadir}/auto-cpufreq/scripts/ +install -Dm644 scripts/auto-cpufreq-gtk.desktop %{buildroot}%{_appsdir}/ + +%post +%systemd_post auto-cpufreq.service + +%preun +%systemd_preun auto-cpufreq.service + +%postun +%systemd_postun_with_restart auto-cpufreq.service + +%files -n python3-auto-cpufreq -f %{pyproject_files} +%doc README.md +%license LICENSE +%{_bindir}/auto-cpufreq +%{_bindir}/auto-cpufreq-gtk +%{_datadir}/polkit-1/actions/org.auto-cpufreq.pkexec.policy +%{_hicolordir}/512x512/apps/auto-cpufreq.png +%{_datadir}/%{name}/icon.png +%{_unitdir}/auto-cpufreq.service +%{_datadir}/auto-cpufreq/scripts/ +%{_appsdir}/auto-cpufreq-gtk.desktop + +%changelog +* Tue Apr 07 2026 Owen Zimmerman +- Add install fix patch + +* Sun Apr 05 2026 Owen Zimmerman +- Initial commit diff --git a/anda/apps/auto-cpufreq/prevent-install-and-copy.patch b/anda/apps/auto-cpufreq/prevent-install-and-copy.patch new file mode 100644 index 0000000000..776b61452b --- /dev/null +++ b/anda/apps/auto-cpufreq/prevent-install-and-copy.patch @@ -0,0 +1,101 @@ +diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py +index f03e7de..2dff5fb 100755 +--- a/auto_cpufreq/core.py ++++ b/auto_cpufreq/core.py +@@ -277,19 +277,12 @@ def get_current_gov(): + ) + + def cpufreqctl(): +- """ +- deploy cpufreqctl.auto-cpufreq script +- """ +- if not (IS_INSTALLED_WITH_SNAP or os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq")): +- copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq") +- call(["chmod", "a+x", "/usr/local/bin/cpufreqctl.auto-cpufreq"]) ++ # scripts are already in the correct place ++ pass + + def cpufreqctl_restore(): +- """ +- remove cpufreqctl.auto-cpufreq script +- """ +- if not IS_INSTALLED_WITH_SNAP and os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"): +- os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq") ++ #no need to restore ++ pass + + def footer(l=79): print("\n" + "-" * l + "\n") + +@@ -307,31 +300,8 @@ def remove_complete_msg(): + footer() + + def deploy_daemon(): +- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") +- +- cpufreqctl() # deploy cpufreqctl script func call +- +- bluetooth_disable() # turn off bluetooth on boot +- +- auto_cpufreq_stats_path.touch(exist_ok=True) +- +- print("\n* Deploy auto-cpufreq install script") +- copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install") +- call(["chmod", "a+x", "/usr/local/bin/auto-cpufreq-install"]) +- +- print("\n* Deploy auto-cpufreq remove script") +- copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove") +- call(["chmod", "a+x", "/usr/local/bin/auto-cpufreq-remove"]) +- +- # output warning if gnome power profile is running +- gnome_power_detect_install() +- gnome_power_svc_disable() +- +- tuned_svc_disable() +- +- tlp_service_detect() # output warning if TLP service is detected +- +- call("/usr/local/bin/auto-cpufreq-install", shell=True) ++ # prevent needless copying and system changes ++ pass + + def deploy_daemon_performance(): + print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon (performance) " + "-" * 22 + "\n") +@@ -363,37 +333,7 @@ def deploy_daemon_performance(): + + call("/usr/local/bin/auto-cpufreq-install", shell=True) + +-def remove_daemon(): +- # check if auto-cpufreq is installed +- if not os.path.exists("/usr/local/bin/auto-cpufreq-remove"): +- print("\nauto-cpufreq daemon is not installed.\n") +- sys.exit(1) +- +- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n") +- +- bluetooth_enable() # turn on bluetooth on boot +- +- # output warning if gnome power profile is stopped +- gnome_power_rm_reminder() +- gnome_power_svc_enable() +- +- tuned_svc_enable() +- +- # run auto-cpufreq daemon remove script +- call("/usr/local/bin/auto-cpufreq-remove", shell=True) +- +- # remove auto-cpufreq-remove +- os.remove("/usr/local/bin/auto-cpufreq-remove") +- +- # delete override pickle if it exists +- if os.path.exists(governor_override_state): os.remove(governor_override_state) +- +- # delete stats file +- if auto_cpufreq_stats_path.exists(): +- if auto_cpufreq_stats_file is not None: auto_cpufreq_stats_file.close() +- auto_cpufreq_stats_path.unlink() +- +- cpufreqctl_restore() # restore original cpufrectl script ++def remove_daemon(): pass + + def gov_check(): + for gov in AVAILABLE_GOVERNORS: diff --git a/anda/apps/auto-cpufreq/update.rhai b/anda/apps/auto-cpufreq/update.rhai new file mode 100644 index 0000000000..46dee26f1d --- /dev/null +++ b/anda/apps/auto-cpufreq/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("AdnanHodzic/auto-cpufreq")); diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index e6ac39597a..afdf2a4c43 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.949 +Version: 0.0.954 Release: 1%{?dist} Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 42e07660ee..80b3461d10 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.949 +Version: 0.0.954 Release: 1%{?dist} Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index dd4b72652d..1f44ad1111 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.185 +Version: 0.0.186 Release: 1%{?dist} Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index fd4cfb0693..7bc8c9fa22 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.185 +Version: 0.0.186 Release: 1%{?dist} Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 60ff91854c..3539b07392 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit 2f731053537044b1f72b259bea795473ea0c205a -%global commit_date 20260324 +%global commit 0149a82705e97b2f9cdccbc6076b4f213c9dc890 +%global commit_date 20260410 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/flameshot/flameshot-nightly.spec b/anda/apps/flameshot/flameshot-nightly.spec index 40a397875d..919af563c8 100644 --- a/anda/apps/flameshot/flameshot-nightly.spec +++ b/anda/apps/flameshot/flameshot-nightly.spec @@ -1,9 +1,9 @@ #? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec %global ver 13.3.0 -%global commit 526fb82c8152a9be38522ae985d30ab866ff7946 +%global commit d888a3f16c26eeb9e355b0a8a29cec2da7697cb2 %global shortcommit %{sub %{commit} 1 7} -%global commit_date 20260408 +%global commit_date 20260409 %global devel_name QtColorWidgets %global _distro_extra_cflags -fuse-ld=mold %global _distro_extra_cxxflags -fuse-ld=mold diff --git a/anda/apps/goofcord/nightly/goofcord-nightly.spec b/anda/apps/goofcord/nightly/goofcord-nightly.spec index 4413571b98..6069896182 100644 --- a/anda/apps/goofcord/nightly/goofcord-nightly.spec +++ b/anda/apps/goofcord/nightly/goofcord-nightly.spec @@ -1,7 +1,7 @@ -%global commit cf4b316c5ae1f8200071eb0886152f84bb7aaf2e +%global commit 5e55462aa5db85554b4252411c17160b34a71d3b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20260407 -%global ver 2.1.1^ +%global commit_date 20260410 +%global ver 2.2.0^ %global base_name goofcord %global git_name GoofCord %global appid io.github.milkshiift.GoofCord diff --git a/anda/apps/goofcord/stable/goofcord.spec b/anda/apps/goofcord/stable/goofcord.spec index ac1813f643..8e7d25a872 100644 --- a/anda/apps/goofcord/stable/goofcord.spec +++ b/anda/apps/goofcord/stable/goofcord.spec @@ -2,7 +2,7 @@ %global appid io.github.milkshiift.GoofCord Name: goofcord -Version: 2.1.1 +Version: 2.2.0 Release: 1%{?dist} License: OSL-3.0 Summary: A privacy-minded Legcord fork. diff --git a/anda/apps/gurk/gurk.spec b/anda/apps/gurk/gurk.spec index d088ef6423..ee64fffc92 100644 --- a/anda/apps/gurk/gurk.spec +++ b/anda/apps/gurk/gurk.spec @@ -1,8 +1,8 @@ %undefine __brp_mangle_shebangs Name: gurk -Version: 0.9.0 -Release: 1%?dist +Version: 0.9.1 +Release: 1%{?dist} Summary: Signal Messenger client for terminal License: AGPL-3.0-or-later AND (MIT OR Apache-2.0) AND Unicode-3.0 AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND ISC AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND (BSD-3-Clause OR Apache-2.0) AND (BSD-3-Clause OR MIT OR Apache-2.0) AND BSL-1.0 AND CDLA-Permissive-2.0 AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR BSD-1-Clause) AND (MIT OR Apache-2.0 OR LGPL-2.1-or-later) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) URL: https://github.com/boxdot/gurk-rs diff --git a/anda/apps/helium-browser-bin/helium-browser-bin.spec b/anda/apps/helium-browser-bin/helium-browser-bin.spec index 50dc62cbc3..c47392004b 100644 --- a/anda/apps/helium-browser-bin/helium-browser-bin.spec +++ b/anda/apps/helium-browser-bin/helium-browser-bin.spec @@ -11,7 +11,7 @@ %endif Name: helium-browser-bin -Version: 0.10.8.1 +Version: 0.11.1.1 Release: 1%{?dist} Summary: Private, fast, and honest web browser based on Chromium diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 329e0ca82d..f8a9fb4862 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -3,10 +3,9 @@ %global gtk4_version 4.14.4 %global libadwaita_version 1.5.1 %global pure_protobuf_version 2.0.0 -%global raw_ver v50.1.0 Name: komikku -Version: 50.1.0 +Version: 50.2.0 %forgemeta Release: 1%{?dist} Summary: A manga reader for GNOME @@ -15,7 +14,7 @@ BuildArch: noarch License: GPL-3.0-or-later URL: https://apps.gnome.org/Komikku/ -Source0: https://codeberg.org/valos/%{appname}/archive/%{raw_ver}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://codeberg.org/valos/%{appname}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: intltool diff --git a/anda/apps/komikku/update.rhai b/anda/apps/komikku/update.rhai index 13da8a9cef..4fddd2b9d3 100644 --- a/anda/apps/komikku/update.rhai +++ b/anda/apps/komikku/update.rhai @@ -1,4 +1 @@ -let latest_tag = get("https://codeberg.org/api/v1/repos/valos/Komikku/tags").json_arr()[0].name; -let new_version = find("([\\.\\d]+)", latest_tag, 1); -rpm.global("raw_ver", latest_tag); -rpm.version(new_version); +rpm.version(codeberg("valos/Komikku")); diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 29b4d9c16e..a0c74cd284 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit c4920f05272e7c7b52794eca4e8cf808b49dabea -%global commit_date 20260405 +%global commit a531e04db0e7b25a7cbdf19d5338350cda75d394 +%global commit_date 20260412 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %nil %global __strip /bin/true diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 86714246a7..686e4d6a4b 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,9 +1,9 @@ # Disable X11 for RHEL 10+ %bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10] -%global commit e2180e581e483e75c11670f4b3890e1f33be85f2 +%global commit 062f4bf04798e5cf697348e3a95e1960bc9e7e9f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20260407 +%global commit_date 20260412 %global ver 0.41.0 Name: mpv-nightly diff --git a/anda/apps/proton-vpn/proton-vpn.spec b/anda/apps/proton-vpn/proton-vpn.spec index ed86769500..8f7713bd51 100644 --- a/anda/apps/proton-vpn/proton-vpn.spec +++ b/anda/apps/proton-vpn/proton-vpn.spec @@ -1,4 +1,4 @@ -%global metainfo_commit eddfed5f7e2cd6f097cd11ad1bc8773c22a418a1 +%global metainfo_commit 6ac72069fc35f3c2ec669498680037f54cc0c120 Name: proton-vpn-gtk-app Version: 4.15.2 diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 6bc43fea4d..669275f25d 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2026-04-08 +%global ver 2026-04-12 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/apps/rustnet/rustnet.spec b/anda/apps/rustnet/rustnet.spec index bdd6e17249..dae29ba6d1 100644 --- a/anda/apps/rustnet/rustnet.spec +++ b/anda/apps/rustnet/rustnet.spec @@ -1,5 +1,5 @@ Name: rustnet -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Summary: A cross-platform network monitoring terminal UI tool built with Rust License: Apache-2.0 AND (MIT OR Apache-2.0) AND Unicode-3.0 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (BSD-3-Clause OR Apache-2.0) AND BSL-1.0 AND ISC AND (LGPL-2.1-only OR BSD-2-Clause) AND (MIT OR Apache-2.0 OR LGPL-2.1-or-later) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib diff --git a/anda/apps/signal-desktop/signal-desktop.spec b/anda/apps/signal-desktop/signal-desktop.spec index 48eceff6f4..ae9203c46b 100644 --- a/anda/apps/signal-desktop/signal-desktop.spec +++ b/anda/apps/signal-desktop/signal-desktop.spec @@ -2,7 +2,7 @@ Name: signal-desktop %electronmeta -aD -Version: 8.5.0 +Version: 8.6.0 Release: 1%{?dist} Summary: A private messenger for Windows, macOS, and Linux URL: https://signal.org diff --git a/anda/apps/throne/Sagernet.SingBox.Version.txt b/anda/apps/throne/Sagernet.SingBox.Version.txt index 28a68e9bee..8af00a4288 100644 --- a/anda/apps/throne/Sagernet.SingBox.Version.txt +++ b/anda/apps/throne/Sagernet.SingBox.Version.txt @@ -1 +1 @@ -v1.13.63 \ No newline at end of file +v1.13.73 \ No newline at end of file diff --git a/anda/apps/throne/throne.spec b/anda/apps/throne/throne.spec index cd0b2e97ce..833db62722 100644 --- a/anda/apps/throne/throne.spec +++ b/anda/apps/throne/throne.spec @@ -1,7 +1,7 @@ #? https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=throne-git Name: throne -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Qt based cross-platform GUI proxy configuration manager (backend: sing-box) URL: https://github.com/throneproj/Throne diff --git a/anda/apps/winetricks/git/winetricks-git.spec b/anda/apps/winetricks/git/winetricks-git.spec index 991be6d289..d75a454055 100644 --- a/anda/apps/winetricks/git/winetricks-git.spec +++ b/anda/apps/winetricks/git/winetricks-git.spec @@ -1,9 +1,9 @@ # Fedora sometimes sources the snapshots under stable versions and just bumps release # For user clarity I have separated these into different packages -%global commit 205d3c652e1de440de8ccb39ce99fe877109a0bb +%global commit 14b802e419aff260b9d630e71027d88855e224e7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 20260125 -%global commit_date 20260402 +%global commit_date 20260411 Name: winetricks-git Version: %{ver}^%{commit_date}git.%{shortcommit} diff --git a/anda/desktops/elementary/capnet-assist/anda.hcl b/anda/desktops/elementary/capnet-assist/anda.hcl new file mode 100644 index 0000000000..644f0f79b1 --- /dev/null +++ b/anda/desktops/elementary/capnet-assist/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "capnet-assist.spec" + } +} diff --git a/anda/desktops/elementary/capnet-assist/capnet-assist.spec b/anda/desktops/elementary/capnet-assist/capnet-assist.spec new file mode 100644 index 0000000000..85d9f8808c --- /dev/null +++ b/anda/desktops/elementary/capnet-assist/capnet-assist.spec @@ -0,0 +1,50 @@ +%global appid io.elementary.capnet-assist + +Name: capnet-assist +Version: 8.0.2 +Release: 1%?dist +Summary: Captive Network Assistant automatically opens to help you get connected +License: GPL-3.0-only +URL: https://github.com/elementary/capnet-assist +Source0: %url/archive/refs/tags/%version.tar.gz +BuildRequires: meson gettext vala desktop-file-utils +BuildRequires: pkgconfig(gcr-4) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(granite-7) >= 7.0.0 +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libadwaita-1) >= 1.0.0 +BuildRequires: pkgconfig(webkitgtk-6.0) + +%description +Log into captive portals—like Wi-Fi networks at coffee shops, airports, and trains—with ease. Captive Network Assistant automatically opens to help you get connected. + +%prep +%autosetup + +%build +%meson +%meson_build + +%install +%meson_install + +%terra_appstream -o %buildroot%_metainfodir/%appid.metainfo.xml +%find_lang %appid + +%check +%desktop_file_validate %buildroot%_appsdir/%appid.desktop + +%files -f %appid.lang +%doc README.md +%license COPYING +%_bindir/%appid +%_appsdir/%appid.desktop +%_datadir/glib-2.0/schemas/%appid.gschema.xml +%_hicolordir/*/apps/%appid.svg +%_metainfodir/%appid.metainfo.xml + +%changelog +* Tue Apr 07 2026 madonuko - 8.0.2-1 +- Initial package. diff --git a/anda/desktops/elementary/capnet-assist/update.rhai b/anda/desktops/elementary/capnet-assist/update.rhai new file mode 100644 index 0000000000..fc7813e120 --- /dev/null +++ b/anda/desktops/elementary/capnet-assist/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("elementary/capnet-assist")); diff --git a/anda/desktops/gnome/gnome-shell-extension-multi-monitors-bar/gnome-shell-extension-multi-monitors-bar.spec b/anda/desktops/gnome/gnome-shell-extension-multi-monitors-bar/gnome-shell-extension-multi-monitors-bar.spec index d9c462b039..5ad443698a 100644 --- a/anda/desktops/gnome/gnome-shell-extension-multi-monitors-bar/gnome-shell-extension-multi-monitors-bar.spec +++ b/anda/desktops/gnome/gnome-shell-extension-multi-monitors-bar/gnome-shell-extension-multi-monitors-bar.spec @@ -1,5 +1,5 @@ -%global commit b8bce577163274e30af40ec2173e48ae8399b70d -%global commit_date 20260408 +%global commit d939f0ee9178017f83b02833387eece715b08df2 +%global commit_date 20260409 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global extension multi-monitors-bar diff --git a/anda/desktops/lomiri-unity/lomiri-settings-components/lomiri-settings-components.spec b/anda/desktops/lomiri-unity/lomiri-settings-components/lomiri-settings-components.spec index 5eb61ebeb3..9aaa1fe248 100644 --- a/anda/desktops/lomiri-unity/lomiri-settings-components/lomiri-settings-components.spec +++ b/anda/desktops/lomiri-unity/lomiri-settings-components/lomiri-settings-components.spec @@ -1,10 +1,10 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-settings-components -%global commit 91a0a1f94b90d8e3371ab47b769bcd058ac57a74 +%global commit 7bfc33d16ca234af8c88477cfbb2a95f3b7d8c9a %forgemeta Name: lomiri-settings-components -Version: 1.1.3 -Release: 1%?dist +Version: 1.2.0 +Release: 1%{?dist} Summary: The system settings components for Lomiri License: GPLv3 AND LGPLv3 URL: https://gitlab.com/ubports/development/core/lomiri-settings-components diff --git a/anda/desktops/noctalia-qs/noctalia-qs.spec b/anda/desktops/noctalia-qs/noctalia-qs.spec index 2937cc2213..3aa8a1df4e 100644 --- a/anda/desktops/noctalia-qs/noctalia-qs.spec +++ b/anda/desktops/noctalia-qs/noctalia-qs.spec @@ -2,7 +2,7 @@ Name: noctalia-qs Version: 0.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flexible QtQuick based desktop shell toolkit License: LGPL-3.0-only AND GPL-3.0-only URL: https://github.com/noctalia-dev/noctalia-qs @@ -81,4 +81,4 @@ Flexible QtQuick based desktop shell toolkit. - Also fix that noctalia-qs is replacing quickshell overall and not just for noctlaia users * Fri Feb 27 2026 Willow C Reed -- Initial commit based on quickshell spec \ No newline at end of file +- Initial commit based on quickshell spec diff --git a/anda/desktops/scroll/50-systemd-user.conf b/anda/desktops/scroll/50-systemd-user.conf new file mode 100644 index 0000000000..71207a438a --- /dev/null +++ b/anda/desktops/scroll/50-systemd-user.conf @@ -0,0 +1,16 @@ +# sway does not set DISPLAY/WAYLAND_DISPLAY in the systemd user environment +# See FS#63021 +# Adapted from xorg's 50-systemd-user.sh, which achieves a similar goal. + +# Upstream refuses to set XDG_CURRENT_DESKTOP so we have to. +exec systemctl --user set-environment XDG_CURRENT_DESKTOP=scroll +exec systemctl --user import-environment DISPLAY \ + SCROLLSOCK \ + WAYLAND_DISPLAY \ + XDG_CURRENT_DESKTOP + +exec hash dbus-update-activation-environment 2>/dev/null && \ + dbus-update-activation-environment --systemd DISPLAY \ + SCROLLSOCK \ + XDG_CURRENT_DESKTOP=scroll \ + WAYLAND_DISPLAY diff --git a/anda/desktops/scroll/anda.hcl b/anda/desktops/scroll/anda.hcl new file mode 100644 index 0000000000..5b0626f4d1 --- /dev/null +++ b/anda/desktops/scroll/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "scroll.spec" + } +} diff --git a/anda/desktops/scroll/scroll-portals.conf b/anda/desktops/scroll/scroll-portals.conf new file mode 100644 index 0000000000..aebea31a93 --- /dev/null +++ b/anda/desktops/scroll/scroll-portals.conf @@ -0,0 +1,5 @@ +[preferred] +default=gtk +org.freedesktop.impl.portal.ScreenCast=wlr +org.freedesktop.impl.portal.Screenshot=wlr +org.freedesktop.impl.portal.Inhibit=none diff --git a/anda/desktops/scroll/scroll.spec b/anda/desktops/scroll/scroll.spec new file mode 100644 index 0000000000..4901a9d8b8 --- /dev/null +++ b/anda/desktops/scroll/scroll.spec @@ -0,0 +1,93 @@ +Name: scroll +Version: 1.12.8 +Release: 1%{?dist} +Summary: i3-compatible Wayland compositor (sway) with a PaperWM layout like niri or hyprscroller +License: MIT +URL: https://github.com/dawsers/scroll +Source0: %{url}/archive/refs/tags/%{version}.tar.gz +# https://aur.archlinux.org/cgit/aur.git/tree/?h=sway-scroll +Source1: 50-systemd-user.conf +Source2: scroll-portals.conf + +Packager: Owen Zimmerman + +BuildRequires: meson +BuildRequires: cmake +BuildRequires: ninja-build +BuildRequires: gcc +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(gbm) +BuildRequires: pkgconfig(glslang) +BuildRequires: pkgconfig(libseat) +BuildRequires: pkgconfig(hwdata) +BuildRequires: pkgconfig(libdisplay-info) +BuildRequires: pkgconfig(libliftoff) +BuildRequires: pkgconfig(xcb-renderutil) +BuildRequires: pkgconfig(xwayland) +BuildRequires: pkgconfig(xcb-ewmh) +BuildRequires: pkgconfig(xcb-errors) +BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(lua) +BuildRequires: pkgconfig(scdoc) +BuildRequires: pkgconfig(vulkan) +BuildRequires: pkgconfig(libinput) +BuildRequires: pkgconfig(libevdev) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(pixman-1) +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libpcre2-8) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) + +Provides: sway-scroll + +%description +%{summary}. + +%prep +%autosetup + +%pkg_completion -B scroll scrollbar scrollmsg +%pkg_completion -f scroll scrollmsg scrollnag +%pkg_completion -z scroll scrollmsg + +%build +%meson -D sd-bus-provider=libsystemd +%meson_build + +%install +%meson_install +install -Dm644 %{S:1} %{buildroot}%{_sysconfdir}/scroll/config.d/50-systemd-user.conf +install -Dm644 %{S:2} %{buildroot}%{_datadir}/xdg-desktop-portal/scroll-portals.conf + +%files +%doc README.md CONTRIBUTING.md +%license LICENSE +%{_bindir}/scroll +%{_bindir}/scrollbar +%{_bindir}/scrollmsg +%{_bindir}/scrollnag +%{_sysconfdir}/scroll/config +%{_sysconfdir}/scroll/config.d/50-systemd-user.conf +%{_datadir}/backgrounds/scroll/*png +%{_datadir}/xdg-desktop-portal/scroll-portals.conf +%{_iconsdir}/scroll.png +%{_mandir}/man1/scroll.1.* +%{_mandir}/man1/scrollmsg.1.* +%{_mandir}/man1/scrollnag.1.* +%{_mandir}/man5/scroll-bar.5.* +%{_mandir}/man5/scroll-input.5.* +%{_mandir}/man5/scroll-output.5.* +%{_mandir}/man5/scroll.5.* +%{_mandir}/man5/scrollnag.5.* +%{_mandir}/man7/scroll-ipc.7.* +%{_mandir}/man7/scrollbar-protocol.7.* +%{_datadir}/wayland-sessions/scroll.desktop + +%changelog +* Sun Apr 12 2026 Owen Zimmerman - 1.12.8-1 +- Initial commit diff --git a/anda/desktops/scroll/update.rhai b/anda/desktops/scroll/update.rhai new file mode 100644 index 0000000000..43498f46c8 --- /dev/null +++ b/anda/desktops/scroll/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("dawsers/scroll")); diff --git a/anda/desktops/somewm/somewm.spec b/anda/desktops/somewm/somewm.spec index 12de8feb11..9ace2ea8fc 100644 --- a/anda/desktops/somewm/somewm.spec +++ b/anda/desktops/somewm/somewm.spec @@ -1,6 +1,6 @@ Name: somewm -Version: 0.5.0 -Release: 1%?dist +Version: 1.4.0 +Release: 1%{?dist} Summary: Wayland compositor that brings AwesomeWM's Lua API to Wayland License: GPL-3.0 URL: https://github.com/trip-zip/somewm diff --git a/anda/desktops/swayfx/update.rhai b/anda/desktops/swayfx/update.rhai index 86957d3c78..21a9ca66e5 100644 --- a/anda/desktops/swayfx/update.rhai +++ b/anda/desktops/swayfx/update.rhai @@ -1 +1,3 @@ -rpm.version(gh("willPower3309/swayfx")); \ No newline at end of file +rpm.version(gh("willPower3309/swayfx")); + +rpm.global("swayVersion", gh("swaywm/sway")); diff --git a/anda/desktops/waylands/walker/walker.spec b/anda/desktops/waylands/walker/walker.spec index 7a81dd620e..4c56dd73f6 100644 --- a/anda/desktops/waylands/walker/walker.spec +++ b/anda/desktops/waylands/walker/walker.spec @@ -4,7 +4,7 @@ # prevent library files from being installed %global cargo_install_lib 0 -%global upstream_version v2.15.2 +%global upstream_version v2.16.0 %global ver %{sub %upstream_version 2} Name: walker diff --git a/anda/devs/android-studio/canary/android-studio-canary.spec b/anda/devs/android-studio/canary/android-studio-canary.spec index a630029f37..cd89f0e061 100644 --- a/anda/devs/android-studio/canary/android-studio-canary.spec +++ b/anda/devs/android-studio/canary/android-studio-canary.spec @@ -16,7 +16,7 @@ %global __requires_exclude ^libaaudio\\.so.*|^libandroid\\.so.*|^libmediandk\\.so.*|^liblog\\.so.*|^libc\\.so.*|^libm\\.so.*|^libdl\\.so.*|^libcrypt\\.so.*|^libstdc\\+\\+\\.so.*|^libncursesw\\.so.*|^libtinfo\\.so.*|^libnsl\\.so.*|^libpanelw\\.so.*$ Name: android-studio-canary -Version: 2025.3.4.3 +Version: 2025.3.4.4 Release: 1%{?dist} Summary: Official IDE for Android development (Canary build) License: Apache-2.0 @@ -24,7 +24,7 @@ Packager: veuxit ExclusiveArch: x86_64 URL: https://developer.android.com/studio/preview -%define suffixS panda4-canary3 +%define suffixS panda4-canary4 Source0: https://dl.google.com/dl/android/studio/ide-zips/%{version}/android-studio-%{suffixS}-linux.tar.gz diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index 26d1eb05d8..ae9e77bd2c 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -8,7 +8,7 @@ %global appid sh.oven.bun Name: bun-bin -Version: 1.3.11 +Version: 1.3.12 Release: 1%{?dist} Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT diff --git a/anda/devs/deno/rust-deno.spec b/anda/devs/deno/rust-deno.spec index 4de490932c..75a28e59da 100644 --- a/anda/devs/deno/rust-deno.spec +++ b/anda/devs/deno/rust-deno.spec @@ -6,7 +6,7 @@ %global crate deno Name: rust-deno -Version: 2.7.11 +Version: 2.7.12 Release: 1%{?dist} Summary: Deno executable diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index d2d5312b7b..3cee30ea5d 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 853183e911b70ff7b61057f52fc7b47ea4934238 +%global commit 557de7c92556ab0eb9725b5693d396a68b242dc3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2026-04-07 +%global fulldate 2026-04-11 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.3.2 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 131718f9dc..c75a175d29 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 30e7e8b55086a4496bfd863950eaabda2527e3e7 +%global commit 5a47e9825babb293a4e4aea3359fb860085ab63f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20260408 -%global ver 0.232.0 +%global commit_date 20260412 +%global ver 0.233.0 %bcond_with check %bcond_with debug_no_build diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 0aa4a1d8ac..13cf2632b0 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -5,7 +5,7 @@ %global debug_package %{nil} %endif -%global ver 0.232.0-pre +%global ver 0.231.2 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 322f00b4e8..25ad9180b4 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -15,7 +15,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.231.1 +Version: 0.231.2 Release: 1%{?dist} Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later diff --git a/anda/games/emulationstation-de/emulationstation-de.spec b/anda/games/emulationstation-de/emulationstation-de.spec index 43a09221f8..6f7b5681f2 100644 --- a/anda/games/emulationstation-de/emulationstation-de.spec +++ b/anda/games/emulationstation-de/emulationstation-de.spec @@ -8,8 +8,8 @@ %bcond_with kms Name: emulationstation-de -Version: 3.4.0 -Release: 1%?dist +Version: 3.4.1 +Release: 1%{?dist} Summary: ES-DE is a frontend for browsing and launching games from your multi-platform collection. Packager: Cappy Ishihara License: MIT diff --git a/anda/games/gamescope-session-opengamepadui/gamescope-session-opengamepadui.spec b/anda/games/gamescope-session-opengamepadui/gamescope-session-opengamepadui.spec index f7fa08edeb..43dbae5a53 100644 --- a/anda/games/gamescope-session-opengamepadui/gamescope-session-opengamepadui.spec +++ b/anda/games/gamescope-session-opengamepadui/gamescope-session-opengamepadui.spec @@ -1,6 +1,6 @@ -%global commit 72df08d154fefb6354f6bb1a8d8cf587e86ee227 +%global commit 88087a086ab732211c466b41f5d64229ce51c050 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20260327 +%global commit_date 20260411 Name: gamescope-session-opengamepadui Version: 0~%{commit_date}git.%{shortcommit} diff --git a/anda/games/gamescope-session-opengamepadui/update.rhai b/anda/games/gamescope-session-opengamepadui/update.rhai index ad1104c154..5dc68937a3 100644 --- a/anda/games/gamescope-session-opengamepadui/update.rhai +++ b/anda/games/gamescope-session-opengamepadui/update.rhai @@ -1,7 +1,5 @@ -if filters.contains("nightly") { - rpm.global("commit", gh_commit("OpenGamingCollective/gamescope-session-steam")); - if rpm.changed() { +rpm.global("commit", gh_commit("OpenGamingCollective/gamescope-session-opengamepadui")); +if rpm.changed() { rpm.release(); rpm.global("commit_date", date()); - } } 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/anda.hcl b/anda/games/prismlauncher-nightly/anda.hcl index 061a1307db..fdc18bbc52 100644 --- a/anda/games/prismlauncher-nightly/anda.hcl +++ b/anda/games/prismlauncher-nightly/anda.hcl @@ -1,7 +1,7 @@ project pkg { rpm { spec = "prismlauncher-nightly.spec" - extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/\\$releasever/\\$basearch"] + extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/rawhide/\\$basearch"] } labels { nightly = 1 diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index c36e9db848..9ee27aa136 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -3,10 +3,10 @@ %global name_pretty %{quote:Prism Launcher (Nightly)} %global appid org.prismlauncher.PrismLauncher-nightly -%global commit 194b72f180f82f8d6596b7ca310d4d47afbe1341 +%global commit a17a45c748231cb66f4a31f1dd37af35e361c945 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20260407 +%global commit_date 20260412 %global snapshot_info %{commit_date}.%{shortcommit} # Change this variables if you want to use custom keys @@ -26,7 +26,6 @@ Summary: Minecraft launcher with ability to manage multiple instances 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/ -Patch0: 0001-find-cmark-with-pkgconfig.patch Source2: nightly.xml BuildRequires: cmake >= 3.15 @@ -47,7 +46,7 @@ BuildRequires: anda-srpm-macros BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: tomlplusplus-devel -BuildRequires: cmake(ghc_filesystem) +BuildRequires: vulkan-headers BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(gamemode) @@ -60,8 +59,6 @@ BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version} -BuildRequires: cmake(Qt6Core5Compat) - BuildRequires: pkgconfig(libcmark) BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -97,8 +94,6 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep %git_clone https://github.com/%{nice_name}/%{nice_name}.git %{commit} -rm -rf libraries/{extra-cmake-modules,zlib}/ - # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt diff --git a/anda/games/prismlauncher/anda.hcl b/anda/games/prismlauncher/anda.hcl index 3a35d4fe52..fc4ef0f47c 100644 --- a/anda/games/prismlauncher/anda.hcl +++ b/anda/games/prismlauncher/anda.hcl @@ -1,7 +1,7 @@ project pkg { rpm { spec = "prismlauncher.spec" - extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/\\$releasever/\\$basearch"] + extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/rawhide/\\$basearch"] } labels { mock = 1 diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 4c7cff5acf..5a5684eb75 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -13,8 +13,8 @@ %global build_platform terra Name: prismlauncher -Version: 10.0.5 -Release: 1%?dist +Version: 11.0.2 +Release: 1%{?dist} Summary: Minecraft launcher with ability to manage multiple instances # see COPYING.md for more information # each file in the source also contains a SPDX-License-Identifier header that declares its license @@ -39,7 +39,6 @@ BuildRequires: java-17-openjdk-devel BuildRequires: anda-srpm-macros BuildRequires: desktop-file-utils BuildRequires: libappstream-glib -BuildRequires: cmake(ghc_filesystem) BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} @@ -49,12 +48,11 @@ BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version} BuildRequires: tomlplusplus-devel +BuildRequires: vulkan-headers BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(gamemode) -BuildRequires: cmake(Qt6Core5Compat) - BuildRequires: pkgconfig(libcmark) BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -90,8 +88,6 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep %autosetup -n PrismLauncher-%{version} -rm -rf libraries/{extra-cmake-modules,filesystem,zlib} - # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt @@ -134,7 +130,7 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %{_appsdir}/org.prismlauncher.PrismLauncher.desktop %{_scalableiconsdir}/org.prismlauncher.PrismLauncher.svg %{_hicolordir}/256x256/apps/org.prismlauncher.PrismLauncher.png -%{_datadir}/mime/packages/modrinth-mrpack-mime.xml +%{_datadir}/mime/packages/org.prismlauncher.PrismLauncher.xml %{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories %{_mandir}/man?/prismlauncher.* %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml diff --git a/anda/games/rpcs3/rpcs3.spec b/anda/games/rpcs3/rpcs3.spec index 3368b2ce04..e015e8f9c0 100644 --- a/anda/games/rpcs3/rpcs3.spec +++ b/anda/games/rpcs3/rpcs3.spec @@ -9,8 +9,8 @@ # GLIBCXX_ASSERTIONS is known to break RPCS3 %global build_cflags %(echo "%{__build_flags_lang_c}" | sed 's|-Wp,-D_GLIBCXX_ASSERTIONS ||g') %{?_distro_extra_cflags} %global build_cxxflags %(echo "%{__build_flags_lang_cxx}" | sed 's|-Wp,-D_GLIBCXX_ASSERTIONS ||g') %{?_distro_extra_cflags} -%global commit 6981e308a07dd61bc1dbc0acee9145ab0b955e19 -%global ver 0.0.40-19177 +%global commit 72fa4098dcdbaedaca9ba0ae858e9d4e23afd94a +%global ver 0.0.40-19192 Name: rpcs3 Version: %(echo %{ver} | sed 's/-/^/g') diff --git a/anda/langs/go/elephant/golang-github-abenz1267-elephant.spec b/anda/langs/go/elephant/golang-github-abenz1267-elephant.spec index e4c0a4e969..a165c4ae51 100644 --- a/anda/langs/go/elephant/golang-github-abenz1267-elephant.spec +++ b/anda/langs/go/elephant/golang-github-abenz1267-elephant.spec @@ -10,11 +10,11 @@ %global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ %endif -%global providers 1password archlinuxpkgs bitwarden bluetooth bookmarks calc clipboard desktopapplications dnfpackages files menus niriactions nirisessions providerlist runner snippets symbols todo unicode websearch windows wireplumber +%global providers 1password archlinuxpkgs bitwarden bluetooth bookmarks calc clipboard desktopapplications dnfpackages files menus niriactions nirisessions playerctl providerlist runner snippets symbols todo unicode websearch windows wireplumber # https://github.com/abenz1267/elephant %global goipath github.com/abenz1267/elephant -Version: 2.20.3 +Version: 2.21.0 %gometa -f diff --git a/anda/langs/go/glow/golang-github-charmbracelet-glow.spec b/anda/langs/go/glow/golang-github-charmbracelet-glow.spec index fc26d74694..aa9d1c2762 100644 --- a/anda/langs/go/glow/golang-github-charmbracelet-glow.spec +++ b/anda/langs/go/glow/golang-github-charmbracelet-glow.spec @@ -3,7 +3,7 @@ # https://github.com/charmbracelet/glow %global goipath github.com/charmbracelet/glow -Version: 2.1.1 +Version: 2.1.2 %gometa -f @@ -15,7 +15,7 @@ Render markdown on the CLI, with pizzazz! 💅🏻.} %global godocs README.md Name: %{goname} -Release: 1%?dist +Release: 1%{?dist} Summary: Render markdown on the CLI, with pizzazz! 💅🏻 License: MIT diff --git a/anda/langs/go/v2ray/nightly/v2ray-nightly.spec b/anda/langs/go/v2ray/nightly/v2ray-nightly.spec index 5a86d59117..5a7a581eb8 100644 --- a/anda/langs/go/v2ray/nightly/v2ray-nightly.spec +++ b/anda/langs/go/v2ray/nightly/v2ray-nightly.spec @@ -1,7 +1,7 @@ -%global commit cbab1db9f705129ab85d03c991b91ce067963aed +%global commit 044994a96e28b031a76b9b90420d006fbdbdbf7e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver v5.47.0 -%global commit_date 20260407 +%global commit_date 20260412 %global goipath github.com/v2fly/v2ray-core Version: %{ver}^%{commit_date}git.%{shortcommit} diff --git a/anda/langs/go/v2ray/stable/v2ray.spec b/anda/langs/go/v2ray/stable/v2ray.spec index 0d60b7ac94..245ad8616b 100644 --- a/anda/langs/go/v2ray/stable/v2ray.spec +++ b/anda/langs/go/v2ray/stable/v2ray.spec @@ -1,5 +1,5 @@ %global goipath github.com/v2fly/v2ray-core -Version: 5.48.0 +Version: 5.49.0 %global golicenses LICENSE %global godocs README.md SECURITY.md diff --git a/anda/langs/go/xray/nightly/xray-nightly.spec b/anda/langs/go/xray/nightly/xray-nightly.spec index 6c2dae41af..ac11a2767e 100644 --- a/anda/langs/go/xray/nightly/xray-nightly.spec +++ b/anda/langs/go/xray/nightly/xray-nightly.spec @@ -1,7 +1,7 @@ -%global commit e5a9fb752e0dcc127dd1740316c853571c16052f +%global commit c93478b891d8a5112e6942490a605da52eb8bd17 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver v26.3.27 -%global commit_date 20260408 +%global commit_date 20260412 %global goipath github.com/XTLS/Xray-core Version: %{ver}^%{commit_date}git.%{shortcommit} diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index da0ecb4c67..ecbd10382a 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 115ec7a433a7c55b596f526b7ca9187cc50fc980 +%global commit 6353c4e5b0b6e3194f1eb888cdcd6f329bc8ea54 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20260408 +%global commit_date 20260411 %global debug_package %nil Name: nim-nightly diff --git a/anda/langs/python/latex2mathml/latex2mathml.spec b/anda/langs/python/latex2mathml/latex2mathml.spec index f4e3b86803..3a977afd29 100644 --- a/anda/langs/python/latex2mathml/latex2mathml.spec +++ b/anda/langs/python/latex2mathml/latex2mathml.spec @@ -2,7 +2,7 @@ %global _desc Pure Python library for LaTeX to MathML conversion. Name: python-%{pypi_name} -Version: 3.79.0 +Version: 3.80.0 Release: 1%{?dist} Summary: Pure Python library for LaTeX to MathML conversion License: MIT diff --git a/anda/langs/python/posthog/posthog.spec b/anda/langs/python/posthog/posthog.spec index eecb920433..8a3bf5ee8f 100644 --- a/anda/langs/python/posthog/posthog.spec +++ b/anda/langs/python/posthog/posthog.spec @@ -2,7 +2,7 @@ %global _desc Send usage data from your Python code to PostHog. Name: python-%{pypi_name} -Version: 7.10.3 +Version: 7.11.0 Release: 1%{?dist} Summary: Send usage data from your Python code to PostHog License: MIT diff --git a/anda/langs/python/pywal16/python-pywal16.spec b/anda/langs/python/pywal16/python-pywal16.spec index 8b3b4e2907..97323e8ee5 100644 --- a/anda/langs/python/pywal16/python-pywal16.spec +++ b/anda/langs/python/pywal16/python-pywal16.spec @@ -3,8 +3,8 @@ Pywal is a tool that generates a color palette from the dominant colors in an image. It then applies the colors system-wide and on-the-fly in all of your favourite programs.} Name: python-%{pypi_name} -Version: 3.8.14 -Release: 1%?dist +Version: 3.8.15 +Release: 1%{?dist} Summary: 16 color fork of the original Pywal License: MIT URL: https://github.com/eylles/pywal16 diff --git a/anda/langs/python/smbus2/smbus2.spec b/anda/langs/python/smbus2/smbus2.spec index ecc6fb0246..9a563ed19d 100644 --- a/anda/langs/python/smbus2/smbus2.spec +++ b/anda/langs/python/smbus2/smbus2.spec @@ -2,8 +2,8 @@ %global _desc A drop-in replacement for smbus-cffi/smbus-python in pure Python. Name: python-%{pypi_name} -Version: 0.6.0 -Release: 1%?dist +Version: 0.6.1 +Release: 1%{?dist} Summary: A drop-in replacement for smbus-cffi/smbus-python in pure Python License: MIT URL: https://github.com/kplindegaard/smbus2 diff --git a/anda/langs/python/types-colorama/types-colorama.spec b/anda/langs/python/types-colorama/types-colorama.spec index 824b9b9ccc..8a37221ab6 100644 --- a/anda/langs/python/types-colorama/types-colorama.spec +++ b/anda/langs/python/types-colorama/types-colorama.spec @@ -1,5 +1,5 @@ -%global commit 563213272e5db2a858e37bdf6938b0c8742ec192 -%global commit_date 20260408 +%global commit 46b01bf323f3d7ee8764e844327c4010bade07c3 +%global commit_date 20260412 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global pypi_name types-colorama diff --git a/anda/langs/rust/fresh/fresh.spec b/anda/langs/rust/fresh/fresh.spec index e103d7e094..91d92c7bb7 100644 --- a/anda/langs/rust/fresh/fresh.spec +++ b/anda/langs/rust/fresh/fresh.spec @@ -1,7 +1,7 @@ %undefine __brp_mangle_shebangs Name: fresh -Version: 0.2.22 +Version: 0.2.23 Release: 1%{?dist} Summary: Text editor for your terminal: easy, powerful and fast URL: https://getfresh.dev diff --git a/anda/langs/rust/tectonic/rust-tectonic.spec b/anda/langs/rust/tectonic/rust-tectonic.spec index 580e87869b..ee3f579c3a 100644 --- a/anda/langs/rust/tectonic/rust-tectonic.spec +++ b/anda/langs/rust/tectonic/rust-tectonic.spec @@ -4,7 +4,7 @@ %global crate tectonic Name: rust-tectonic -Version: 0.15.0 +Version: 0.16.8 Release: 1%{?dist} Summary: Modernized, complete, embeddable TeX/LaTeX engine diff --git a/anda/langs/rust/television/rust-television.spec b/anda/langs/rust/television/rust-television.spec index 8f5ae8cd8f..6863ad0fd2 100644 --- a/anda/langs/rust/television/rust-television.spec +++ b/anda/langs/rust/television/rust-television.spec @@ -5,7 +5,7 @@ %global crate television Name: rust-television -Version: 0.15.4 +Version: 0.15.5 Release: 1%{?dist} Summary: Very fast, portable and hackable fuzzy finder for the terminal diff --git a/anda/langs/zig/bootstrap/setup.sh b/anda/langs/zig/bootstrap/setup.sh index a079e62c43..751de3bae5 100755 --- a/anda/langs/zig/bootstrap/setup.sh +++ b/anda/langs/zig/bootstrap/setup.sh @@ -1,6 +1,6 @@ #!/usr/bin/bash -version=0.16.0-dev.3133+5ec8e45f3 +version=0.16.0-dev.3146+0606af509 mirrors=() @@ -21,8 +21,8 @@ if [ "$1" == "fetch" ]; then randomize_mirrors done echo -e "\033[0;32mNote:\033[0m Selected mirror $mirror" - curl -A "rpmdev-spectool" -H "Accept-Encoding: identity" -O ${mirror}/zig-${version}.tar.xz?source=terra.fyralabs.com - curl -A "rpmdev-spectool" -H "Accept-Encoding: identity" -O ${mirror}/zig-${version}.tar.xz.minisig?source=terra.fyralabs.com + curl -A "rpmdev-spectool" -H "Accept-Encoding: identity" -O ${mirror}/zig-${version}.tar.xz?source=terrapkg.com + curl -A "rpmdev-spectool" -H "Accept-Encoding: identity" -O ${mirror}/zig-${version}.tar.xz.minisig?source=terrapkg.com elif [ "$1" == "version" ]; then echo $version # Grab a random mirror. For debugging purposes. diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec index f7c459301f..247989e416 100644 --- a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec +++ b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec @@ -6,7 +6,7 @@ %define llvm_compat 21 %endif %global llvm_version 21.0.0 -%global ver 0.16.0-dev.3133+5ec8e45f3 +%global ver 0.16.0-dev.3146+0606af509 %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 diff --git a/anda/langs/zig/master/zig-master.spec b/anda/langs/zig/master/zig-master.spec index 234bad7f3c..ae9beadd78 100644 --- a/anda/langs/zig/master/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -12,7 +12,7 @@ %global zig_cache_dir %{builddir}/zig-cache Name: zig-master -Version: 0.16.0~dev.3133+5ec8e45f3 +Version: 0.16.0~dev.3146+0606af509 Release: 2%{?dist} Summary: Master builds of the Zig language License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 diff --git a/anda/lib/astal/ags/ags.spec b/anda/lib/astal/ags/ags.spec index f7fbd594dc..758750820e 100644 --- a/anda/lib/astal/ags/ags.spec +++ b/anda/lib/astal/ags/ags.spec @@ -12,7 +12,7 @@ # https://github.com/Aylur/ags %global goipath github.com/Aylur/ags -Version: 3.1.1 +Version: 3.1.2 %gometa -f @@ -23,7 +23,7 @@ Scaffolding CLI for Astal+TypeScript.} %global godocs docs README.md Name: ags -Release: 1%?dist +Release: 1%{?dist} Summary: Scaffolding CLI for Astal+TypeScript License: GPL-3.0-only diff --git a/anda/lib/glaze/glaze.spec b/anda/lib/glaze/glaze.spec index 15fcdd9873..07fdc20c71 100644 --- a/anda/lib/glaze/glaze.spec +++ b/anda/lib/glaze/glaze.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: glaze-devel -Version: 7.3.2 +Version: 7.3.3 Release: 1%{?dist} License: MIT URL: https://stephenberry.github.io/glaze diff --git a/anda/lib/quickjs-ng/quickjs-ng.spec b/anda/lib/quickjs-ng/quickjs-ng.spec index 77cc9285ba..ea2869749b 100644 --- a/anda/lib/quickjs-ng/quickjs-ng.spec +++ b/anda/lib/quickjs-ng/quickjs-ng.spec @@ -1,7 +1,7 @@ %global _distro_extra_cflags -Wno-discarded-qualifiers -Wno-maybe-uninitialized Name: quickjs-ng -Version: 0.13.0 +Version: 0.14.0 Release: 1%{?dist} License: MIT Summary: A mighty JavaScript engine diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index aedf502288..02f8d0b239 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit 8ff05a0e7e064fa796593f3105c2dcf983e279d4 +%global commit a82128ab8e28bd3ff4f9fee91b7a30e0bc36ddd6 %global ver 1.8.63 -%global commit_date 20260407 +%global commit_date 20260410 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly diff --git a/anda/misc/kew/anda.hcl b/anda/misc/kew/anda.hcl new file mode 100644 index 0000000000..a72c67e69c --- /dev/null +++ b/anda/misc/kew/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "kew.spec" + } +} diff --git a/anda/misc/kew/kew.spec b/anda/misc/kew/kew.spec new file mode 100644 index 0000000000..b49e8d9019 --- /dev/null +++ b/anda/misc/kew/kew.spec @@ -0,0 +1,50 @@ +%define debug_package %{nil} + +Name: kew +Version: 3.7.3 +Release: 1%{?dist} +Summary: Music for the Shell +URL: https://codeberg.org/ravachol/kew +Source0: %{url}/archive/v%{version}.tar.gz +License: GPL-2.0-or-later +BuildRequires: make +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libatomic +BuildRequires: pkgconfig(taglib) +BuildRequires: pkgconfig(fftw3f) +BuildRequires: pkgconfig(chafa) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(opusfile) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(vorbisfile) +BuildRequires: pkgconfig(ogg) + +Packager: Owen Zimmerman + +%description +%{summary}. + +%prep +%git_clone https://codeberg.org/ravachol/kew.git v%{version} + +%build +%make_build + +%install +%make_install PREFIX=/usr + +%find_lang kew + +%files -f kew.lang +%license LICENSE +%doc README.md +%lang(zh_CN) %doc README_zh_CN.md +%{_bindir}/kew +%{_datadir}/kew/themes/*.theme +%{_datadir}/kew/themes/*.txt +%{_mandir}/man1/kew.1.* + +%changelog +* Thu Apr 09 2026 Owen Zimmerman +- Initial commit diff --git a/anda/misc/kew/update.rhai b/anda/misc/kew/update.rhai new file mode 100644 index 0000000000..2a85ca96ea --- /dev/null +++ b/anda/misc/kew/update.rhai @@ -0,0 +1 @@ +rpm.version(codeberg("ravachol/kew")); diff --git a/anda/misc/prime-run/prime-run.spec b/anda/misc/prime-run/prime-run.spec index 6b9d547dfe..546d7e5a0c 100644 --- a/anda/misc/prime-run/prime-run.spec +++ b/anda/misc/prime-run/prime-run.spec @@ -1,10 +1,10 @@ Name: prime-run Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple script to run an application with NVIDIA PRIME GPU offloading License: MIT -URL: https://terra.fyralabs.com +URL: https://terrapkg.com Source0: prime-run.sh # Bash script diff --git a/anda/misc/v2ray-domain-list-community/v2ray-domain-list-community.spec b/anda/misc/v2ray-domain-list-community/v2ray-domain-list-community.spec index 7a880ca064..1bb58d535b 100644 --- a/anda/misc/v2ray-domain-list-community/v2ray-domain-list-community.spec +++ b/anda/misc/v2ray-domain-list-community/v2ray-domain-list-community.spec @@ -1,7 +1,7 @@ -%global commit ed4061a94e3b379b77ee9751cdc3a16a7d6ec00f +%global commit 22cef344f9cb54e272d264c51580d40aa7788365 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ver 20260407141224 -%global commit_date 20260408 +%global ver 20260411144700 +%global commit_date 20260412 Name: v2ray-domain-list-community Version: %{ver}^%{commit_date}git.%{shortcommit} diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec index fa45d600ba..607c6735ae 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec @@ -38,7 +38,7 @@ GStreamer plugin containing libav library code. #export CFLAGS="%{optflags} -Wno-error=attributes" %meson \ -D package-name="Fedora GStreamer-plugins-ugly package" \ - -D package-origin="https://terra.fyralabs.com" \ + -D package-origin="https://terrapkg.com" \ -D doc=disabled %meson_build diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec index e48b9c313c..d35d849d85 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec @@ -395,7 +395,7 @@ Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -D opus=enabled \ -D orc=enabled \ -D package-name="Fedora GStreamer-plugins-bad package" \ - -D package-origin="https://terra.fyralabs.com" \ + -D package-origin="https://terrapkg.com" \ -D pcapparse=enabled \ -D pnm=enabled \ -D proxy=enabled \ diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec index f34f83344f..6698a5cd00 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec @@ -40,7 +40,7 @@ This module contains a set of plugins that have good quality and are well tested %build %meson \ -D package-name="Fedora GStreamer-plugins-ugly package" \ - -D package-origin="https://terra.fyralabs.com" \ + -D package-origin="https://terrapkg.com" \ -D a52dec=enabled \ -D asfdemux=enabled \ -D cdio=enabled \ diff --git a/anda/multimedia/vgmstream/vgmstream.spec b/anda/multimedia/vgmstream/vgmstream.spec index 48f30e6529..789106c440 100644 --- a/anda/multimedia/vgmstream/vgmstream.spec +++ b/anda/multimedia/vgmstream/vgmstream.spec @@ -1,6 +1,6 @@ -%global commit 60dca6602c1540f8041092396595e7e8f048a612 +%global commit 7b2138e5c1afe43bdfd52a9a107922107f5111a3 %global shortcommit %{sub %{commit} 1 7} -%global commit_date 20260405 +%global commit_date 20260408 Name: vgmstream Version: 0~%{commit_date}git.%shortcommit diff --git a/anda/system/dank-material-shell/anda.hcl b/anda/system/dank-material-shell/anda.hcl new file mode 100644 index 0000000000..4d7e6ff850 --- /dev/null +++ b/anda/system/dank-material-shell/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "dank-material-shell.spec" + } + labels { + subrepo = "extras" + } +} diff --git a/anda/system/dank-material-shell/dank-material-shell.spec b/anda/system/dank-material-shell/dank-material-shell.spec new file mode 100644 index 0000000000..2728b60522 --- /dev/null +++ b/anda/system/dank-material-shell/dank-material-shell.spec @@ -0,0 +1,147 @@ +%global goipath github.com/AvengeMedia/%{name}/core + +Name: DankMaterialShell +Version: 1.4.4 +Release: 1%{?dist} +Summary: Desktop shell for Wayland compositors built on QuickShell + +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-3.0-only AND ISC AND MIT AND MPL-2.0 +URL: https://danklinux.com/ +Source0: https://github.com/AvengeMedia/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz + +BuildRequires: go-rpm-macros +BuildRequires: go-vendor-tools +BuildRequires: systemd-rpm-macros + +Requires: accountsservice +Requires: cups-pk-helper +Requires: hicolor-icon-theme +Requires: quickshell + +Requires: (adw-gtk3-theme if gtk3) +Requires: cava +Requires: cliphist +Requires: danksearch +Requires: dgop +Requires: kf6-kimageformats +Requires: khal +Requires: matugen +Requires: (qt5ct if qt5-qtbase) +Requires: qt6ct +Requires: qt6-qtmultimedia +Requires: qt6-qtimageformats +Requires: wl-clipboard + +Recommends: NetworkManager +Recommends: ppd-service +Suggests: tuned-ppd + +# Replace and provide the package names from avengemedia/dms +Obsoletes: dms < %{evr} +Provides: dms = %{evr} +Obsoletes: dms-cli < %{evr} +Provides: dms-cli = %{evr} + +Packager: Its-J + +%description +DankMaterialShell is a complete desktop shell for Wayland compositors. +It replaces a variety of tools used to stitch together to make a desktop. + +dms features notifications, an app launcher, wallpaper customization, and is +fully customizable with plugins. + +It includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets, +process monitoring, notification center, clipboard history, dock, control center, +lock screen, and comprehensive plugin system. + +%prep +%autosetup -C +%goprep + +%build +pushd core +export dms_buildtime=$(date -d "@${SOURCE_DATE_EPOCH}" +%%Y-%%m-%%d_%%H:%%M:%%S) +export GO_LDFLAGS="-X main.commit=fedora \ + -X main.Version=%{evr} \ + -X main.buildTime=${dms_buildtime}" +%global gomodulesmode GO111MODULE=on +mkdir -p %{_vpath_builddir}/bin +%gobuild -o %{_vpath_builddir}/bin/dms ./cmd/dms +popd + +# Install dms cli shell completions +%pkg_completion -Bfz dms + +%install +# Install dms +install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service + +install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop +install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg + +mkdir -p %{buildroot}%{_datadir}/quickshell/dms +cp -a quickshell/* %{buildroot}%{_datadir}/quickshell/dms/ +echo "%{evr}" > %{buildroot}%{_datadir}/quickshell/dms/VERSION + +# Install dms cli +mkdir -p %{buildroot}%{_bindir} +install -pm0755 core/%{_vpath_builddir}/bin/dms %{buildroot}%{_bindir}/dms + +# Install dms cli shell completions +mkdir -p %{buildroot}%{bash_completions_dir} +mkdir -p %{buildroot}%{fish_completions_dir} +mkdir -p %{buildroot}%{zsh_completions_dir} +core/%{_vpath_builddir}/bin/dms completion bash > %{buildroot}%{bash_completions_dir}/dms +core/%{_vpath_builddir}/bin/dms completion fish > %{buildroot}%{fish_completions_dir}/dms.fish +core/%{_vpath_builddir}/bin/dms completion zsh > %{buildroot}%{zsh_completions_dir}/_dms + +%check +pushd core +%gotest ./... +popd + +%post +%systemd_user_post dms.service + +%preun +%systemd_user_preun dms.service + +%postun +%systemd_user_postun_with_restart dms.service + +%posttrans +# Signal running DMS instances to reload +pkill -USR1 -x dms || : + + +%files +%license LICENSE +%doc README.md +%{_bindir}/dms +%{_datadir}/quickshell/dms/ +%{_userunitdir}/dms.service +%{_datadir}/applications/dms-open.desktop +%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg + +%changelog +* Sat Mar 28 2026 Its-J - 1.4.4-1 +- Port to Terra + +* Mon Feb 16 2026 Neal Gompa - 1.2.3-5 +- Backport fix for screensaver inhibit support +- Add dependencies to make various wallpaper format work +- Add dependency for printer management support + +* Mon Feb 16 2026 Neal Gompa - 1.2.3-4 +- Add missing khal dependency + +* Mon Feb 16 2026 Neal Gompa - 1.2.3-3 +- Add dependency for ppd-service +- Fix string for embedded package version + +* Sun Feb 15 2026 Neal Gompa - 1.2.3-2 +- Strengthen various dependencies + +* Sun Feb 15 2026 Neal Gompa - 1.2.3-1 +- Initial package diff --git a/anda/system/dank-material-shell/update.rhai b/anda/system/dank-material-shell/update.rhai new file mode 100644 index 0000000000..3fa83f2e6c --- /dev/null +++ b/anda/system/dank-material-shell/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("AvengeMedia/DankMaterialShell")); diff --git a/anda/system/hid-fanatecff/akmod/hid-fanatecff-kmod.spec b/anda/system/hid-fanatecff/akmod/hid-fanatecff-kmod.spec index 45e3b40aa7..dad761cac6 100644 --- a/anda/system/hid-fanatecff/akmod/hid-fanatecff-kmod.spec +++ b/anda/system/hid-fanatecff/akmod/hid-fanatecff-kmod.spec @@ -8,7 +8,7 @@ Name: %{modulename}-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%{?dist} +Release: 3%{?dist} Summary: Fanatec force feedback kernel module License: GPL-2.0-only URL: https://github.com/gotzl/%{modulename} diff --git a/anda/system/hid-fanatecff/dkms/dkms-hid-fanatecff.spec b/anda/system/hid-fanatecff/dkms/dkms-hid-fanatecff.spec index 5b509e5acf..df7544e8af 100644 --- a/anda/system/hid-fanatecff/dkms/dkms-hid-fanatecff.spec +++ b/anda/system/hid-fanatecff/dkms/dkms-hid-fanatecff.spec @@ -7,7 +7,7 @@ Name: dkms-%{modulename} Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fanatec force feedback kernel module (DKMS) License: GPL-2.0-only URL: https://github.com/gotzl/%{modulename} diff --git a/anda/system/hid-fanatecff/kmod-common/hid-fanatecff.spec b/anda/system/hid-fanatecff/kmod-common/hid-fanatecff.spec index f5bf3c3ab1..35d5357976 100644 --- a/anda/system/hid-fanatecff/kmod-common/hid-fanatecff.spec +++ b/anda/system/hid-fanatecff/kmod-common/hid-fanatecff.spec @@ -5,7 +5,7 @@ Name: hid-fanatecff Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fanatec force feedback driver common files License: GPL-2.0-only URL: https://github.com/gotzl/%{name} @@ -21,7 +21,7 @@ akmod and dkms variants. %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/system/hid-tmff2/akmod/hid-tmff2-kmod.spec b/anda/system/hid-tmff2/akmod/hid-tmff2-kmod.spec index 8b5aac37d0..1bcf714322 100644 --- a/anda/system/hid-tmff2/akmod/hid-tmff2-kmod.spec +++ b/anda/system/hid-tmff2/akmod/hid-tmff2-kmod.spec @@ -3,21 +3,17 @@ %global commitdate 20260310 %global ver 0.83 -%global tminit_commit 8c4547288a6c182ed4ff131e36f710f11a76c4a9 -%global tminit_shortcommit %(c=%{tminit_commit}; echo ${c:0:7}) - %define buildforkernels akmod %global debug_package %{nil} %global modulename hid-tmff2 Name: %{modulename}-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 4%{?dist} Summary: Thrustmaster Force Feedback kernel module License: GPL-2.0-only URL: https://github.com/Kimplul/%{modulename} Source0: %{url}/archive/%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz -Source1: https://github.com/Kimplul/hid-tminit/archive/%{tminit_commit}.tar.gz#/hid-tminit-%{tminit_shortcommit}.tar.gz BuildRequires: kmodtool Requires: akmods Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} @@ -36,9 +32,9 @@ kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?bui %autosetup -p1 -n %{modulename}-%{commit} -# Populate the hid-tminit submodule +# Stub out the hid-tminit submodule (superseded by in-kernel hid-thrustmaster) mkdir -p deps/hid-tminit -tar xf %{SOURCE1} --strip-components=1 -C deps/hid-tminit +printf 'all:\ninstall:\nclean:\n' > deps/hid-tminit/Makefile for kernel_version in %{?kernel_versions}; do mkdir _kmod_build_${kernel_version%%___*} @@ -58,8 +54,6 @@ for kernel_version in %{?kernel_versions}; do mkdir -p %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ install -p -m 0755 _kmod_build_${kernel_version%%___*}/*.ko \ %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ - install -p -m 0755 _kmod_build_${kernel_version%%___*}/deps/hid-tminit/*.ko \ - %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ done %{?akmod_install} diff --git a/anda/system/hid-tmff2/akmod/update.rhai b/anda/system/hid-tmff2/akmod/update.rhai index aac012744e..ef91d866eb 100644 --- a/anda/system/hid-tmff2/akmod/update.rhai +++ b/anda/system/hid-tmff2/akmod/update.rhai @@ -9,7 +9,4 @@ if rpm.changed() { let v = sh("cat anda/system/hid-tmff2/kmod-common/hid-tmff2.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); - let t = sh("cat anda/system/hid-tmff2/kmod-common/hid-tmff2.spec | grep '%global tminit_commit ' | sed -E 's/.+tminit_commit //'", #{"stdout": "piped"}).ctx.stdout; - t.pop(); - rpm.global("tminit_commit", t); } diff --git a/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.conf b/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.conf index 85e7bab069..02af43b5d1 100644 --- a/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.conf +++ b/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.conf @@ -5,13 +5,5 @@ AUTOINSTALL="yes" MAKE[0]="'make' KDIR=\"$kernel_source_dir\"" CLEAN[0]=true -BUILT_MODULE_LOCATION[0]="deps/hid-tminit/" -BUILT_MODULE_NAME[0]="hid-tminit-new" +BUILT_MODULE_NAME[0]="hid-tmff-new" DEST_MODULE_LOCATION[0]="/extra" - -BUILT_MODULE_LOCATION[1]="deps/hid-tminit/" -BUILT_MODULE_NAME[1]="usb-tminit-new" -DEST_MODULE_LOCATION[1]="/extra" - -BUILT_MODULE_NAME[2]="hid-tmff-new" -DEST_MODULE_LOCATION[2]="/extra" diff --git a/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.spec b/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.spec index b79b1accc0..25fd8b46ec 100644 --- a/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.spec +++ b/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.spec @@ -3,22 +3,18 @@ %global commitdate 20260310 %global ver 0.83 -%global tminit_commit 8c4547288a6c182ed4ff131e36f710f11a76c4a9 -%global tminit_shortcommit %(c=%{tminit_commit}; echo ${c:0:7}) - %global debug_package %{nil} %global modulename hid-tmff2 Name: dkms-%{modulename} Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 4%{?dist} Summary: Thrustmaster Force Feedback kernel module (DKMS) License: GPL-2.0-only URL: https://github.com/Kimplul/%{modulename} Source0: %{url}/archive/%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz -Source1: https://github.com/Kimplul/hid-tminit/archive/%{tminit_commit}.tar.gz#/hid-tminit-%{tminit_shortcommit}.tar.gz -Source2: %{name}.conf -Source3: no-weak-modules.conf +Source1: %{name}.conf +Source2: no-weak-modules.conf Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: dkms Conflicts: akmod-%{modulename} @@ -32,11 +28,11 @@ T598, T-GT II and TS-XW wheels. %prep %autosetup -p1 -n %{modulename}-%{commit} -# Populate the hid-tminit submodule +# Stub out the hid-tminit submodule (superseded by in-kernel hid-thrustmaster) mkdir -p deps/hid-tminit -tar xf %{SOURCE1} --strip-components=1 -C deps/hid-tminit +printf 'all:\ninstall:\nclean:\n' > deps/hid-tminit/Makefile -cp -f %{SOURCE2} dkms/dkms.conf +cp -f %{SOURCE1} dkms/dkms.conf sed -i -e 's/__VERSION_STRING/%{version}/g' dkms/dkms.conf %build @@ -49,7 +45,7 @@ install -Dpm644 dkms/dkms.conf %{buildroot}%{_usrsrc}/%{modulename}-%{version}/d %if 0%{?fedora} # Do not enable weak modules support in Fedora (no kABI): -install -Dpm644 %{SOURCE3} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf +install -Dpm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf %endif %post diff --git a/anda/system/hid-tmff2/dkms/update.rhai b/anda/system/hid-tmff2/dkms/update.rhai index aac012744e..ef91d866eb 100644 --- a/anda/system/hid-tmff2/dkms/update.rhai +++ b/anda/system/hid-tmff2/dkms/update.rhai @@ -9,7 +9,4 @@ if rpm.changed() { let v = sh("cat anda/system/hid-tmff2/kmod-common/hid-tmff2.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); - let t = sh("cat anda/system/hid-tmff2/kmod-common/hid-tmff2.spec | grep '%global tminit_commit ' | sed -E 's/.+tminit_commit //'", #{"stdout": "piped"}).ctx.stdout; - t.pop(); - rpm.global("tminit_commit", t); } diff --git a/anda/system/hid-tmff2/kmod-common/hid-tmff2.spec b/anda/system/hid-tmff2/kmod-common/hid-tmff2.spec index b8a5b56a47..3e65880848 100644 --- a/anda/system/hid-tmff2/kmod-common/hid-tmff2.spec +++ b/anda/system/hid-tmff2/kmod-common/hid-tmff2.spec @@ -3,17 +3,13 @@ %global commitdate 20260310 %global ver 0.83 -%global tminit_commit 8c4547288a6c182ed4ff131e36f710f11a76c4a9 -%global tminit_shortcommit %(c=%{tminit_commit}; echo ${c:0:7}) - Name: hid-tmff2 Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 4%{?dist} Summary: Thrustmaster Force Feedback driver common files License: GPL-2.0-only URL: https://github.com/Kimplul/%{name} Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz -Source1: https://github.com/Kimplul/hid-tminit/archive/%{tminit_commit}.tar.gz#/hid-tminit-%{tminit_shortcommit}.tar.gz Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} BuildArch: noarch @@ -25,7 +21,7 @@ between the akmod and dkms variants. %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules @@ -36,7 +32,6 @@ Akmods modules for the akmod-%{name} package. # Extract module names from Kbuild for modules-load.d echo hid-tmff-new > %{name}.conf -echo hid-tminit >> %{name}.conf %install # UDev rules: diff --git a/anda/system/hid-tmff2/kmod-common/update.rhai b/anda/system/hid-tmff2/kmod-common/update.rhai index 93ffac6515..d89f5af60b 100644 --- a/anda/system/hid-tmff2/kmod-common/update.rhai +++ b/anda/system/hid-tmff2/kmod-common/update.rhai @@ -5,7 +5,4 @@ if rpm.changed() { let ver = gh("Kimplul/hid-tmff2"); ver.crop(0); rpm.global("ver", ver); - - let tminit = gh_commit("Kimplul/hid-tminit"); - rpm.global("tminit_commit", tminit); } diff --git a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec index 5dd35d4a9d..8fa8ac5b85 100644 --- a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec +++ b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec @@ -10,7 +10,7 @@ Name: %{modulename}-kmod Summary: Akmods module for %{modulename} Version: 0^%{commit_date}git.%{shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/intel/ipu6-drivers Source0: https://github.com/intel/ipu6-drivers/archive/%{commit}/ipu6-drivers-%{shortcommit}.tar.gz @@ -25,7 +25,7 @@ Provides: %{name} = %{commitdate}.%{shortcommit}-%{release} Provides: akmod-%{modulename} = %{commitdate}.%{shortcommit}-%{release} %endif -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description This package enables the Intel IPU6 image processor. @@ -34,7 +34,7 @@ This package enables the Intel IPU6 image processor. # Error out if there was something wrong with kmodtool: %{?kmodtool_check} # Print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n ipu6-drivers-%{commit} patch -p1 -i patches/*.patch diff --git a/anda/system/logitech-rs50-linux-driver/akmod/anda.hcl b/anda/system/logitech-rs50-linux-driver/akmod/anda.hcl new file mode 100644 index 0000000000..d2e96406cb --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/akmod/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "logitech-rs50-linux-driver-kmod.spec" + } + labels { + mock = 1 + updbranch = 1 + } +} diff --git a/anda/system/logitech-rs50-linux-driver/akmod/logitech-rs50-linux-driver-kmod.spec b/anda/system/logitech-rs50-linux-driver/akmod/logitech-rs50-linux-driver-kmod.spec new file mode 100644 index 0000000000..1e5dd05b54 --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/akmod/logitech-rs50-linux-driver-kmod.spec @@ -0,0 +1,69 @@ +# The reason why this package is a separate from the main one despite using the same sources +# is because akmods use the srpm to build the kmod package, and if the kmod package is included +# in the main package, akmods will reinstall the userspace package every time the kernel is updated. + +%if 0%{?fedora} +%global buildforkernels akmod +%global debug_package %{nil} +%endif + +%global commit 34eb21e66a687ea8961f185ecd54bc7e7edae0f8 +%global commitdate 20260407 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global modulename logitech-rs50-linux-driver + +Name: %{modulename}-kmod +Version: 1.0^%{commitdate}git.%{shortcommit} +Release: 2%{?dist} +Summary: Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c276) +License: GPL-2.0-only +URL: https://github.com/mescon/logitech-rs50-linux-driver +Source0: %{url}/archive/%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz +BuildArch: x86_64 +BuildRequires: gcc +BuildRequires: make +BuildRequires: kmodtool + +Requires: akmods +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} +Requires: kernel-devel +Conflicts: dkms-%{modulename} + +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description +Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c276). +This is a patched version of the hid-logitech-hidpp driver that adds RS50 support with force feedback (FF_CONSTANT) and exposes all G Hub settings via sysfs for runtime configuration. +Note: This driver replaces the in-kernel hid-logitech-hidpp module and continues to support all other Logitech HID++ devices (mice, keyboards, other racing wheels like the G29, G920, G923, etc.). + +%prep +# error out if there was something wrong with kmodtool +%{?kmodtool_check} + +# print kmodtool output for debugging purposes: +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%setup -q -c -n %{modulename}-%{commit} + +mv %{modulename}-%{commit}/mainline/* %{modulename}-%{commit}/ + +for kernel_version in %{?kernel_versions} ; do + cp -a %{modulename}-%{commit} _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-logitech-hidpp.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + chmod a+x %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/hid-logitech-hidpp.ko +done +%{?akmod_install} + +%changelog +%autochangelog diff --git a/anda/system/logitech-rs50-linux-driver/akmod/update.rhai b/anda/system/logitech-rs50-linux-driver/akmod/update.rhai new file mode 100644 index 0000000000..d55bf59bae --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/akmod/update.rhai @@ -0,0 +1,9 @@ + let c = sh("cat anda/system/logitech-rs50-linux-driver/kmod-common/logitech-rs50-linux-driver.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/logitech-rs50-linux-driver/kmod-common/logitech-rs50-linux-driver.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commitdate", d); +} diff --git a/anda/system/logitech-rs50-linux-driver/dkms/anda.hcl b/anda/system/logitech-rs50-linux-driver/dkms/anda.hcl new file mode 100644 index 0000000000..352e5771ae --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/dkms/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "dkms-logitech-rs50-linux-driver.spec" + } + labels { + updbranch = 1 + mock = 1 + } +} diff --git a/anda/system/logitech-rs50-linux-driver/dkms/dkms-logitech-rs50-linux-driver.spec b/anda/system/logitech-rs50-linux-driver/dkms/dkms-logitech-rs50-linux-driver.spec new file mode 100644 index 0000000000..c24339cdf3 --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/dkms/dkms-logitech-rs50-linux-driver.spec @@ -0,0 +1,63 @@ +%global commit 34eb21e66a687ea8961f185ecd54bc7e7edae0f8 +%global debug_package %{nil} +%global modulename logitech-rs50-linux-driver +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20260407 + +Name: dkms-%{modulename} +Version: 1.0^%{commitdate}git.%{shortcommit} +Release: 1%{?dist} +Summary: Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c276) +License: GPL-2.0-only +URL: https://github.com/mescon/%{modulename} +Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Patch0: fix-dkms-conf.patch +BuildRequires: sed +BuildRequires: systemd-rpm-macros +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: dkms +Conflicts: akmod-%{modulename} +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} +BuildArch: x86_64 +Provides: %{modulename}-kmod + +%description +Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c276). +This is a patched version of the hid-logitech-hidpp driver that adds RS50 support with force feedback (FF_CONSTANT) and exposes all G Hub settings via sysfs for runtime configuration. +Note: This driver replaces the in-kernel hid-logitech-hidpp module and continues to support all other Logitech HID++ devices (mice, keyboards, other racing wheels like the G29, G920, G923, etc.). + + +%package akmod-modules +Summary: Modules for Akmods +Requires: akmod-%{name} +BuildArch: noarch + +%description akmod-modules +Akmods modules for the akmod-%{name} package. + +%prep +%autosetup -p1 -n %{modulename}-%{commit} +mv mainline/* ./ +mkdir build +sed -i -e 's/__VERSION_STRING/%{version}/g' dkms.conf + +%install +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version} +cp -fr ./ %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ + +%post +dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : +# Rebuild and make available for the currently running kernel: +dkms build -m %{modulename} -v %{version} -q || : +dkms install -m %{modulename} -v %{version} -q --force || : + +%preun +dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : + +%files +%{_usrsrc}/%{modulename}-%{version} +%doc README.md rs-wheel-hub-button-layout.png docs/* + + +%changelog +%autochangelog diff --git a/anda/system/logitech-rs50-linux-driver/dkms/fix-dkms-conf.patch b/anda/system/logitech-rs50-linux-driver/dkms/fix-dkms-conf.patch new file mode 100644 index 0000000000..812966788a --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/dkms/fix-dkms-conf.patch @@ -0,0 +1,17 @@ +diff --git a/dkms.conf b/dkms.conf +index 437e5fd..2c4f3a4 100644 +--- a/dkms.conf ++++ b/dkms.conf +@@ -1,8 +1,8 @@ +-PACKAGE_NAME="hid-logitech-hidpp" +-PACKAGE_VERSION="1.0" ++PACKAGE_NAME="logitech-rs50-linux-driver" ++PACKAGE_VERSION="__VERSION_STRING" + MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules" + CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean" + BUILT_MODULE_NAME[0]="hid-logitech-hidpp" + DEST_MODULE_NAME[0]="hid-logitech-hidpp" + DEST_MODULE_LOCATION[0]="/updates/dkms" +-AUTOINSTALL="yes" +\ No newline at end of file ++AUTOINSTALL="yes" diff --git a/anda/system/logitech-rs50-linux-driver/dkms/update.rhai b/anda/system/logitech-rs50-linux-driver/dkms/update.rhai new file mode 100644 index 0000000000..d55bf59bae --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/dkms/update.rhai @@ -0,0 +1,9 @@ + let c = sh("cat anda/system/logitech-rs50-linux-driver/kmod-common/logitech-rs50-linux-driver.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/logitech-rs50-linux-driver/kmod-common/logitech-rs50-linux-driver.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commitdate", d); +} diff --git a/anda/system/logitech-rs50-linux-driver/kmod-common/anda.hcl b/anda/system/logitech-rs50-linux-driver/kmod-common/anda.hcl new file mode 100644 index 0000000000..e27e61ff9d --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/kmod-common/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "logitech-rs50-linux-driver.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/system/logitech-rs50-linux-driver/kmod-common/com.github.rs50.metainfo.xml b/anda/system/logitech-rs50-linux-driver/kmod-common/com.github.rs50.metainfo.xml new file mode 100644 index 0000000000..4ae8b777a3 --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/kmod-common/com.github.rs50.metainfo.xml @@ -0,0 +1,26 @@ + + com.github.rs50 + logitech rs50 linux driver + logitech-rs50-linux-driver + Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c276). + +

+ Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c276). + This is a patched version of the hid-logitech-hidpp driver that adds RS50 support with force feedback (FF_CONSTANT) and exposes all G Hub settings via sysfs for runtime configuration. + Note: This driver replaces the in-kernel hid-logitech-hidpp module and continues to support all other Logitech HID++ devices (mice, keyboards, other racing wheels like the G29, G920, G923, etc.). +

+ + https://github.com/mescon/logitech-rs50-linux-driver + CC0-1.0 + + GPL-2.0-only + + + mescon + + + + + usb:v046dpc276* + + diff --git a/anda/system/logitech-rs50-linux-driver/kmod-common/logitech-rs50-linux-driver.spec b/anda/system/logitech-rs50-linux-driver/kmod-common/logitech-rs50-linux-driver.spec new file mode 100644 index 0000000000..f782d77c5d --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/kmod-common/logitech-rs50-linux-driver.spec @@ -0,0 +1,51 @@ +%global commit 34eb21e66a687ea8961f185ecd54bc7e7edae0f8 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20260407 + +Name: logitech-rs50-linux-driver +Version: 1.0^%{commitdate}git.%{shortcommit} +Release: 1%{?dist} +Summary: Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c276) +License: GPL-2.0-only +URL: https://github.com/mescon/%{name} +Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Source1: com.github.rs50.metainfo.xml +BuildRequires: systemd-rpm-macros +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} +BuildArch: noarch + +%description +Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c276). +This is a patched version of the hid-logitech-hidpp driver that adds RS50 support with force feedback (FF_CONSTANT) and exposes all G Hub settings via sysfs for runtime configuration. +Note: This driver replaces the in-kernel hid-logitech-hidpp module and continues to support all other Logitech HID++ devices (mice, keyboards, other racing wheels like the G29, G920, G923, etc.). + +%package akmod-modules +Summary: Modules for Akmods +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} +BuildArch: noarch + +%description akmod-modules +Akmods modules for the akmod-%{name} package. + +%prep +%autosetup -p1 -n %{name}-%{commit} + +echo hid-logitech-hidpp > %{name}.conf + +%install +install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/com.github.rs50.metainfo.xml + +# Akmods modules +install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir} + + +%files +%doc README.md rs-wheel-hub-button-layout.png docs/* +%{_datadir}/metainfo/com.github.rs50.metainfo.xml + +%files akmod-modules +%{_modulesloaddir}/%{name}.conf + +%changelog +%autochangelog diff --git a/anda/system/logitech-rs50-linux-driver/kmod-common/update.rhai b/anda/system/logitech-rs50-linux-driver/kmod-common/update.rhai new file mode 100644 index 0000000000..82cd36e3e9 --- /dev/null +++ b/anda/system/logitech-rs50-linux-driver/kmod-common/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("mescon/logitech-rs50-linux-driver")); +if rpm.changed() { + rpm.release(); + rpm.global("commitdate", date()); +} diff --git a/anda/system/nct6687d/akmod/anda.hcl b/anda/system/nct6687d/akmod/anda.hcl new file mode 100644 index 0000000000..644fad7c33 --- /dev/null +++ b/anda/system/nct6687d/akmod/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "nct6687d-kmod.spec" + } + labels { + mock = 1 + updbranch = 1 + } +} diff --git a/anda/system/nct6687d/akmod/nct6687d-kmod.spec b/anda/system/nct6687d/akmod/nct6687d-kmod.spec new file mode 100644 index 0000000000..e934a502e4 --- /dev/null +++ b/anda/system/nct6687d/akmod/nct6687d-kmod.spec @@ -0,0 +1,69 @@ +# The reason why this package is a separate from the main one despite using the same sources +# is because akmods use the srpm to build the kmod package, and if the kmod package is included +# in the main package, akmods will reinstall the userspace package every time the kernel is updated. + +%if 0%{?fedora} +%global buildforkernels akmod +%global debug_package %{nil} +%endif + +%global commit cedda8bff09a4083e07414fb80fdc3901e7ab544 +%global commitdate 20260411 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global modulename nct6687d + +Name: %{modulename}-kmod +Version: 1.0^%{commitdate}git.%{shortcommit} +Release: 2%{?dist} +Summary: Linux kernel driver for the NCT6687D hardware monitoring chip +License: GPL-2.0-or-later +URL: https://github.com/Fred78290/%{modulename} +Source0: %{url}/archive/%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz +BuildArch: x86_64 +BuildRequires: gcc +BuildRequires: make +BuildRequires: kmodtool +BuildRequires: elfutils-libelf-devel + +Requires: akmods +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} +Requires: kernel-devel +Conflicts: dkms-%{modulename} + +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description +Linux kernel driver for the NCT6687D hardware monitoring chip. +This kernel module permit to recognize the chipset Nuvoton NCT6687-R in lm-sensors package. This sensor is present on some B550 motherboard such as MSI or ASUS. +The implementation is minimalist and was done by reverse coding of Windows 10 source code from LibreHardwareMonitor + +%prep +# error out if there was something wrong with kmodtool +%{?kmodtool_check} + +# print kmodtool output for debugging purposes: +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%setup -q -c -n %{modulename}-%{commit} + +for kernel_version in %{?kernel_versions} ; do + cp -a %{modulename}-%{commit} _kmod_build_${kernel_version%%___*} +done + +%build +for kernel_version in %{?kernel_versions}; do + make V=0 %{?_smp_mflags} -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*} +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%%___*}/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + chmod a+x %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/*.ko +done +%{?akmod_install} + +%changelog +* Sat Apr 11 2026 Luan Oliveira - 1.0^20260411git.cedda8b-1 +- Initial package diff --git a/anda/system/nct6687d/akmod/update.rhai b/anda/system/nct6687d/akmod/update.rhai new file mode 100644 index 0000000000..f651cd8bc4 --- /dev/null +++ b/anda/system/nct6687d/akmod/update.rhai @@ -0,0 +1,9 @@ + let c = sh("cat anda/system/nct6687d/kmod-common/nct6687d.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/nct6687d/kmod-common/nct6687d.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commitdate", d); +} diff --git a/anda/system/nct6687d/dkms/anda.hcl b/anda/system/nct6687d/dkms/anda.hcl new file mode 100644 index 0000000000..eda27e4852 --- /dev/null +++ b/anda/system/nct6687d/dkms/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "dkms-nct6687d.spec" + } + labels { + updbranch = 1 + mock = 1 + } +} diff --git a/anda/system/nct6687d/dkms/dkms-nct6687d.spec b/anda/system/nct6687d/dkms/dkms-nct6687d.spec new file mode 100644 index 0000000000..73ac69e8c4 --- /dev/null +++ b/anda/system/nct6687d/dkms/dkms-nct6687d.spec @@ -0,0 +1,61 @@ +%global commit cedda8bff09a4083e07414fb80fdc3901e7ab544 +%global debug_package %{nil} +%global modulename nct6687d +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20260411 + +Name: dkms-%{modulename} +Version: 1.0^%{commitdate}git.%{shortcommit} +Release: 1%{?dist} +Summary: Linux kernel driver for the NCT6687D hardware monitoring chip +License: GPL-2.0-or-later +URL: https://github.com/Fred78290/%{modulename} +Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Patch0: dkms-version.patch +BuildRequires: sed +BuildRequires: systemd-rpm-macros +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: dkms +Conflicts: akmod-%{modulename} +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} +BuildArch: x86_64 +Provides: %{modulename}-kmod + +%description +Linux kernel driver for the NCT6687D hardware monitoring chip. +This kernel module permit to recognize the chipset Nuvoton NCT6687-R in lm-sensors package. This sensor is present on some B550 motherboard such as MSI or ASUS. +The implementation is minimalist and was done by reverse coding of Windows 10 source code from LibreHardwareMonitor + +%package akmod-modules +Summary: Modules for Akmods +Requires: akmod-%{name} +BuildArch: noarch + +%description akmod-modules +Akmods modules for the akmod-%{name} package. + +%prep +%autosetup -p1 -n %{modulename}-%{commit} +sed -i -e 's/__VERSION_STRING/%{version}/g' dkms.conf + +%install +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version} +cp -fr ./ %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ + +%post +dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : +# Rebuild and make available for the currently running kernel: +dkms build -m %{modulename} -v %{version} -q || : +dkms install -m %{modulename} -v %{version} -q --force || : + +%preun +dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : + +%files +%{_usrsrc}/%{modulename}-%{version} + + + +%changelog +* Sat Apr 11 2026 Luan Oliveira - 1.0^20260411git.cedda8b-1 +- Initial package diff --git a/anda/system/nct6687d/dkms/dkms-version.patch b/anda/system/nct6687d/dkms/dkms-version.patch new file mode 100644 index 0000000000..fe96fc77a8 --- /dev/null +++ b/anda/system/nct6687d/dkms/dkms-version.patch @@ -0,0 +1,11 @@ +diff --git a/dkms.conf b/dkms.conf +index d8fc2b1..d315428 100644 +--- a/dkms.conf ++++ b/dkms.conf +@@ -1,5 +1,5 @@ + PACKAGE_NAME="nct6687d" +-PACKAGE_VERSION="1" ++PACKAGE_VERSION="__VERSION_STRING" + MAKE[0]="make kver=${kernelver} dkms/build" + BUILT_MODULE_NAME[0]="nct6687" + DEST_MODULE_LOCATION[0]="/kernel/drivers/hwmon/" diff --git a/anda/system/nct6687d/dkms/update.rhai b/anda/system/nct6687d/dkms/update.rhai new file mode 100644 index 0000000000..f651cd8bc4 --- /dev/null +++ b/anda/system/nct6687d/dkms/update.rhai @@ -0,0 +1,9 @@ + let c = sh("cat anda/system/nct6687d/kmod-common/nct6687d.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/nct6687d/kmod-common/nct6687d.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commitdate", d); +} diff --git a/anda/system/nct6687d/kmod-common/anda.hcl b/anda/system/nct6687d/kmod-common/anda.hcl new file mode 100644 index 0000000000..2a426355a3 --- /dev/null +++ b/anda/system/nct6687d/kmod-common/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "nct6687d.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/system/nct6687d/kmod-common/com.github.nct6687d.metainfo.xml b/anda/system/nct6687d/kmod-common/com.github.nct6687d.metainfo.xml new file mode 100644 index 0000000000..0e56f8305d --- /dev/null +++ b/anda/system/nct6687d/kmod-common/com.github.nct6687d.metainfo.xml @@ -0,0 +1,22 @@ + + com.github.nct6687d + NCT6687D Kernel module + nct6687d + Linux kernel driver for the NCT6687D hardware monitoring chip. + +

+This kernel module permit to recognize the chipset Nuvoton NCT6687-R in lm-sensors package. This sensor is present on some B550 motherboard such as MSI or ASUS. + +The implementation is minimalist and was done by reverse coding of Windows 10 source code from LibreHardwareMonitor. +

+ + https://github.com/Fred78290/nct6687d + CC0-1.0 + + GPL-2.0-or-later + + + Fred78290 + + + diff --git a/anda/system/nct6687d/kmod-common/nct6687d.spec b/anda/system/nct6687d/kmod-common/nct6687d.spec new file mode 100644 index 0000000000..6276cb0f96 --- /dev/null +++ b/anda/system/nct6687d/kmod-common/nct6687d.spec @@ -0,0 +1,55 @@ +%global commit cedda8bff09a4083e07414fb80fdc3901e7ab544 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20260411 + +Name: nct6687d +Version: 1.0^%{commitdate}git.%{shortcommit} +Release: 1%{?dist} +Summary: Linux kernel driver for the NCT6687D hardware monitoring chip +License: GPL-2.0-or-later +URL: https://github.com/Fred78290/%{name} +Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Source1: com.github.nct6687d.metainfo.xml +BuildRequires: systemd-rpm-macros +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} +BuildArch: noarch + +%description +Linux kernel driver for the NCT6687D hardware monitoring chip. +This kernel module permit to recognize the chipset Nuvoton NCT6687-R in lm-sensors package. This sensor is present on some B550 motherboard such as MSI or ASUS. +The implementation is minimalist and was done by reverse coding of Windows 10 source code from LibreHardwareMonitor + +%package akmod-modules +Summary: Modules for Akmods +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} +BuildArch: noarch + +%description akmod-modules +Akmods modules for the akmod-%{name} package. + +%prep +%autosetup -p1 -n %{name}-%{commit} + +echo %{name} > %{name}.conf +echo "blacklist nct6683" > nct6683_blacklist.conf + +%install +install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/com.github.nct6687d.metainfo.xml + +# Akmods modules +install -Dm 0644 %{name}.conf -t %{buildroot}%{_modulesloaddir} +install -Dm 0644 nct6683_blacklist.conf -t %{buildroot}%{_modprobedir} + +%files +%license LICENSE +%doc README.md images/* TESTING_RESULTS.md +%{_modprobedir}/nct6683_blacklist.conf +%{_datadir}/metainfo/com.github.nct6687d.metainfo.xml + +%files akmod-modules +%{_modulesloaddir}/%{name}.conf + +%changelog +* Sat Apr 11 2026 Luan Oliveira - 1.0^20260411git.cedda8b-1 +- Initial package diff --git a/anda/system/nct6687d/kmod-common/update.rhai b/anda/system/nct6687d/kmod-common/update.rhai new file mode 100644 index 0000000000..03c78a4cb4 --- /dev/null +++ b/anda/system/nct6687d/kmod-common/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("Fred78290/nct6687d")); +if rpm.changed() { + rpm.release(); + rpm.global("commitdate", date()); +} diff --git a/anda/system/new-lg4ff/akmod/new-lg4ff-kmod.spec b/anda/system/new-lg4ff/akmod/new-lg4ff-kmod.spec index 58ad26c932..7041a5ea35 100644 --- a/anda/system/new-lg4ff/akmod/new-lg4ff-kmod.spec +++ b/anda/system/new-lg4ff/akmod/new-lg4ff-kmod.spec @@ -8,7 +8,7 @@ Name: %{modulename}-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%{?dist} +Release: 3%{?dist} Summary: Logitech force feedback kernel module License: GPL-2.0-only URL: https://github.com/berarma/%{modulename} diff --git a/anda/system/new-lg4ff/dkms/dkms-new-lg4ff.spec b/anda/system/new-lg4ff/dkms/dkms-new-lg4ff.spec index ce5d873ced..954f84b65f 100644 --- a/anda/system/new-lg4ff/dkms/dkms-new-lg4ff.spec +++ b/anda/system/new-lg4ff/dkms/dkms-new-lg4ff.spec @@ -7,7 +7,7 @@ Name: dkms-%{modulename} Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logitech force feedback kernel module (DKMS) License: GPL-2.0-only URL: https://github.com/berarma/%{modulename} diff --git a/anda/system/new-lg4ff/kmod-common/new-lg4ff.spec b/anda/system/new-lg4ff/kmod-common/new-lg4ff.spec index 567e1ba467..dd7a6e175c 100644 --- a/anda/system/new-lg4ff/kmod-common/new-lg4ff.spec +++ b/anda/system/new-lg4ff/kmod-common/new-lg4ff.spec @@ -5,7 +5,7 @@ Name: new-lg4ff Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logitech force feedback driver common files License: GPL-2.0-only URL: https://github.com/berarma/%{name} @@ -20,7 +20,7 @@ common files shared between the akmod and dkms variants. %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/system/nvidia-580/nvidia-kmod/nvidia-580xx-kmod.spec b/anda/system/nvidia-580/nvidia-kmod/nvidia-580xx-kmod.spec index f1e49ed4c4..02f1dc1eeb 100644 --- a/anda/system/nvidia-580/nvidia-kmod/nvidia-580xx-kmod.spec +++ b/anda/system/nvidia-580/nvidia-kmod/nvidia-580xx-kmod.spec @@ -6,7 +6,7 @@ Name: %{modulename}-kmod Version: 580.119.02 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA display driver kernel module Epoch: 3 License: NVIDIA License @@ -24,7 +24,7 @@ Provides: akmod-nvidia-580 = %{evr} BuildRequires: kmodtool # kmodtool does its magic here: -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description The NVidia %{version} display driver kernel module for kernel %{kversion}. @@ -33,7 +33,7 @@ The NVidia %{version} display driver kernel module for kernel %{kversion}. # Error out if there was something wrong with kmodtool: %{?kmodtool_check} # Print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null sh %{SOURCE0} -x --target %{real_name}-%{version}-%{_arch} %setup -T -D -n %{real_name}-%{version}-%{_arch} diff --git a/anda/system/nvidia/nvidia-driver/70-nvidia-driver.preset b/anda/system/nvidia/nvidia-driver/70-nvidia-driver.preset index f897d23a61..b9645ecb7b 100644 --- a/anda/system/nvidia/nvidia-driver/70-nvidia-driver.preset +++ b/anda/system/nvidia/nvidia-driver/70-nvidia-driver.preset @@ -1,11 +1,3 @@ -# Enable complete power management. From: -# file:///usr/share/doc/nvidia-driver/html/powermanagement.html - -enable nvidia-hibernate.service -enable nvidia-resume.service -enable nvidia-suspend.service -enable nvidia-suspend-then-hibernate.service - # Enable Dynamic Boost. From: # file:///usr/share/doc/nvidia-driver/html/dynamicboost.html diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index ee52a4b292..5c3014778d 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -1,6 +1,5 @@ %global debug_package %{nil} -%global __strip %{nil} -%global __brp_strip_comment_note %{nil} +%global __brp_strip %{nil} %global __brp_ldconfig %{nil} %define _build_id_links none @@ -223,6 +222,13 @@ rm -f libnvidia-pkcs11.so.%{version} %endif %endif +# Avoid harmless Vulkan loader message: +# WARNING: [Loader Message] Code 0 : Path to given binary /usr/lib64/libGLX_nvidia.so.590.48.01 +# was found to differ from OS loaded path /usr/lib64/libGLX_nvidia.so.0 +# See also https://github.com/negativo17/nvidia-driver/issues/195 +mv libGLX_nvidia.so.%{version} libGLX_nvidia.so.0 +ln -sf libGLX_nvidia.so.0 libGLX_nvidia.so.%{version} + # Create symlinks for shared objects ldconfig -vn . @@ -293,7 +299,7 @@ install -p -m 0644 nvidia-{smi,cuda-mps-control}*.gz %{buildroot}%{_mandir}/man1 %if 0%{?fedora} || 0%{?rhel} < 10 # X stuff -install -p -m 0644 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf +install -p -m 0644 -D nvidia-drm-outputclass.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf install -p -m 0755 -D nvidia_drv.so %{buildroot}%{_libdir}/xorg/modules/drivers/nvidia_drv.so install -p -m 0755 -D libglxserver_nvidia.so.%{version} %{buildroot}%{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so %endif @@ -312,9 +318,7 @@ install -p -m 0644 nvoptix.bin %{buildroot}%{_datadir}/nvidia/ mkdir -p %{buildroot}%{_systemd_util_dir}/system-preset/ install -p -m 0644 %{SOURCE8} %{SOURCE9} %{buildroot}%{_systemd_util_dir}/system-preset/ mkdir -p %{buildroot}%{_unitdir}/ -install -p -m 0644 systemd/system/*.service %{buildroot}%{_unitdir}/ -install -p -m 0755 systemd/nvidia-sleep.sh %{buildroot}%{_bindir}/ -install -p -m 0755 -D systemd/system-sleep/nvidia %{buildroot}%{_systemd_util_dir}/system-sleep/nvidia +cp -frv systemd/system/systemd-* systemd/system/nvidia-powerd.service %{buildroot}%{_unitdir}/ install -p -m 0644 -D nvidia-dbus.conf %{buildroot}%{_datadir}/dbus-1/system.d/nvidia-dbus.conf # Ignore powerd binary exiting if hardware is not present @@ -351,25 +355,13 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %ifarch x86_64 aarch64 %post -%systemd_post nvidia-hibernate.service %systemd_post nvidia-powerd.service -%systemd_post nvidia-resume.service -%systemd_post nvidia-suspend.service -%systemd_post nvidia-suspend-then-hibernate.service %preun -%systemd_preun nvidia-hibernate.service %systemd_preun nvidia-powerd.service -%systemd_preun nvidia-resume.service -%systemd_preun nvidia-suspend.service -%systemd_preun nvidia-suspend-then-hibernate.service %postun -%systemd_postun nvidia-hibernate.service %systemd_postun nvidia-powerd.service -%systemd_postun nvidia-resume.service -%systemd_postun nvidia-suspend.service -%systemd_postun nvidia-suspend-then-hibernate.service %endif @@ -384,18 +376,20 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %{_bindir}/nvidia-pcc %endif %{_bindir}/nvidia-powerd -%{_bindir}/nvidia-sleep.sh %{_metainfodir}/com.nvidia.driver.metainfo.xml %{_datadir}/dbus-1/system.d/nvidia-dbus.conf %{_datadir}/nvidia/nvidia-application-profiles* %{_datadir}/pixmaps/com.nvidia.driver.png %{_systemd_util_dir}/system-preset/70-nvidia-driver.preset -%{_systemd_util_dir}/system-sleep/nvidia -%{_unitdir}/nvidia-hibernate.service %{_unitdir}/nvidia-powerd.service -%{_unitdir}/nvidia-resume.service -%{_unitdir}/nvidia-suspend.service -%{_unitdir}/nvidia-suspend-then-hibernate.service +%dir %{_unitdir}/systemd-suspend.service.d +%{_unitdir}/systemd-suspend.service.d/nvidia-suspend-nofreeze.conf +%dir %{_unitdir}/systemd-hibernate.service.d +%{_unitdir}/systemd-hibernate.service.d/nvidia-suspend-nofreeze.conf +%dir %{_unitdir}/systemd-suspend-then-hibernate.service.d +%{_unitdir}/systemd-suspend-then-hibernate.service.d/nvidia-suspend-nofreeze.conf +%dir %{_unitdir}/systemd-hybrid-sleep.service.d +%{_unitdir}/systemd-hybrid-sleep.service.d/nvidia-suspend-nofreeze.conf %if 0%{?fedora} < 42 || 0%{?rhel} %{_sysconfdir}/dnf/plugins/needs-restarting.d/%{name}.conf %endif @@ -465,7 +459,6 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %endif %ifarch x86_64 %{_datadir}/vulkansc/icd.d/nvidia_icd.%{_target_cpu}.json -%{_libdir}/libnvidia-present.so.%{version} %{_libdir}/libnvidia-vksc-core.so.1 %{_libdir}/libnvidia-vksc-core.so.%{version} %dir %{_libdir}/nvidia diff --git a/anda/system/nvidia/nvidia-driver/nvidia-generate-tarballs.sh b/anda/system/nvidia/nvidia-driver/nvidia-generate-tarballs.sh index f21afc002e..40942b422f 100755 --- a/anda/system/nvidia/nvidia-driver/nvidia-generate-tarballs.sh +++ b/anda/system/nvidia/nvidia-driver/nvidia-generate-tarballs.sh @@ -17,7 +17,17 @@ set_vars() { run_file_get() { printf "Downloading installer ${RUN_FILE}... " - [[ -f $RUN_FILE ]] || wget -c -q ${DL_SITE}/${PLATFORM}/${VERSION}/$RUN_FILE + if [[ ! -f $RUN_FILE ]]; then + # Orgininal comment from Negativo: "This is getting ridiculous" + # My comment: It sure fucking is. + if wget -q -S --spider https://download.nvidia.com/XFree86/${PLATFORM}/${VERSION}/$RUN_FILE; then + wget -q https://download.nvidia.com/XFree86/${PLATFORM}/${VERSION}/$RUN_FILE + elif wget -q -S --spider https://us.download.nvidia.com/XFree86/${PLATFORM}/${VERSION}/$RUN_FILE; then + wget -q https://us.download.nvidia.com/XFree86/${PLATFORM}/${VERSION}/$RUN_FILE + else + wget -q https://us.download.nvidia.com/tesla/${VERSION}/$RUN_FILE + fi + fi printf "OK\n" } @@ -26,8 +36,8 @@ run_file_extract() { sh ${RUN_FILE} --extract-only --target ${TEMP_UNPACK} } -cleanup_folder() { +cleanup_folder() { printf "Cleaning up binaries... " cd ${TEMP_UNPACK} @@ -36,7 +46,9 @@ cleanup_folder() { # - Compiled from source # - Interactive installer files # - GLVND GL libraries - # - Internal development only libraries + # - GLVND test scripts + # - Closed source modules + # - Open source modules with precompiled c++ code rm -r \ nvidia-xconfig* \ nvidia-persistenced* \ @@ -49,7 +61,7 @@ cleanup_folder() { libEGL.so.${VERSION} \ nvidia-installer* .manifest make* mk* libglvnd_install_checker \ 15_nvidia_gbm.json 10_nvidia_wayland.json 20_nvidia_xcb.json 20_nvidia_xlib.json \ - 99_nvidia_wayland2.json \ + 09_nvidia_wayland2.json \ kernel kernel-open if [ "${ARCH}" == x86_64 ]; then @@ -70,7 +82,6 @@ cleanup_folder() { } create_tarball() { - KMOD_COMMON=nvidia-kmod-common-${VERSION} USR_64=nvidia-driver-${VERSION}-${ARCH} USR_32=nvidia-driver-${VERSION}-i386 @@ -80,7 +91,7 @@ create_tarball() { mv ${TEMP_UNPACK}/firmware ${TEMP_UNPACK}/nvidia-bug-report.sh ${KMOD_COMMON}/ if [ "$ARCH" == x86_64 ]; then - mkdir ${USR_32} + mkdir ${USR_32} mv ${TEMP_UNPACK}/32/* ${USR_32}/ rm -fr ${TEMP_UNPACK}/32 else diff --git a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec index 3afa2a5d1f..1c8dac67e5 100644 --- a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec +++ b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec @@ -8,7 +8,7 @@ Name: nvidia-kmod Version: 595.58.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA display driver kernel module Epoch: 3 License: NVIDIA License @@ -28,7 +28,7 @@ BuildRequires: gcc-c++ BuildRequires: kmodtool # kmodtool does its magic here: -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description The NVidia %{version} display driver kernel module for kernel %{kversion}. @@ -37,7 +37,7 @@ The NVidia %{version} display driver kernel module for kernel %{kversion}. # Error out if there was something wrong with kmodtool: %{?kmodtool_check} # Print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -c diff --git a/anda/system/opentabletdriver-nightly/opentabletdriver-nightly.spec b/anda/system/opentabletdriver-nightly/opentabletdriver-nightly.spec index 830a5b2a23..47614758f5 100644 --- a/anda/system/opentabletdriver-nightly/opentabletdriver-nightly.spec +++ b/anda/system/opentabletdriver-nightly/opentabletdriver-nightly.spec @@ -1,6 +1,6 @@ -%global commit be2a35699d96edc99d4976517e9d4a9f462d7ab8 +%global commit 4d16ee2f925621b7a5b03937ae3b00a90e27f234 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20260408 +%global commit_date 20260412 %global ver 0.6.6.2 # We aren't using Mono but RPM expected Mono diff --git a/anda/system/rtl8821cu/akmod/rtl8821cu-kmod.spec b/anda/system/rtl8821cu/akmod/rtl8821cu-kmod.spec index 7e101d011c..dfbb341e87 100644 --- a/anda/system/rtl8821cu/akmod/rtl8821cu-kmod.spec +++ b/anda/system/rtl8821cu/akmod/rtl8821cu-kmod.spec @@ -11,7 +11,7 @@ Linux Driver for USB Wi-Fi Adapters that are based on the RTL8811CU, RTL8821CU, Name: %{modulename}-kmod Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Linux Driver for USB Wi-Fi Adapters using RTL8821 chipsets License: GPL-2.0-only URL: https://github.com/morrownr/8821cu-20210916 @@ -23,13 +23,13 @@ Requires: akmods Conflicts: dkms-%{modulename} Packager: Gilver E. -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description %_description %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -n %{git_name}-%{commit} diff --git a/anda/system/rtl8821cu/dkms/anda.hcl b/anda/system/rtl8821cu/dkms/anda.hcl index 3d716dd0ca..09cdb8c884 100644 --- a/anda/system/rtl8821cu/dkms/anda.hcl +++ b/anda/system/rtl8821cu/dkms/anda.hcl @@ -1,4 +1,5 @@ project pkg { + arches = ["x86_64"] rpm { spec = "dkms-rtl8821cu.spec" } diff --git a/anda/system/rtl8821cu/dkms/dkms-rtl8821cu.spec b/anda/system/rtl8821cu/dkms/dkms-rtl8821cu.spec index 439731cce7..f1cce2d9f4 100644 --- a/anda/system/rtl8821cu/dkms/dkms-rtl8821cu.spec +++ b/anda/system/rtl8821cu/dkms/dkms-rtl8821cu.spec @@ -4,13 +4,12 @@ %global ver 5.12.0.4 %global modulename rtl8821cu %global git_name 8821cu-20210916 -%global debug_package %{nil} %global _description %{expand: Linux Driver for USB Wi-Fi Adapters that are based on the RTL8811CU, RTL8821CU, RTL8821CUH, and RTL8731AU chipsets.} Name: dkms-%{modulename} Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Linux Driver for USB Wi-Fi Adapters using RTL8821 chipsets License: GPL-2.0-only URL: https://github.com/morrownr/8821cu-20210916 @@ -26,6 +25,7 @@ Requires: bc Requires: make Provides: %{modulename}-kmod Conflicts: akmod-%{modulename} +BuildArch: noarch Packager: Gilver E. %description %_description @@ -50,7 +50,7 @@ sed -i 's/CONFIG_PLATFORM_ARM64_RPI = n/CONFIG_PLATFORM_ARM64_RPI = y/g' Makefil %install mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ -cp -fr core hal include os_dep platform Kconfig Makefile halmac.mk dkms-make.sh dkms.conf %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ +cp -fr core hal include os_dep platform Kconfig Makefile halmac.mk rtl8821c.mk dkms-make.sh dkms.conf %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ %if 0%{?fedora} # Do not enable weak modules support in Fedora (no kABI): diff --git a/anda/system/rtl8821cu/kmod-common/rtl8821cu-kmod-common.spec b/anda/system/rtl8821cu/kmod-common/rtl8821cu-kmod-common.spec index 6a6d2ec817..b6685aefa8 100644 --- a/anda/system/rtl8821cu/kmod-common/rtl8821cu-kmod-common.spec +++ b/anda/system/rtl8821cu/kmod-common/rtl8821cu-kmod-common.spec @@ -4,7 +4,6 @@ %global ver 5.12.0.4 %global modulename rtl8821cu %global git_name 8821cu-20210916 -%global debug_package %{nil} Name: %{modulename}-kmod-common Version: %{ver}^%{commit_date}git.%{shortcommit} diff --git a/anda/system/sc0710/akmod/sc0710-kmod.spec b/anda/system/sc0710/akmod/sc0710-kmod.spec index dd3c4d811c..8a604c35a5 100644 --- a/anda/system/sc0710/akmod/sc0710-kmod.spec +++ b/anda/system/sc0710/akmod/sc0710-kmod.spec @@ -1,6 +1,6 @@ -%global commit f1f5a722ccbdfc571450d9397e5e1b85da31f9d3 +%global commit 51e965aafd4b25f28061b85cbbe68e0839ac1e3b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20260321 +%global commitdate 20260409 %global ver 0 %define buildforkernels akmod %global debug_package %{nil} @@ -8,7 +8,7 @@ Name: %{modulename}-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Elgato 4K60 Pro MK.2 / 4K Pro capture card driver License: GPL-2.0-only URL: https://github.com/Nakildias/sc0710 @@ -19,14 +19,14 @@ Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Conflicts: dkms-%{modulename} Packager: Kyle Gospodnetich -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description Elgato 4K60 Pro MK.2 / 4K Pro capture card driver. %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n %{modulename}-%{commit} diff --git a/anda/system/sc0710/dkms/dkms-sc0710.spec b/anda/system/sc0710/dkms/dkms-sc0710.spec index 644f20b85b..60b8cbd728 100644 --- a/anda/system/sc0710/dkms/dkms-sc0710.spec +++ b/anda/system/sc0710/dkms/dkms-sc0710.spec @@ -1,6 +1,6 @@ -%global commit f1f5a722ccbdfc571450d9397e5e1b85da31f9d3 +%global commit 51e965aafd4b25f28061b85cbbe68e0839ac1e3b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20260321 +%global commitdate 20260409 %global ver 0 %global debug_package %{nil} %global modulename sc0710 diff --git a/anda/system/sc0710/kmod-common/sc0710.spec b/anda/system/sc0710/kmod-common/sc0710.spec index dd4e4697f8..468506a783 100644 --- a/anda/system/sc0710/kmod-common/sc0710.spec +++ b/anda/system/sc0710/kmod-common/sc0710.spec @@ -1,6 +1,6 @@ -%global commit f1f5a722ccbdfc571450d9397e5e1b85da31f9d3 +%global commit 51e965aafd4b25f28061b85cbbe68e0839ac1e3b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20260321 +%global commitdate 20260409 %global ver 0 Name: sc0710 diff --git a/anda/system/scx-scheds/nightly/scx-scheds-nightly.spec b/anda/system/scx-scheds/nightly/scx-scheds-nightly.spec index 2f3a6e49e1..ee4dc6ebb4 100644 --- a/anda/system/scx-scheds/nightly/scx-scheds-nightly.spec +++ b/anda/system/scx-scheds/nightly/scx-scheds-nightly.spec @@ -1,6 +1,6 @@ -%global commit 2495e02cb5f0f9b30cb02b549d21d5f5e67a76ff +%global commit 36cadac52e511e5690481f4b271ffeffb3fe9aa9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20260408 +%global commitdate 20260411 %global ver 1.1.0 %undefine __brp_mangle_shebangs diff --git a/anda/system/t150-driver/akmod/t150-driver-kmod.spec b/anda/system/t150-driver/akmod/t150-driver-kmod.spec index 95ea5dff63..88f013e575 100644 --- a/anda/system/t150-driver/akmod/t150-driver-kmod.spec +++ b/anda/system/t150-driver/akmod/t150-driver-kmod.spec @@ -8,7 +8,7 @@ Name: %{modulename}-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%{?dist} +Release: 3%{?dist} Summary: Thrustmaster T150 steering wheel kernel module License: GPL-2.0-only URL: https://github.com/scarburato/t150_driver diff --git a/anda/system/t150-driver/dkms/dkms-t150-driver.spec b/anda/system/t150-driver/dkms/dkms-t150-driver.spec index 1872995222..3f1d3a79b6 100644 --- a/anda/system/t150-driver/dkms/dkms-t150-driver.spec +++ b/anda/system/t150-driver/dkms/dkms-t150-driver.spec @@ -7,7 +7,7 @@ Name: dkms-%{modulename} Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Thrustmaster T150 steering wheel kernel module (DKMS) License: GPL-2.0-only URL: https://github.com/scarburato/t150_driver diff --git a/anda/system/t150-driver/kmod-common/t150-driver.spec b/anda/system/t150-driver/kmod-common/t150-driver.spec index 82f5fefdc7..199f72369f 100644 --- a/anda/system/t150-driver/kmod-common/t150-driver.spec +++ b/anda/system/t150-driver/kmod-common/t150-driver.spec @@ -5,7 +5,7 @@ Name: t150-driver Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Thrustmaster T150 steering wheel driver common files License: GPL-2.0-only URL: https://github.com/scarburato/t150_driver @@ -20,7 +20,7 @@ common files shared between the akmod and dkms variants. %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/system/usbio-drivers/akmod/intel-usbio-kmod.spec b/anda/system/usbio-drivers/akmod/intel-usbio-kmod.spec index 39b2b41818..2d07e88742 100644 --- a/anda/system/usbio-drivers/akmod/intel-usbio-kmod.spec +++ b/anda/system/usbio-drivers/akmod/intel-usbio-kmod.spec @@ -8,7 +8,7 @@ Name: %{modulename}-kmod Summary: Kernel drivers for the USBIO Extension Version: 0^%{commit_date}git.%{shortcommit} -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-only URL: https://github.com/intel/usbio-drivers Source0: %{url}/archive/%{commit}.tar.gz#/usbio-drivers-%{shortcommit}.tar.gz @@ -20,7 +20,7 @@ Requires: akmods Requires: akmod-intel-ipu6 Packager: Gilver E. -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description This package enables USBIO Extension drivers on Intel Alder Lake, Raptor Lake, Meteor Lake and Lunar Lake platforms. @@ -30,7 +30,7 @@ This package enables USBIO Extension drivers on Intel Alder Lake, Raptor Lake, M %{?kmodtool_check} # print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n usbio-drivers-%{commit} rm -fr .github diff --git a/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec index 30da3ddc8e..f2312787eb 100644 --- a/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec +++ b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec @@ -18,7 +18,7 @@ This module allows you to create \"virtual video devices.\" Normal \(v4l2\) appl Name: %{modulename}-kmod Summary: Kernel module (kmod) for V4L2 loopback devices Version: 0.15.3 -Release: 2%?dist +Release: 4%{?dist} License: GPL-2.0-or-later URL: https://github.com/v4l2loopback/v4l2loopback Source0: %{url}/archive/v%{version}/%{modulename}-%{version}.tar.gz @@ -35,14 +35,14 @@ Requires: kernel-devel Conflicts: dkms-%{modulename} Packager: Cappy Ishihara -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description %_description %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -q -c (cd v4l2loopback-%{version} diff --git a/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec b/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec index 6aca781b0b..58ee8502d9 100644 --- a/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec +++ b/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec @@ -5,7 +5,7 @@ This module allows you to create \"virtual video devices.\" Normal \(v4l2\) appl Name: dkms-%{modulename} Version: 0.15.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utils for V4L2 loopback devices License: GPL-2.0-or-later URL: https://github.com/v4l2loopback/v4l2loopback diff --git a/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec b/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec index ac9a645b26..48a2c75cde 100644 --- a/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec +++ b/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec @@ -6,7 +6,7 @@ Name: v4l2loopback Summary: Utils for V4L2 loopback devices Version: 0.15.3 -Release: 1%?dist +Release: 2%?dist License: GPL-2.0-or-later URL: https://github.com/v4l2loopback/v4l2loopback Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -29,7 +29,7 @@ Allows you to create "virtual video devices". Normal (v4l2) applications will re %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/system/wl-kmod/wl-kmod.spec b/anda/system/wl-kmod/wl-kmod.spec index 0a4ec39193..77f043179b 100644 --- a/anda/system/wl-kmod/wl-kmod.spec +++ b/anda/system/wl-kmod/wl-kmod.spec @@ -10,7 +10,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -58,7 +58,7 @@ BuildRequires: elfutils-libelf-devel %{!?kernels:BuildRequires: gcc, elfutils-libelf-devel} -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43142-, BCM43224-, BCM43225-, BCM43227-, BCM43228-, BCM4331-, BCM4360, and -BCM4352-. @@ -67,7 +67,7 @@ NOTE: Please read the LICENSE.txt file in the docs directory before using this d %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -q -c -T mkdir %{name}-%{version}-src diff --git a/anda/system/xone/nightly/akmod/xone-nightly-kmod.spec b/anda/system/xone/nightly/akmod/xone-nightly-kmod.spec index 564991c646..68188620f7 100644 --- a/anda/system/xone/nightly/akmod/xone-nightly-kmod.spec +++ b/anda/system/xone/nightly/akmod/xone-nightly-kmod.spec @@ -8,7 +8,7 @@ Name: %{modulename}-nightly-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%{?dist} +Release: 3%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif @@ -28,14 +28,14 @@ Obsoletes: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c %endif Packager: Gilver E. -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description Linux kernel driver for Xbox One and Xbox Series X|S accessories. %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n %{modulename}-%{commit} diff --git a/anda/system/xone/nightly/dkms/dkms-xone-nightly.spec b/anda/system/xone/nightly/dkms/dkms-xone-nightly.spec index b593424a01..b4de82ea2c 100644 --- a/anda/system/xone/nightly/dkms/dkms-xone-nightly.spec +++ b/anda/system/xone/nightly/dkms/dkms-xone-nightly.spec @@ -7,7 +7,7 @@ Name: dkms-%{modulename}-nightly Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif diff --git a/anda/system/xone/nightly/kmod-common/xone-nightly.spec b/anda/system/xone/nightly/kmod-common/xone-nightly.spec index c08c02e8b3..8625122ca2 100644 --- a/anda/system/xone/nightly/kmod-common/xone-nightly.spec +++ b/anda/system/xone/nightly/kmod-common/xone-nightly.spec @@ -11,7 +11,7 @@ Name: xone-nightly Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif @@ -45,7 +45,7 @@ Linux kernel driver for Xbox One and Xbox Series X|S accessories common files. %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/system/xone/stable/akmod/xone-kmod.spec b/anda/system/xone/stable/akmod/xone-kmod.spec index 319fd965e6..39651ecf4b 100644 --- a/anda/system/xone/stable/akmod/xone-kmod.spec +++ b/anda/system/xone/stable/akmod/xone-kmod.spec @@ -3,8 +3,8 @@ %global modulename xone Name: %{modulename}-kmod -Version: 0.5.7 -Release: 1%?dist +Version: 0.5.8 +Release: 3%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 2 %endif @@ -24,14 +24,14 @@ Obsoletes: %{name} < %{?epoch:%{epoch}:}0.3.4 %endif Packager: Gilver E. -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description Linux kernel driver for Xbox One and Xbox Series X|S accessories. %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n %{modulename}-%{version} diff --git a/anda/system/xone/stable/dkms/dkms-xone.spec b/anda/system/xone/stable/dkms/dkms-xone.spec index 57cbc4cc8b..2c86dfe891 100644 --- a/anda/system/xone/stable/dkms/dkms-xone.spec +++ b/anda/system/xone/stable/dkms/dkms-xone.spec @@ -2,8 +2,8 @@ %global modulename xone Name: dkms-%{modulename} -Version: 0.5.7 -Release: 1%?dist +Version: 0.5.8 +Release: 2%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 2 %endif diff --git a/anda/system/xone/stable/kmod-common/xone.spec b/anda/system/xone/stable/kmod-common/xone.spec index 9a5ac16a04..d219664c9e 100644 --- a/anda/system/xone/stable/kmod-common/xone.spec +++ b/anda/system/xone/stable/kmod-common/xone.spec @@ -6,7 +6,7 @@ Name: xone Version: 0.5.8 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 2 %endif @@ -44,7 +44,7 @@ Linux kernel driver for Xbox One and Xbox Series X|S accessories common files. %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/system/xonedo/nightly/akmod/xonedo-nightly-kmod.spec b/anda/system/xonedo/nightly/akmod/xonedo-nightly-kmod.spec index afaa631e78..61e2d361b3 100644 --- a/anda/system/xonedo/nightly/akmod/xonedo-nightly-kmod.spec +++ b/anda/system/xonedo/nightly/akmod/xonedo-nightly-kmod.spec @@ -8,7 +8,7 @@ Name: %{modulename}-nightly-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 4%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif @@ -31,14 +31,14 @@ Obsoletes: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c %endif Packager: Kyle Gospodnetich -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description Linux kernel driver for Xbox One and Xbox Series X|S accessories. Compatible with the xpad kernel module. %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n %{modulename}-%{commit} diff --git a/anda/system/xonedo/nightly/dkms/dkms-xonedo-nightly.spec b/anda/system/xonedo/nightly/dkms/dkms-xonedo-nightly.spec index 9fc8bcb318..134a1aeefb 100644 --- a/anda/system/xonedo/nightly/dkms/dkms-xonedo-nightly.spec +++ b/anda/system/xonedo/nightly/dkms/dkms-xonedo-nightly.spec @@ -7,7 +7,7 @@ Name: dkms-%{modulename}-nightly Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif diff --git a/anda/system/xonedo/nightly/kmod-common/xonedo-nightly.spec b/anda/system/xonedo/nightly/kmod-common/xonedo-nightly.spec index be33c2cddc..d850fa0598 100644 --- a/anda/system/xonedo/nightly/kmod-common/xonedo-nightly.spec +++ b/anda/system/xonedo/nightly/kmod-common/xonedo-nightly.spec @@ -12,7 +12,7 @@ Name: xonedo-nightly Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif @@ -47,7 +47,7 @@ Linux kernel driver for Xbox One and Xbox Series X|S accessories common files. C %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/system/xonedo/stable/akmod/xonedo-kmod.spec b/anda/system/xonedo/stable/akmod/xonedo-kmod.spec index d9afac3503..36d0950055 100644 --- a/anda/system/xonedo/stable/akmod/xonedo-kmod.spec +++ b/anda/system/xonedo/stable/akmod/xonedo-kmod.spec @@ -5,7 +5,7 @@ Name: %{modulename}-kmod Version: 0.5.7 -Release: 2%?dist +Release: 4%{?dist} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 2 %endif @@ -28,14 +28,14 @@ Obsoletes: %{name} < %{?epoch:%{epoch}:}0.3.4 %endif Packager: Kyle Gospodnetich -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description Linux kernel driver for Xbox One and Xbox Series X|S accessories. Compatible with the xpad kernel module. %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n %{modulename}-%{version}-ogc%{ogcversion} diff --git a/anda/system/xonedo/stable/dkms/dkms-xonedo.spec b/anda/system/xonedo/stable/dkms/dkms-xonedo.spec index 143b7a1cfc..f6da01c6e2 100644 --- a/anda/system/xonedo/stable/dkms/dkms-xonedo.spec +++ b/anda/system/xonedo/stable/dkms/dkms-xonedo.spec @@ -4,7 +4,7 @@ Name: dkms-%{modulename} Version: 0.5.7 -Release: 2%?dist +Release: 3%?dist %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 2 %endif diff --git a/anda/system/xonedo/stable/kmod-common/xonedo.spec b/anda/system/xonedo/stable/kmod-common/xonedo.spec index e61d202c68..e8ff0b001d 100644 --- a/anda/system/xonedo/stable/kmod-common/xonedo.spec +++ b/anda/system/xonedo/stable/kmod-common/xonedo.spec @@ -7,7 +7,7 @@ Name: xonedo Version: 0.5.7 -Release: 2%?dist +Release: 3%?dist %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 2 %endif @@ -47,7 +47,7 @@ Linux kernel driver for Xbox One and Xbox Series X|S accessories common files. %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 0dde070c72..fff0b2ab46 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -10,7 +10,7 @@ This is the original upstream xpad driver from the Linux kernel with support for Name: %{modulename}-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 4%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed URL: https://github.com/medusalix/xpad-noone @@ -28,14 +28,14 @@ Requires: akmods Conflicts: dkms-%{modulename} Packager: Gilver E. -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description %_description %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -n %{modulename}-%{commit} -p1 diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index a2ca1bb2c5..97716c4969 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -8,7 +8,7 @@ This is the original upstream xpad driver from the Linux kernel with support for Name: dkms-%{modulename} Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed URL: https://github.com/medusalix/xpad-noone diff --git a/anda/system/xpad-noone/kmod-common/xpad-noone.spec b/anda/system/xpad-noone/kmod-common/xpad-noone.spec index ad694dc998..04847a5d12 100644 --- a/anda/system/xpad-noone/kmod-common/xpad-noone.spec +++ b/anda/system/xpad-noone/kmod-common/xpad-noone.spec @@ -7,7 +7,7 @@ This is the original upstream xpad driver from the Linux kernel with support for Name: xpad-noone Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed URL: https://github.com/medusalix/xpad-noone @@ -25,7 +25,7 @@ Packager: Gilver E. %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai deleted file mode 100644 index b7de501f56..0000000000 --- a/anda/system/xpadneo/akmod/update.rhai +++ /dev/null @@ -1,13 +0,0 @@ -let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; -c.pop(); -rpm.global("commit", c); -if rpm.changed() { - rpm.release(); - let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; - d.pop(); - rpm.global("commitdate", d); - let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; - v.pop(); - rpm.global("ver", v); -} - diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai deleted file mode 100644 index b7de501f56..0000000000 --- a/anda/system/xpadneo/dkms/update.rhai +++ /dev/null @@ -1,13 +0,0 @@ -let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; -c.pop(); -rpm.global("commit", c); -if rpm.changed() { - rpm.release(); - let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; - d.pop(); - rpm.global("commitdate", d); - let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; - v.pop(); - rpm.global("ver", v); -} - diff --git a/anda/system/xpadneo/kmod-common/io.github.xpadneo.metainfo.xml b/anda/system/xpadneo/kmod-common/io.github.xpadneo.metainfo.xml deleted file mode 100644 index f11f630d07..0000000000 --- a/anda/system/xpadneo/kmod-common/io.github.xpadneo.metainfo.xml +++ /dev/null @@ -1,26 +0,0 @@ - - io.github.xpadneo - xpadneo - xpadneo - Advanced Linux Driver for Xbox One Wireless Controller (shipped with Xbox One S) - -

- Wireless Drivers for the Xbox One and Series S|X controllers. - - Across all models, xpadneo won't support audio features of the controllers because the firmware doesn't support audio in Bluetooth mode. In the future, xpadneo may support audio when USB and dongle support will be added. -

- - https://atar-axis.github.io/xpadneo/ - CC0-1.0 - - GPL-3.0 - - - Florian Dollinger - - - - - usb:v045Ep02FDd0008dc00dsc00dp00ic03isc00ip00in00 - - \ No newline at end of file diff --git a/anda/system/xpadneo/kmod-common/xpadneo.spec b/anda/system/xpadneo/kmod-common/xpadneo.spec deleted file mode 100644 index 8f8253396d..0000000000 --- a/anda/system/xpadneo/kmod-common/xpadneo.spec +++ /dev/null @@ -1,63 +0,0 @@ -%global commit 93621f104dfe6a1690cf72f0f4fd074a0a86acce -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20260325 -%global ver 0.10.1 - -Name: xpadneo -Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} -Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files -License: GPL-3.0 -URL: https://atar-axis.github.io/%{name} -Source0: https://github.com/atar-axis/%{name}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz -Source1: io.github.%{name}.metainfo.xml -BuildRequires: sed -BuildRequires: systemd-rpm-macros -Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} -Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} -Obsoletes: %{name}-kmod-common < %{?epoch:%{epoch}:}0.9.7^20241224git.8d20a23-5%{?dist} -BuildArch: noarch -Packager: Gilver E. - -%description -Advanced Linux Driver for Xbox One Wireless Gamepad common files. - -%package akmod-modules -Summary: Modules for Akmods -Requires: akmod-%{name} -BuildArch: noarch - -%description akmod-modules -Akmods modules for the akmod-%{name} package. - -%prep -%autosetup -p1 -n %{name}-%{commit} -/usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' hid-%{name}/dkms.conf.in > %{name}.conf - -%install -# Aliases: -install -Dpm644 hid-%{name}/etc-modprobe.d/%{name}.conf -t %{buildroot}%{_modprobedir} - -# UDev rules: -install -Dpm644 hid-%{name}/etc-udev-rules.d/*.rules -t %{buildroot}%{_udevrulesdir}/ - -# Metadata -install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/io.github.%{name}.metainfo.xml - -# Akmods modules -install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir} - -%files -%license LICENSE.md LICENSES -%doc docs/*.md -%{_modprobedir}/%{name}.conf -%{_udevrulesdir}/60-%{name}.rules -%{_udevrulesdir}/70-%{name}-disable-hidraw.rules -%{_datadir}/metainfo/io.github.%{name}.metainfo.xml - -%files akmod-modules -%{_modulesloaddir}/%{name}.conf - -%changelog -* Fri Mar 07 2025 Gilver E. -- Package refactoring diff --git a/anda/system/xpadneo/nightly/akmod/anda.hcl b/anda/system/xpadneo/nightly/akmod/anda.hcl new file mode 100644 index 0000000000..f1d6f092a5 --- /dev/null +++ b/anda/system/xpadneo/nightly/akmod/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "xpadneo-nightly-kmod.spec" + } + labels { + mock = 1 + updbranch = 1 + } +} diff --git a/anda/system/xpadneo/nightly/akmod/update.rhai b/anda/system/xpadneo/nightly/akmod/update.rhai new file mode 100644 index 0000000000..2054b27a42 --- /dev/null +++ b/anda/system/xpadneo/nightly/akmod/update.rhai @@ -0,0 +1,13 @@ +let c = sh("cat anda/system/xpadneo/nightly/kmod-common/xpadneo-nightly.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/xpadneo/nightly/kmod-common/xpadneo-nightly.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commitdate", d); + let v = sh("cat anda/system/xpadneo/nightly/kmod-common/xpadneo-nightly.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} + diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/nightly/akmod/xpadneo-nightly-kmod.spec similarity index 62% rename from anda/system/xpadneo/akmod/xpadneo-kmod.spec rename to anda/system/xpadneo/nightly/akmod/xpadneo-nightly-kmod.spec index fb2e41390e..7e787406ae 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/nightly/akmod/xpadneo-nightly-kmod.spec @@ -1,16 +1,16 @@ -%global commit 93621f104dfe6a1690cf72f0f4fd074a0a86acce +%global commit 45f39820edc2c3fc5605bfe4daea471263678ed1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20260325 -%global ver 0.10.1 +%global commitdate 20260411 +%global ver 0.10.2 %define buildforkernels akmod %global debug_package %{nil} %global modulename xpadneo -Name: %{modulename}-kmod -Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Name: %{modulename}-nightly-kmod +Version: %{ver}^%{commitdate}git%{shortcommit} +Release: 1%{?dist} Summary: Advanced Linux Driver for Xbox One Wireless Gamepad -License: GPL-3.0 +License: GPL-2.0-only AND GPL-3.0-or-later URL: https://atar-axis.github.io/xpadneo Source0: https://github.com/atar-axis/xpadneo/archive/%{commit}.tar.gz#/xpadneo-%{shortcommit}.tar.gz BuildRequires: kmodtool @@ -18,20 +18,19 @@ BuildRequires: systemd-rpm-macros Requires: akmods Requires: bluez Requires: bluez-tools -Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} -Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-nightly-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-nightly-akmod-modules = %{?epoch:%{epoch}:}%{version} Conflicts: dkms-%{modulename} -Provides: %{modulename}-kmod Packager: Gilver E. -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description Advanced Linux Driver for Xbox One Wireless Gamepad. %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n %{modulename}-%{commit} @@ -56,5 +55,7 @@ done %{?akmod_install} %changelog +* Sat Apr 11 2026 Gilver E. - 0.10.2^45f3982git20260411 +- Separated nightly builds into their own packages * Thu Feb 27 2025 Gilver E. - Package refactoring for alternative DKMS package compatibility diff --git a/anda/system/xpadneo/nightly/dkms/anda.hcl b/anda/system/xpadneo/nightly/dkms/anda.hcl new file mode 100644 index 0000000000..155d865ee6 --- /dev/null +++ b/anda/system/xpadneo/nightly/dkms/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "dkms-xpadneo-nightly.spec" + } + labels { + mock = 1 + updbranch = 1 + } +} diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/nightly/dkms/dkms-xpadneo-nightly.spec similarity index 75% rename from anda/system/xpadneo/dkms/dkms-xpadneo.spec rename to anda/system/xpadneo/nightly/dkms/dkms-xpadneo-nightly.spec index 57520c957d..47442280ab 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/nightly/dkms/dkms-xpadneo-nightly.spec @@ -1,26 +1,24 @@ -%global commit 93621f104dfe6a1690cf72f0f4fd074a0a86acce +%global commit 45f39820edc2c3fc5605bfe4daea471263678ed1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20260325 -%global ver 0.10.1 -%global debug_package %{nil} +%global commitdate 20260411 +%global ver 0.10.2 %global modulename xpadneo -Name: dkms-%{modulename} -Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Name: dkms-%{modulename}-nightly +Version: %{ver}^%{commitdate}git%{shortcommit} +Release: 1%{?dist} Summary: Advanced Linux Driver for Xbox One Wireless Gamepad -License: GPL-3.0 +License: GPL-2.0-only AND GPL-3.0-or-later URL: https://atar-axis.github.io/%{modulename} Source0: https://github.com/atar-axis/%{modulename}/archive/%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz -Source1: %{name}.conf +Source1: dkms-%{modulename}.conf Source2: no-weak-modules.conf BuildRequires: sed Requires: bluez Requires: bluez-tools -Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version} Requires: dkms Conflicts: akmod-%{modulename} -Provides: %{modulename}-kmod BuildArch: noarch Packager: Gilver E. @@ -43,7 +41,7 @@ sed -i -e 's/$(VERSION)/v%{version}/g' hid-xpadneo/src/Makefile mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ cp -fr hid-xpadneo/src/* %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ -%if 0%{?fedora} +%if %{defined fedora} # Do not enable weak modules support in Fedora (no kABI): install -Dpm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf %endif @@ -60,10 +58,12 @@ dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : %files %{_usrsrc}/%{modulename}-%{version} -%if 0%{?fedora} +%if %{defined fedora} %{_sysconfdir}/dkms/%{modulename}.conf %endif %changelog +* Sat Apr 11 2026 Gilver E. - 0.10.2^45f3982git20260411 +- Separated nightly builds into their own packages * Thu Feb 27 2025 Gilver E. - Initial package diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.conf b/anda/system/xpadneo/nightly/dkms/dkms-xpadneo.conf similarity index 100% rename from anda/system/xpadneo/dkms/dkms-xpadneo.conf rename to anda/system/xpadneo/nightly/dkms/dkms-xpadneo.conf diff --git a/anda/system/xpadneo/dkms/no-weak-modules.conf b/anda/system/xpadneo/nightly/dkms/no-weak-modules.conf similarity index 100% rename from anda/system/xpadneo/dkms/no-weak-modules.conf rename to anda/system/xpadneo/nightly/dkms/no-weak-modules.conf diff --git a/anda/system/xpadneo/nightly/dkms/update.rhai b/anda/system/xpadneo/nightly/dkms/update.rhai new file mode 100644 index 0000000000..2054b27a42 --- /dev/null +++ b/anda/system/xpadneo/nightly/dkms/update.rhai @@ -0,0 +1,13 @@ +let c = sh("cat anda/system/xpadneo/nightly/kmod-common/xpadneo-nightly.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/xpadneo/nightly/kmod-common/xpadneo-nightly.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commitdate", d); + let v = sh("cat anda/system/xpadneo/nightly/kmod-common/xpadneo-nightly.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} + diff --git a/anda/system/xpadneo/nightly/kmod-common/anda.hcl b/anda/system/xpadneo/nightly/kmod-common/anda.hcl new file mode 100644 index 0000000000..a0ac3dafaf --- /dev/null +++ b/anda/system/xpadneo/nightly/kmod-common/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "xpadneo-nightly.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/system/xpadneo/kmod-common/update.rhai b/anda/system/xpadneo/nightly/kmod-common/update.rhai similarity index 100% rename from anda/system/xpadneo/kmod-common/update.rhai rename to anda/system/xpadneo/nightly/kmod-common/update.rhai diff --git a/anda/system/xpadneo/nightly/kmod-common/xpadneo-nightly.spec b/anda/system/xpadneo/nightly/kmod-common/xpadneo-nightly.spec new file mode 100644 index 0000000000..599c569fc1 --- /dev/null +++ b/anda/system/xpadneo/nightly/kmod-common/xpadneo-nightly.spec @@ -0,0 +1,60 @@ +%global commit 45f39820edc2c3fc5605bfe4daea471263678ed1 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20260411 +%global ver 0.10.2 +%global appid io.github.atar_axis.xpadneo + +Name: xpadneo-nightly +Version: %{ver}^%{commitdate}git%{shortcommit} +Release: 3%{?dist} +Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files +License: GPL-2.0-only AND GPL-3.0-or-later +URL: https://atar-axis.github.io/xpadneo +Source0: https://github.com/atar-axis/xpadneo/archive/%{commit}.tar.gz#/xpadneo-%{shortcommit}.tar.gz +BuildRequires: make +BuildRequires: sed +BuildRequires: systemd-rpm-macros +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Obsoletes: %{name}-kmod-common < %{?epoch:%{epoch}:}0.9.7^20241224git.8d20a23-5%{?dist} +BuildArch: noarch +Packager: Gilver E. + +%description +Advanced Linux Driver for Xbox One Wireless Gamepad common files. + +%package akmod-modules +Summary: Modules for Akmods +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} +BuildArch: noarch + +%description akmod-modules +Akmods modules for the akmod-%{name} package. + +%prep +%autosetup -p1 -n xpadneo-%{commit} +/usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' hid-xpadneo/dkms.conf.in > xpadneo.conf + +%install +%{__make} install-all PREFIX="%{buildroot}" ETC_PREFIX="%{_prefix}/lib" VERSION="%{version}" + +# Akmods modules +install -Dm644 xpadneo.conf -t %{buildroot}%{_modulesloaddir} + +%files +%license LICENSE.md +# Let RPM handle the docs +%doc %{_docdir}/xpadneo/* +%{_modprobedir}/xpadneo.conf +%{_udevrulesdir}/60-xpadneo.rules +%{_udevrulesdir}/70-xpadneo-disable-hidraw.rules +%{_metainfodir}/%{appid}.metainfo.xml + +%files akmod-modules +%{_modulesloaddir}/xpadneo.conf + +%changelog +* Sat Apr 11 2026 Gilver E. - 0.10.2^45f3982git20260411 +- Separated nightly builds into their own packages +* Fri Mar 07 2025 Gilver E. +- Package refactoring diff --git a/anda/system/xpadneo/akmod/anda.hcl b/anda/system/xpadneo/stable/akmod/anda.hcl similarity index 100% rename from anda/system/xpadneo/akmod/anda.hcl rename to anda/system/xpadneo/stable/akmod/anda.hcl diff --git a/anda/system/xpadneo/stable/akmod/update.rhai b/anda/system/xpadneo/stable/akmod/update.rhai new file mode 100644 index 0000000000..eb076f74aa --- /dev/null +++ b/anda/system/xpadneo/stable/akmod/update.rhai @@ -0,0 +1,3 @@ +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::madoguchi("xpadneo", labels.branch)); diff --git a/anda/system/xpadneo/stable/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/stable/akmod/xpadneo-kmod.spec new file mode 100644 index 0000000000..43068fa0bf --- /dev/null +++ b/anda/system/xpadneo/stable/akmod/xpadneo-kmod.spec @@ -0,0 +1,59 @@ +%define buildforkernels akmod +%global debug_package %{nil} +%global modulename xpadneo + +Name: %{modulename}-kmod +Version: 0.10.2 +Release: 1%{?dist} +%if 0%{?fedora} <= 45 +Epoch: 1 +%endif +Summary: Advanced Linux Driver for Xbox One Wireless Gamepad +License: GPL-2.0-only AND GPL-3.0-or-later +URL: https://atar-axis.github.io/xpadneo +Source0: https://github.com/atar-axis/xpadneo/archive/refs/tags/v%{version}.tar.gz +BuildRequires: kmodtool +BuildRequires: systemd-rpm-macros +Requires: akmods +Requires: bluez +Requires: bluez-tools +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} +Conflicts: dkms-%{modulename} +Provides: %{modulename}-kmod +Packager: Gilver E. + +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description +Advanced Linux Driver for Xbox One Wireless Gamepad. + +%prep +%{?kmodtool_check} +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%autosetup -p1 -n %{modulename}-%{version} + +for kernel_version in %{?kernel_versions}; do + mkdir _kmod_build_${kernel_version%%___*} + cp -fr hid-xpadneo/src/* _kmod_build_${kernel_version%%___*} +done + +%build +for kernel_version in %{?kernel_versions}; do + pushd _kmod_build_${kernel_version%%___*}/ + %make_build -C "${kernel_version##*___}" M=$(pwd) VERSION="v%{version}" modules + popd +done + +%install +for kernel_version in %{?kernel_versions}; do + mkdir -p %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + install -p -m 0755 _kmod_build_${kernel_version%%___*}/*.ko \ + %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ +done +%{?akmod_install} + +%changelog +* Sat Apr 11 2026 Gilver E. - 1:0.10.2-1 +- Initial stable package diff --git a/anda/system/xpadneo/dkms/anda.hcl b/anda/system/xpadneo/stable/dkms/anda.hcl similarity index 100% rename from anda/system/xpadneo/dkms/anda.hcl rename to anda/system/xpadneo/stable/dkms/anda.hcl diff --git a/anda/system/xpadneo/stable/dkms/dkms-xpadneo.conf b/anda/system/xpadneo/stable/dkms/dkms-xpadneo.conf new file mode 100644 index 0000000000..ecde0d0673 --- /dev/null +++ b/anda/system/xpadneo/stable/dkms/dkms-xpadneo.conf @@ -0,0 +1,6 @@ +PACKAGE_NAME="xpadneo" +PACKAGE_VERSION="__VERSION_STRING" +AUTOINSTALL="yes" + +BUILT_MODULE_NAME[0]="hid-xpadneo" +DEST_MODULE_LOCATION[0]="/extra" diff --git a/anda/system/xpadneo/stable/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/stable/dkms/dkms-xpadneo.spec new file mode 100644 index 0000000000..59c56849b9 --- /dev/null +++ b/anda/system/xpadneo/stable/dkms/dkms-xpadneo.spec @@ -0,0 +1,68 @@ +%global modulename xpadneo + +Name: dkms-%{modulename} +Version: 0.10.2 +Release: 1%{?dist} +%if 0%{?fedora} <= 45 +Epoch: 1 +%endif +Summary: Advanced Linux Driver for Xbox One Wireless Gamepad +License: GPL-2.0-only AND GPL-3.0-or-later +URL: https://atar-axis.github.io/%{modulename} +Source0: https://github.com/atar-axis/xpadneo/archive/refs/tags/v%{version}.tar.gz +Source1: %{name}.conf +Source2: no-weak-modules.conf +BuildRequires: sed +Provides: %{modulename}-kmod +Requires: bluez +Requires: bluez-tools +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: dkms +Conflicts: akmod-%{modulename} +Provides: %{modulename}-kmod +BuildArch: noarch +Packager: Gilver E. + +%description +Advanced Linux Driver for Xbox One Wireless Gamepad. + +%prep +%autosetup -p1 -n %{modulename}-%{version} + + +cp -f %{SOURCE1} hid-xpadneo/src/dkms.conf + +sed -i -e 's/__VERSION_STRING/%{version}/g' hid-xpadneo/src/dkms.conf +sed -i -e 's/$(VERSION)/v%{version}/g' hid-xpadneo/src/Makefile + +%build + +%install +# Create empty tree: +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ +cp -fr hid-xpadneo/src/* %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ + +%if %{defined fedora} +# Do not enable weak modules support in Fedora (no kABI): +install -Dpm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf +%endif + +%post +dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : +# Rebuild and make available for the currently running kernel: +dkms build -m %{modulename} -v %{version} -q || : +dkms install -m %{modulename} -v %{version} -q --force || : + +%preun +# Remove all versions from DKMS registry: +dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : + +%files +%{_usrsrc}/%{modulename}-%{version} +%if %{defined fedora} +%{_sysconfdir}/dkms/%{modulename}.conf +%endif + +%changelog +* Sat Apr 11 2026 Gilver E. - 1:0.10.2-1 +- Initial stable package diff --git a/anda/system/xpadneo/stable/dkms/no-weak-modules.conf b/anda/system/xpadneo/stable/dkms/no-weak-modules.conf new file mode 100644 index 0000000000..24f6f95c96 --- /dev/null +++ b/anda/system/xpadneo/stable/dkms/no-weak-modules.conf @@ -0,0 +1 @@ +NO_WEAK_MODULES="yes" diff --git a/anda/system/xpadneo/stable/dkms/update.rhai b/anda/system/xpadneo/stable/dkms/update.rhai new file mode 100644 index 0000000000..eb076f74aa --- /dev/null +++ b/anda/system/xpadneo/stable/dkms/update.rhai @@ -0,0 +1,3 @@ +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::madoguchi("xpadneo", labels.branch)); diff --git a/anda/system/xpadneo/kmod-common/anda.hcl b/anda/system/xpadneo/stable/kmod-common/anda.hcl similarity index 74% rename from anda/system/xpadneo/kmod-common/anda.hcl rename to anda/system/xpadneo/stable/kmod-common/anda.hcl index 9b58032693..91956479d9 100644 --- a/anda/system/xpadneo/kmod-common/anda.hcl +++ b/anda/system/xpadneo/stable/kmod-common/anda.hcl @@ -3,7 +3,4 @@ project pkg { rpm { spec = "xpadneo.spec" } - labels { - nightly = 1 - } } diff --git a/anda/system/xpadneo/stable/kmod-common/update.rhai b/anda/system/xpadneo/stable/kmod-common/update.rhai new file mode 100644 index 0000000000..0a63919e92 --- /dev/null +++ b/anda/system/xpadneo/stable/kmod-common/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("atar-axis/xpadneo")); diff --git a/anda/system/xpadneo/stable/kmod-common/xpadneo.spec b/anda/system/xpadneo/stable/kmod-common/xpadneo.spec new file mode 100644 index 0000000000..4ae97912e3 --- /dev/null +++ b/anda/system/xpadneo/stable/kmod-common/xpadneo.spec @@ -0,0 +1,57 @@ +%global appid io.github.atar_axis.xpadneo + +Name: xpadneo +Version: 0.10.2 +Release: 1%{?dist} +%if 0%{?fedora} <= 45 +Epoch: 1 +%endif +Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files +License: GPL-2.0-only AND GPL-3.0-or-later +URL: https://atar-axis.github.io/%{name} +Source0: https://github.com/atar-axis/xpadneo/archive/refs/tags/v%{version}.tar.gz +BuildRequires: make +BuildRequires: sed +BuildRequires: systemd-rpm-macros +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Obsoletes: %{name}-kmod-common < %{?epoch:%{epoch}:}0.9.7^20241224git.8d20a23-5%{?dist} +BuildArch: noarch +Packager: Gilver E. + +%description +Advanced Linux Driver for Xbox One Wireless Gamepad common files. + +%package akmod-modules +Summary: Modules for Akmods +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} +BuildArch: noarch + +%description akmod-modules +Akmods modules for the akmod-%{name} package. + +%prep +%autosetup -p1 -n %{name}-%{version} +%{__sed} -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' hid-%{name}/dkms.conf.in > %{name}.conf + +%install +%{__make} install-all PREFIX="%{buildroot}" ETC_PREFIX="%{_prefix}/lib" VERSION="%{version}" + +# Akmods modules +install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir} + +%files +%license LICENSE.md +# Let RPM handle the docs +%doc %{_docdir}/%{name}/* +%{_modprobedir}/%{name}.conf +%{_udevrulesdir}/60-%{name}.rules +%{_udevrulesdir}/70-%{name}-disable-hidraw.rules +%{_metainfodir}/%{appid}.metainfo.xml + +%files akmod-modules +%{_modulesloaddir}/%{name}.conf + +%changelog +* Sat Apr 11 2026 Gilver E. - 1:0.10.2-1 +- Initial stable package diff --git a/anda/system/zenergy/akmod/zenergy-kmod.spec b/anda/system/zenergy/akmod/zenergy-kmod.spec index e758069581..49d828ac25 100644 --- a/anda/system/zenergy/akmod/zenergy-kmod.spec +++ b/anda/system/zenergy/akmod/zenergy-kmod.spec @@ -14,7 +14,7 @@ Name: %{modulename}-kmod Version: 1.0^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 4%{?dist} Summary: Exposes the energy counters that are reported via the Running Average Power Limit (RAPL) Model-specific Registers (MSRs) via the hardware monitor (HWMON) sysfs interface. License: GPL-2.0 URL: https://github.com/BoukeHaarsma23/zenergy @@ -33,7 +33,7 @@ Requires: kernel-devel Conflicts: dkms-%{modulename} Packager: Cappy Ishihara -%{expand:%(kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description Based on AMD_ENERGY driver, but with some jiffies added so non-root users can read it safely. @@ -45,7 +45,7 @@ via the hardware monitor (HWMON) sysfs interface. %{?kmodtool_check} # print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -q -c -n %{modulename}-%{commit} diff --git a/anda/system/zenergy/dkms/dkms-zenergy.spec b/anda/system/zenergy/dkms/dkms-zenergy.spec index 5cd471263d..945eb78933 100644 --- a/anda/system/zenergy/dkms/dkms-zenergy.spec +++ b/anda/system/zenergy/dkms/dkms-zenergy.spec @@ -6,7 +6,7 @@ Name: dkms-%{modulename} Version: 1.0^%{commitdate}git.%{shortcommit} -Release: 2%?dist +Release: 3%?dist Summary: Exposes the energy counters that are reported via the Running Average Power Limit (RAPL) Model-specific Registers (MSRs) via the hardware monitor (HWMON) sysfs interface. License: GPL-2.0 URL: https://github.com/BoukeHaarsma23/zenergy diff --git a/anda/system/zenergy/kmod-common/zenergy.spec b/anda/system/zenergy/kmod-common/zenergy.spec index 2f46a273ee..380a305067 100644 --- a/anda/system/zenergy/kmod-common/zenergy.spec +++ b/anda/system/zenergy/kmod-common/zenergy.spec @@ -4,7 +4,7 @@ Name: zenergy Version: 1.0^%{commitdate}git.%{shortcommit} -Release: 2%?dist +Release: 3%?dist Summary: Exposes the energy counters that are reported via the Running Average Power Limit (RAPL) Model-specific Registers (MSRs) via the hardware monitor (HWMON) sysfs interface. License: GPL-2.0 URL: https://github.com/BoukeHaarsma23/zenergy @@ -25,7 +25,7 @@ via the hardware monitor (HWMON) sysfs interface. %package akmod-modules Summary: Modules for Akmods -Requires: akmod-%{name} +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} BuildArch: noarch %description akmod-modules diff --git a/anda/terra/gpg-keys/terra-gpg-keys.spec b/anda/terra/gpg-keys/terra-gpg-keys.spec index 66e2773f48..98de662440 100644 --- a/anda/terra/gpg-keys/terra-gpg-keys.spec +++ b/anda/terra/gpg-keys/terra-gpg-keys.spec @@ -2,12 +2,12 @@ Name: terra-gpg-keys Version: %{?fedora:%{fedora}}%{?rhel:%{rhel}} -Release: 2%?dist +Release: 4%{?dist} Summary: GPG keys for Terra Requires: filesystem >= 3.18-6 License: MIT -URL: https://terra.fyralabs.com +URL: https://terrapkg.com # We aren't pulling keys from the origin URLs, since they shouldn't change and this is easier to audit. Source0: RPM-GPG-KEY-terrarawhide Source1: RPM-GPG-KEY-terrarawhide-extras diff --git a/anda/terra/release/terra-release.spec b/anda/terra/release/terra-release.spec index 035e8bd6da..f7cc32f49f 100644 --- a/anda/terra/release/terra-release.spec +++ b/anda/terra/release/terra-release.spec @@ -2,11 +2,11 @@ Name: terra-release Version: %{?fedora:%{fedora}}%{?rhel:%{rhel}} -Release: 2%?dist +Release: 4%{?dist} Summary: Release package for Terra License: MIT -URL: https://terra.fyralabs.com +URL: https://terrapkg.com Source0: terra.repo Source1: terra-extras.repo Source2: terra-nvidia.repo diff --git a/anda/themes/adwaita++-icons/adwaita++-icons.spec b/anda/themes/adwaita++-icons/adwaita++-icons.spec index 8e3ed22575..5b6a4c1cee 100644 --- a/anda/themes/adwaita++-icons/adwaita++-icons.spec +++ b/anda/themes/adwaita++-icons/adwaita++-icons.spec @@ -3,10 +3,10 @@ Name: adwaita++-icons Version: 6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME++, a third-party icons theme, based on new GNOME 3.32's Adwaita -License: GPL-3.0 and LGPL-3.0 and CC-BY-SA +License: GPL-3.0-or-later AND LGPL-3.0-or-later AND CC-BY-SA URL: https://github.com/Bonandry/adwaita-plus Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildArch: noarch diff --git a/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec b/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec index 8aca3f2f12..f100d25649 100644 --- a/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec +++ b/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec @@ -1,11 +1,10 @@ Name: bibata-cursor-theme Version: 2.0.7 -Release: 1%?dist +Release: 2%?dist URL: https://github.com/ful1e5/Bibata_Cursor Source0: %{url}/releases/download/v%{version}/Bibata.tar.xz Source1: https://raw.githubusercontent.com/ful1e5/Bibata_Cursor/v%{version}/README.md -Source2: https://raw.githubusercontent.com/ful1e5/Bibata_Cursor/v%{version}/LICENSE -License: GPL-3.0 +License: GPL-3.0-or-later Summary: Open source, compact, and material designed cursor set BuildArch: noarch BuildRequires: rpm_macro(fdupes) @@ -25,9 +24,8 @@ tar xf %{SOURCE0} %install mkdir -p %{buildroot}/%{_datadir}/icons/ mv Bibata-* %{buildroot}/%{_datadir}/icons/ -mkdir -p %{buildroot}/%{_datadir}/{doc,licenses}/%{name}/ +mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/ cp %{SOURCE1} %{buildroot}/%{_datadir}/doc/%{name}/README.md -cp %{SOURCE2} %{buildroot}/%{_datadir}/licenses/%{name}/LICENSE %fdupes %buildroot%_datadir/icons/ %files diff --git a/anda/themes/breeze-plus-icon-theme/breeze-plus-icon-theme.spec b/anda/themes/breeze-plus-icon-theme/breeze-plus-icon-theme.spec index f52a91ba76..46997847ee 100644 --- a/anda/themes/breeze-plus-icon-theme/breeze-plus-icon-theme.spec +++ b/anda/themes/breeze-plus-icon-theme/breeze-plus-icon-theme.spec @@ -1,10 +1,10 @@ Name: breeze-plus-icon-theme Version: 6.19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Breeze icon theme with additional icons Packager: Amy King -License: LGPL-2.1-only +License: LGPL-2.1-or-later URL: https://github.com/mjkim0727/breeze-plus Source0: %{url}/archive/refs/tags/%{version}.tar.gz BuildArch: noarch diff --git a/anda/themes/fluent-icon-theme/fluent-icon-theme.spec b/anda/themes/fluent-icon-theme/fluent-icon-theme.spec index 67f001d78a..a972b7b875 100644 --- a/anda/themes/fluent-icon-theme/fluent-icon-theme.spec +++ b/anda/themes/fluent-icon-theme/fluent-icon-theme.spec @@ -2,10 +2,10 @@ Name: fluent-icon-theme Version: 20250821 -Release: 3%?dist +Release: 4%?dist Summary: Fluent icon theme for linux desktops -License: GPL-3.0 +License: GPL-3.0-or-later URL: https://github.com/vinceliuice/Fluent-icon-theme/ Source0: %url/archive/refs/tags/%tag.tar.gz diff --git a/anda/themes/fluent-theme/fluent-theme.spec b/anda/themes/fluent-theme/fluent-theme.spec index e42cd8bf72..dde09baa54 100644 --- a/anda/themes/fluent-theme/fluent-theme.spec +++ b/anda/themes/fluent-theme/fluent-theme.spec @@ -2,10 +2,10 @@ Name: fluent-theme Version: 20250417 -Release: 1%?dist +Release: 2%?dist Summary: Fluent design theme for GNOME/GTK based desktop environments -License: GPL-3.0 +License: GPL-3.0-or-later URL: https://github.com/vinceliuice/Fluent-gtk-theme Source0: https://github.com/vinceliuice/Fluent-gtk-theme/archive/refs/tags/%{tag}.tar.gz diff --git a/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec b/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec index b295bf9866..f7586f04c7 100644 --- a/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec +++ b/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec @@ -1,12 +1,12 @@ Name: google-black-cursor-theme Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/ful1e5/Google_Cursor Source0: %{url}/releases/download/v%{version}/GoogleDot-Black.tar.gz Source1: https://raw.githubusercontent.com/ful1e5/Google_Cursor/v%{version}/README.md Source2: https://raw.githubusercontent.com/ful1e5/Google_Cursor/v%{version}/LICENSE -License: GPL-3.0 -Summary: An opensource cursor theme inspired by Google. +License: GPL-3.0-or-later +Summary: An opensource cursor theme inspired by Google. BuildArch: noarch BuildRequires: rpm_macro(fdupes) diff --git a/anda/themes/helium-gtk-theme/helium-gtk-theme.spec b/anda/themes/helium-gtk-theme/helium-gtk-theme.spec index 3e76761839..3894bf81d6 100644 --- a/anda/themes/helium-gtk-theme/helium-gtk-theme.spec +++ b/anda/themes/helium-gtk-theme/helium-gtk-theme.spec @@ -3,8 +3,8 @@ Summary: tauOS GTK/GNOME Shell Themes Name: helium-gtk-theme Version: %(echo %ver | sed 's/-/./g') -Release: 2%{?dist} -License: GPL-3.0 +Release: 3%{?dist} +License: GPL-3.0-or-later URL: https://github.com/tau-OS/tau-helium Source0: https://github.com/tau-OS/tau-helium/archive/refs/tags/%{ver}.tar.gz BuildArch: noarch diff --git a/anda/themes/hydrogen-icon-theme/hydrogen-icon-theme.spec b/anda/themes/hydrogen-icon-theme/hydrogen-icon-theme.spec index f7ba7faa06..744f30b98e 100644 --- a/anda/themes/hydrogen-icon-theme/hydrogen-icon-theme.spec +++ b/anda/themes/hydrogen-icon-theme/hydrogen-icon-theme.spec @@ -1,8 +1,8 @@ Summary: tauOS Icon Theme Name: hydrogen-icon-theme Version: 1.0.16 -Release: 2%?dist -License: GPL-3.0 +Release: 3%?dist +License: GPL-3.0-or-later URL: https://github.com/tau-OS/tau-hydrogen Source0: https://github.com/tau-OS/tau-hydrogen/archive/refs/tags/%{version}.tar.gz BuildArch: noarch diff --git a/anda/themes/klassy/klassy.spec b/anda/themes/klassy/klassy.spec index eca50ab33a..64d5ebc191 100644 --- a/anda/themes/klassy/klassy.spec +++ b/anda/themes/klassy/klassy.spec @@ -12,13 +12,13 @@ License: GPL-2.0-or-later Group: System/GUI/KDE URL: %{forgeurl} Source: %{forgesource} -Patch0: https://github.com/paulmcauley/klassy/pull/178.patch Obsoletes: classikstyles <= %{version} Obsoletes: classik <= %{version} BuildRequires: cmake >= 3.16 BuildRequires: extra-cmake-modules >= 5.102.0 +BuildRequires: gettext BuildRequires: kf5-rpm-macros BuildRequires: kf5-filesystem @@ -80,13 +80,29 @@ Klassy (formerly ClassiK/ClassikStyles) is a highly customizable binary Window D %forgeautosetup -p1 %build -%cmake +mkdir -p qt6-build +pushd qt6-build +%cmake_kf6 -S .. -DBUILD_QT6=ON -DBUILD_QT5=OFF %cmake_build +popd +mkdir -p qt5-build +pushd qt5-build +%cmake_kf5 -S .. -DBUILD_QT6=OFF -DBUILD_QT5=ON +%cmake_build +popd %install +pushd qt5-build %cmake_install +popd +pushd qt6-build +%cmake_install +popd -%files +%find_lang %{name}_style_config +%find_lang %{name}_kwin_deco + +%files -f %{name}_style_config.lang -f %{name}_kwin_deco.lang %license LICENSES/*.txt %{_bindir}/%{name}-settings @@ -102,18 +118,19 @@ Klassy (formerly ClassiK/ClassikStyles) is a highly customizable binary Window D %{_kf6_qtplugindir}/kstyle_config/klassystyleconfig.so %{_kf6_qtplugindir}/org.kde.kdecoration3/org.kde.klassy.so %{_kf6_qtplugindir}/org.kde.kdecoration3.kcm/kcm_klassydecoration.so -%{_kf6_qtplugindir}/org.kde.kdecoration2.kcm/klassydecoration/presets/* +%{_kf6_qtplugindir}/org.kde.kdecoration3.kcm/klassydecoration/presets/* %{_kf6_datadir}/applications/kcm_klassydecoration.desktop %{_kf6_datadir}/applications/klassystyleconfig.desktop %{_kf6_datadir}/applications/klassy-settings.desktop %{_kf6_datadir}/color-schemes/Klassy*.colors +%{_kf6_datadir}/color-schemes/OpalFruits*.colors %{_datadir}/icons/hicolor/ %{_datadir}/icons/%{name}/ %{_datadir}/icons/%{name}-dark/ -%{_datadir}/plasma/desktoptheme/%{name}/ +%{_datadir}/plasma/desktoptheme/kite-*/ %{_kf6_datadir}/kstyle/themes/%{name}.themerc @@ -122,4 +139,3 @@ Klassy (formerly ClassiK/ClassikStyles) is a highly customizable binary Window D %changelog %autochangelog - diff --git a/anda/themes/unity-asset-pool/unity-asset-pool.spec b/anda/themes/unity-asset-pool/unity-asset-pool.spec index 068c52a4fc..4555a7684f 100644 --- a/anda/themes/unity-asset-pool/unity-asset-pool.spec +++ b/anda/themes/unity-asset-pool/unity-asset-pool.spec @@ -3,7 +3,7 @@ Name: unity-asset-pool Summary: Assets and icons for Unity Version: 0.8.24 -Release: %autorelease +Release: 1%?dist License: CC-BY-SA URL: https://launchpad.net/unity-asset-pool diff --git a/anda/tools/buildsys/gradle/anda.hcl b/anda/tools/buildsys/gradle/anda.hcl index da5869ef05..81e72434b7 100644 --- a/anda/tools/buildsys/gradle/anda.hcl +++ b/anda/tools/buildsys/gradle/anda.hcl @@ -2,6 +2,6 @@ project pkg { arches = ["x86_64"] rpm { spec = "gradle.spec" - extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/\\$releasever/\\$basearch"] + extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/rawhide/\\$basearch"] } } diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 0d066f75be..514b221d96 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2026.4.6 +Version: 2026.4.10 Release: 1%{?dist} Summary: Front-end to your dev env diff --git a/anda/tools/gf/gf.spec b/anda/tools/gf/gf.spec index 6df006f1df..e47e701fb8 100644 --- a/anda/tools/gf/gf.spec +++ b/anda/tools/gf/gf.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/nakst/gf -%global commit 9a5dbcc90dc9ca9580f6ce2854cd67e2e507b0c1 +%global commit 93066aae8d7328c41f0da9985c680691fafa3fab %global shortcommit %{sub %{commit} 0 7} %global commitdate 20251231 diff --git a/anda/tools/modern-colorthief/modern-colorthief.spec b/anda/tools/modern-colorthief/modern-colorthief.spec index 21680475c8..888d214e96 100644 --- a/anda/tools/modern-colorthief/modern-colorthief.spec +++ b/anda/tools/modern-colorthief/modern-colorthief.spec @@ -1,11 +1,10 @@ %global pypi_name modern_colorthief %bcond bootstrap 0 %bcond docs %{without bootstrap} -%bcond test %{without bootstrap} # The srcrpm is not prefixed with Python because the source is mostly Rust Name: modern-colorthief -Version: 0.1.13 +Version: 0.2.0 Release: 1%{?dist} Summary: ColorThief reimagined SourceLicense: MIT @@ -27,15 +26,6 @@ BuildRequires: python3dist(myst-parser) BuildRequires: python3dist(shibuya) BuildRequires: python3dist(sphinx) %endif -%if %{with test} -%if 0%{?fedora} > 40 -BuildRequires: poetry -BuildRequires: python3dist(poetry) -%endif -BuildRequires: python3dist(colorthief) -BuildRequires: python3dist(fast-colorthief) -BuildRequires: python3dist(pytest) -%endif %description Colorthief but with modern code. @@ -78,25 +68,13 @@ done %{cargo_license_online} > LICENSE.dependencies -%if %{with test} -%check -# Poetry doesn't exist on EL and is too old on 40 -%if 0%{?fedora} <= 40 || 0%{?rhel} -%pytest tests/*.py -%else -# This is in the wrong spot in pyproject.toml and Poetry hates it -# May seem like defeating the purpose of testing but the other tests can be useful -sed -iE 's/python = ">=3.9,<3.14"//' pyproject.toml -poetry run pytest -%endif -%endif - %files -n python3-%{name} %doc DIFFERENCES.md %doc PKG-INFO %doc README.md %license LICENSE %license LICENSE.dependencies +%{_bindir}/%{name} %{python3_sitearch}/%{pypi_name} %{python3_sitearch}/%{pypi_name}-%{version}.dist-info/ diff --git a/anda/tools/natscli/natscli.spec b/anda/tools/natscli/natscli.spec index bc294f7589..d72cf0c959 100644 --- a/anda/tools/natscli/natscli.spec +++ b/anda/tools/natscli/natscli.spec @@ -1,7 +1,7 @@ # https://github.com/nats-io/natscli %global goipath github.com/nats-io/natscli -%global commit f569f8fe82118ffb65b480bb9f8ff7363f7adbbf -%global commit_date 20260404 +%global commit c40ebb5d7dac8756efa3651df05f7a8cbce370c8 +%global commit_date 20260409 %global shortcommit %{sub %{commit} 1 7} %gometa -f diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index a6669f2e97..10389f64da 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 0504cf3ba3eb31fd00ae8df4358b48d700ffcd16 -%global commit_date 20260326 +%global commit d74d6da1c20a300e5fec7827fe75b5d1b2a337ff +%global commit_date 20260411 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: rpi-utils diff --git a/anda/tools/surge/surge.spec b/anda/tools/surge/surge.spec index 91eff276f0..53baf10dab 100644 --- a/anda/tools/surge/surge.spec +++ b/anda/tools/surge/surge.spec @@ -1,5 +1,5 @@ %global goipath github.com/surge-downloader/surge -Version: 0.7.8 +Version: 0.8.0 %gometa diff --git a/anda/tools/topgrade/rust-topgrade.spec b/anda/tools/topgrade/rust-topgrade.spec index d6d1d20cea..61e1501a5e 100644 --- a/anda/tools/topgrade/rust-topgrade.spec +++ b/anda/tools/topgrade/rust-topgrade.spec @@ -3,7 +3,7 @@ Name: rust-topgrade # renovate: datasource=github-releases depName=topgrade-rs/topgrade -Version: 17.2.1 +Version: 17.3.0 Release: 1%{?dist} Summary: Upgrade all the things diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index b43545c229..f1cbac1b1b 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2026.04.07.233243 +Version: 2026.04.10.234907 Release: 1%{?dist} Summary: A command-line program to download videos from online video platforms