diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 5e093a5c84..1354135239 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.346 +Version: 0.0.376 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 52c08be830..ce0a3c5604 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.346 +Version: 0.0.376 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 2a967802f1..d05e06bc19 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.82 +Version: 0.0.81 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 bb9561d311..c6b0e8812f 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.82 +Version: 0.0.81 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index a70281ecd9..e0ac0e9892 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,7 +1,7 @@ -%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70 +%global commit ec447fd4a266e8158519f5e89589c368211bfa14 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240325 -%global ver v0.37.0 +%global commit_date 20240502 +%global ver v0.38.0 Name: mpv-nightly Version: %ver^%commit_date.%shortcommit diff --git a/anda/fonts/seto/seto-fonts.spec b/anda/fonts/seto/seto-fonts.spec index 3365601eeb..8f4f33653d 100644 --- a/anda/fonts/seto/seto-fonts.spec +++ b/anda/fonts/seto/seto-fonts.spec @@ -1,11 +1,10 @@ Name: seto-fonts Version: 6.20 -Release: 2%?dist +Release: 3%?dist URL: https://setofont.osdn.jp/ -Source0: https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip +Source0: https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz License: OFL-1.1 Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji -BuildRequires: unzip BuildArch: noarch @@ -14,7 +13,7 @@ BuildArch: noarch %prep -%setup -q -n setofont +%setup -q -n pkg-seto-fonts-%version %build @@ -25,11 +24,8 @@ install -Dm644 *.ttf %buildroot/%_datadir/fonts/%name/ %files %doc readme.txt +%license LICENSE.md %_datadir/fonts/%name/ %changelog -* Sun Jun 18 2023 windowsboy111 - 6.20-2 -- Fix install dir. - -* Tue Nov 22 2022 windowsboy111 - 6.20-1 -- Initial package +%autochangelog diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 110eaa7844..02ff23b5c3 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,13 +1,13 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit df0280f52b68f4352d8da711136609c16ce4db7b +%global commit bfac12604e9cd0884987ca89f34a455cf16c543c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 %global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 -%global commit_date 20240325 +%global commit_date 20240501 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/crystal/crystal/crystal.spec b/anda/langs/crystal/crystal/crystal.spec index e0eb21669c..8c39e1d934 100644 --- a/anda/langs/crystal/crystal/crystal.spec +++ b/anda/langs/crystal/crystal/crystal.spec @@ -1,8 +1,8 @@ %define debug_package %nil Name: crystal -Version: 1.11.2 -Release: 1%{?dist} +Version: 1.12.1 +Release: 1%?dist Summary: The Crystal Programming Language License: Apache-2.0 URL: https://crystal-lang.org/ diff --git a/anda/langs/crystal/crystal/update.rhai b/anda/langs/crystal/crystal/update.rhai index 8d53b0e749..06671bca2e 100644 --- a/anda/langs/crystal/crystal/update.rhai +++ b/anda/langs/crystal/crystal/update.rhai @@ -1,2 +1,2 @@ let html = get("https://crystal-lang.org/"); -rpm.version(find("Latest release <.+>(.+)", html, 1)) +rpm.version(find("Latest release: (.+?)", html, 1)) diff --git a/anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec b/anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec index e39b45b0fb..a7ecea5dcd 100644 --- a/anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec +++ b/anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec @@ -20,7 +20,7 @@ of information.} %global godocs README.md Name: %{goname} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Generate .desktop files and download .png icons License: BSD-3-Clause diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index ff7e2a1853..5b5eb0fce3 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,13 +1,13 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f +%global commit 185e06c92362083c06c76f87e325889b1c9dc659 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.1.1 -%global commit_date 20240322 +%global commit_date 20240502 %global debug_package %nil Name: nim-nightly Version: %ver^%commit_date.%shortcommit -Release: 2%?dist +Release: 1%?dist Summary: Imperative, multi-paradigm, compiled programming language License: MIT and BSD URL: https://nim-lang.org diff --git a/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch b/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch new file mode 100644 index 0000000000..5d61cce573 --- /dev/null +++ b/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch @@ -0,0 +1,25 @@ +From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001 +From: madomado +Date: Mon, 25 Mar 2024 18:33:25 +0800 +Subject: [PATCH] gix 0.61.1 -> 0.61.0 + +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index d98ba90..c3059c9 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -82,7 +82,7 @@ version = "1.0.4" + version = "0.4.3" + + [dependencies.gix] +-version = "0.61.1" ++version = "0.61.0" + features = [ + "max-performance-safe", + "revision", +-- +2.44.0 + diff --git a/anda/langs/rust/starship/rust-starship.spec b/anda/langs/rust/starship/rust-starship.spec index abf70a9f4e..01334ae26a 100644 --- a/anda/langs/rust/starship/rust-starship.spec +++ b/anda/langs/rust/starship/rust-starship.spec @@ -1,21 +1,20 @@ -%global debug_package %{nil} -# Generated by rust2rpm 24 -%bcond_without check +# Generated by rust2rpm 26 +#bcond_without check %global crate starship Name: rust-starship -Version: 1.18.1 -Release: 1%?dist +Version: 1.18.2 +Release: 2%?dist Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️ License: ISC URL: https://crates.io/crates/starship Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies -Patch: starship-fix-metadata-auto.diff +# Automatically generated patch to strip dependencies and normalize metadata +Patch0: starship-fix-metadata-auto.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 BuildRequires: anda-srpm-macros BuildRequires: cmake BuildRequires: pkgconfig @@ -29,11 +28,13 @@ shell! ☄🌌️.} %package -n %{crate} Summary: %{summary} +License: ISC %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE +#license LICENSE.dependencies %doc README.md %{_bindir}/starship @@ -170,14 +171,14 @@ use the "starship-battery" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep_online %build -%cargo_build +%{cargo_build} %install -%cargo_install +%{cargo_install} %if %{with check} %check diff --git a/anda/langs/rust/starship/starship-fix-metadata-auto.diff b/anda/langs/rust/starship/starship-fix-metadata-auto.diff index d44038cc99..a3d883dfd4 100644 --- a/anda/langs/rust/starship/starship-fix-metadata-auto.diff +++ b/anda/langs/rust/starship/starship-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- starship-1.14.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ starship-1.14.2/Cargo.toml 2023-04-25T12:48:23.509565+00:00 -@@ -254,18 +254,3 @@ +--- starship-1.18.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ starship-1.18.1/Cargo.toml 2024-03-24T13:14:24.022475+00:00 +@@ -263,18 +263,3 @@ ] default-features = false @@ -8,7 +8,7 @@ -version = "0.2.0" - -[target."cfg(windows)".dependencies.windows] --version = "0.48.0" +-version = "0.54.0" -features = [ - "Win32_Foundation", - "Win32_UI_Shell", diff --git a/anda/langs/vala/vala-panel/update.rhai b/anda/langs/vala/vala-panel/update.rhai new file mode 100644 index 0000000000..c8febf8b70 --- /dev/null +++ b/anda/langs/vala/vala-panel/update.rhai @@ -0,0 +1 @@ +rpm.version(gitlab("6865057")); diff --git a/anda/misc/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec b/anda/misc/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec index c88f435a20..2bfe5479fa 100644 --- a/anda/misc/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec +++ b/anda/misc/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec @@ -1,15 +1,20 @@ %global debug_package %nil -Name: kwin-system76-scheduler-integration -Version: 0.1 -Release: 4%?dist -Summary: Notify the System76 Scheduler which app has focus so it can be prioritized -License: MIT -URL: https://github.com/maxiberta/kwin-system76-scheduler-integration -Source0: %url/archive/refs/tags/%version.tar.gz -Source1: system76-scheduler-dbus-proxy.sh -Source2: com.system76.Scheduler.dbusproxy.service -Requires: bash dbus-tools system76-scheduler kde-cli-tools systemd kf5-kconfig-core qt +Name: kwin-system76-scheduler-integration + +%global forgeurl https://github.com/maxiberta/%{name} +%global commit e00f1b74998d6513552633c791ea23ffa3fe78a0 +%global date 20240425 +%forgemeta + +Version: 0.1 +Release: 1%?dist +Summary: Notify the System76 Scheduler which app has focus so it can be prioritized +License: MIT +URL: %forgeurl +Source0: %forgesource +Source1: com.system76.Scheduler.dbusproxy.service +Requires: bash dbus-tools system76-scheduler kde-cli-tools systemd kf6-kconfig BuildRequires: systemd-rpm-macros %description @@ -20,21 +25,24 @@ This KWin Script interactively notifies System76 Scheduler which app has focus via D-Bus, so it is prioritized. %prep -%autosetup +%forgeautosetup %build %install -mkdir -p %buildroot%_datadir/kwin/scripts/kwin-system76-scheduler-integration/ -cp -r * %buildroot%_datadir/kwin/scripts/kwin-system76-scheduler-integration/ -install -Dm755 %SOURCE1 %buildroot%_libexecdir/system76-scheduler-dbus-proxy.sh -install -Dm644 %SOURCE2 %buildroot%_userunitdir/com.system76.Scheduler.dbusproxy.service -install -Dm644 metadata.desktop %buildroot%_datadir/kservices5/kwin-system76-scheduler-integration.desktop +mkdir -p %buildroot%_datadir/kwin/scripts/%{name}/ +mkdir -p %buildroot%_libexecdir/ +mkdir -p %buildroot%_userunitdir/ + +cp -r contents %buildroot%_datadir/kwin/scripts/%{name}/ +cp -r metadata.json %buildroot%_datadir/kwin/scripts/%{name}/ +cp -r system76-scheduler-dbus-proxy.sh %buildroot%_libexecdir/ + +install -Dm644 %SOURCE1 %buildroot%_userunitdir/com.system76.Scheduler.dbusproxy.service %post %systemd_user_post com.system76.Scheduler.dbusproxy.service - %preun %systemd_user_preun com.system76.Scheduler.dbusproxy.service @@ -42,10 +50,11 @@ install -Dm644 metadata.desktop %buildroot%_datadir/kservices5/kwin-system76-sch %systemd_user_postun_with_restart com.system76.Scheduler.dbusproxy.service %files +%license LICENSE +%doc README.md %config %_userunitdir/com.system76.Scheduler.dbusproxy.service %_libexecdir/system76-scheduler-dbus-proxy.sh -%_datadir/kwin/scripts/kwin-system76-scheduler-integration/ -%_datadir/kservices5/kwin-system76-scheduler-integration.desktop +%_datadir/kwin/scripts/%{name}/ %changelog %autochangelog diff --git a/anda/misc/kwin-system76-scheduler-integration/update.rhai b/anda/misc/kwin-system76-scheduler-integration/update.rhai index c9403e0162..1737f94453 100644 --- a/anda/misc/kwin-system76-scheduler-integration/update.rhai +++ b/anda/misc/kwin-system76-scheduler-integration/update.rhai @@ -1 +1,5 @@ -rpm.version(gh("maxiberta/kwin-system76-scheduler-integration")); +rpm.global("commit", gh_commit("maxiberta/kwin-system76-scheduler-integration")); +if rpm.changed() { + rpm.global("date", date()); // remove if we don't need the `date` macro + rpm.release(); +} diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index 723d3c7417..66071b89e9 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.75.0 +Version: 1.76.0 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT diff --git a/anda/themes/tau-helium/tau-helium.spec b/anda/themes/tau-helium/tau-helium.spec index ccfa24a1a7..9e741ff15f 100644 --- a/anda/themes/tau-helium/tau-helium.spec +++ b/anda/themes/tau-helium/tau-helium.spec @@ -1,4 +1,4 @@ -%global ver 1.8.10-6 +%global ver 1.8.10-7 Summary: tauOS GTK/GNOME Shell Themes Name: tau-helium diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 91eab416a3..590b9def6d 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 29.3.0 +Version: 30.0.2 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT diff --git a/anda/tools/gsctool/anda.hcl b/anda/tools/gsctool/anda.hcl new file mode 100644 index 0000000000..af03f6660f --- /dev/null +++ b/anda/tools/gsctool/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "gsctool.spec" + } +} diff --git a/anda/tools/gsctool/gsctool.spec b/anda/tools/gsctool/gsctool.spec new file mode 100644 index 0000000000..8aeddd4282 --- /dev/null +++ b/anda/tools/gsctool/gsctool.spec @@ -0,0 +1,40 @@ +%define commit c060a44d085fefabd414a026dc3177533f20f0f3 +%define shortcommit %(c=%{commit}; echo ${c:0:12}) +Name: gsctool +Version: git+%{shortcommit} +Release: 1%{?dist} +Summary: Chromium OS EC utilities + +License: BSD-3-Clause +URL: https://chromium.googlesource.com/chromiumos/platform/ec +Source0: https://chromium.googlesource.com/chromiumos/platform/ec/+archive/%{commit}.tar.gz#/%{name}-git+%{commit}.tar.gz + +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(openssl) +BuildRequires: gcc + +%description +Chromium OS EC utilities + +%prep +%autosetup -c + +%build +ls +pushd extra/usb_updater +%make_build + + +%install +pushd extra/usb_updater +install -D -m 755 gsctool %{buildroot}%{_bindir}/gsctool + + +%files +%{_bindir}/gsctool + + +%changelog +* Wed Mar 27 2024 Cappy Ishihara +- initial release diff --git a/anda/tools/umstellar/.gitignore b/anda/tools/umstellar/.gitignore deleted file mode 100644 index c32b546f7d..0000000000 --- a/anda/tools/umstellar/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.tar.gz \ No newline at end of file diff --git a/anda/tools/umstellar/anda.hcl b/anda/tools/umstellar/anda.hcl deleted file mode 100644 index aa51dee858..0000000000 --- a/anda/tools/umstellar/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project "pkg" { - rpm { - spec = "umstellar.spec" - } -} \ No newline at end of file diff --git a/anda/tools/umstellar/umstellar.spec b/anda/tools/umstellar/umstellar.spec deleted file mode 100644 index 987999594b..0000000000 --- a/anda/tools/umstellar/umstellar.spec +++ /dev/null @@ -1,63 +0,0 @@ -# Created by pyp2rpm-3.3.10 -%global pypi_name umstellar -%global pypi_version 0.0.3 - -Name: python-%{pypi_name} -Version: 0.2.0 -Provides: python3-%{pypi_name} = %{version}-%{release} -Provides: %{pypi_name} = %{version}-%{release} -Release: 1%?dist -Summary: Ultramarine Quickstart Tool - -License: None -URL: https://github.com/Ultramarine-Linux/stellar -Source0: %{url}/archive/v%{version}.tar.gz -BuildArch: noarch - -BuildRequires: python3-devel -BuildRequires: python3dist(setuptools) - -%description - Stellar (Stellar)Stellar is a quick-and-dirty GUI post-install menu for -Ultramarine Linux. It's written in Python and uses libadwaita for the UI.We -hacked this together in a few days, just in time for Ultramarine Linux 39 which -happened to get delayed due to some major GNOME 45 porting issues. It's meant -to only be used for Ultramarine Linux 39's Anaconda post-install menu. -Why?So,... - -%package -n python3-%{pypi_name} -Summary: %{summary} -%{?python_provide:%python_provide python3-%{pypi_name}} - -Requires: python3dist(requests) -Requires: python3dist(setuptools) -Requires: python3dist(setuptools) = 67.7.2 -Requires: anaconda-core -%description -n python3-%{pypi_name} - -Stellar is a quick-and-dirty GUI post-install menu for -Ultramarine Linux - - -%prep -%autosetup -n stellar-%{pypi_version} - -%build -%py3_build - -%install -%py3_install - -# install kickstart file -install -D -m 644 example.ks %{buildroot}%{_datadir}/anaconda/post-scripts/stellar.ks - -%files -n python3-%{pypi_name} -%license LICENSE -%doc README.md -%{python3_sitelib}/umstellar -%{python3_sitelib}/%{pypi_name}-%{pypi_version}-py%{python3_version}.egg-info -%{_datadir}/anaconda/post-scripts/stellar.ks - -%changelog -* Fri Nov 10 2023 Cappy Ishihara - 0.0.1-1 -- Initial package. \ No newline at end of file diff --git a/anda/tools/umstellar/update.rhai b/anda/tools/umstellar/update.rhai deleted file mode 100644 index c929de9bef..0000000000 --- a/anda/tools/umstellar/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("Ultramarine-Linux/stellar")); diff --git a/anda/tools/yt-dlp/yt-dlp-nightly.spec b/anda/tools/yt-dlp/yt-dlp-nightly.spec index d74f8b3340..2092d1bc96 100644 --- a/anda/tools/yt-dlp/yt-dlp-nightly.spec +++ b/anda/tools/yt-dlp/yt-dlp-nightly.spec @@ -1,8 +1,8 @@ #bcond_without tests -%global commit e5d4f11104ce7ea1717a90eea82c0f7d230ea5d5 +%global commit ac817bc83efd939dca3e40c4b527d0ccfc77172b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240325 -%global ver 2024.03.10 +%global commit_date 20240429 +%global ver 2024.04.09 Name: yt-dlp-nightly Version: %ver^%commit_date.%shortcommit