From e63c1f9e8aff04bd845e62e4ff88c640994dff2d Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 28 Sep 2023 18:41:12 +0800 Subject: [PATCH] chore: sync with Terra 38 --- anda/desktops/compiz9/compiz9.spec | 2 +- .../wingpanel-indicator-datetime.spec | 2 +- .../elementary/wingpanel/wingpanel.spec | 1 - .../kde/kde-liquidshell/kde-liquidshell.spec | 14 +++++------- anda/desktops/kde/kde-liquidshell/update.rhai | 2 ++ .../latte-dock-nightly.spec | 2 +- anda/fonts/seto/seto-fonts.spec | 2 +- .../prismlauncher-nightly.spec | 2 +- .../prismlauncher-qt5-nightly.spec | 2 +- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- anda/nim/nim-nightly/nim-nightly.spec | 2 +- .../system76-scheduler.spec | 19 +++++++++++----- .../bandwhich-fix-metadata-auto.diff | 22 +++++++++++-------- anda/rust/bandwhich/rust-bandwhich.spec | 15 +++++++++---- .../bibata-cursor-theme.spec | 2 +- anda/tools/anda/rust-anda.spec | 5 +++-- anda/tools/electron/electron.spec | 2 +- anda/tools/limine/limine.spec | 2 +- anda/tools/subatomic/subatomic.spec | 3 --- anda/vala/vala-nightly/vala-nightly.spec | 2 +- 20 files changed, 61 insertions(+), 46 deletions(-) create mode 100644 anda/desktops/kde/kde-liquidshell/update.rhai diff --git a/anda/desktops/compiz9/compiz9.spec b/anda/desktops/compiz9/compiz9.spec index fb3d612a42..c430ce97ef 100644 --- a/anda/desktops/compiz9/compiz9.spec +++ b/anda/desktops/compiz9/compiz9.spec @@ -77,7 +77,7 @@ Compiz Config Manager helps configure Compiz Window Manager, version 0.9 series Compiz 9 branch, which is newer then what Fedora packages and required by Unity 7.6 and higher. %prep -%autosetup -p1 -n compiz +%autosetup -p1 -n compiz-%version+%(echo %_ubuntu_rel | sed 's@-0ubuntu.@@') %build # The driver blacklist hack is obselete diff --git a/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec b/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec index 3286d36327..39ff21f8cc 100644 --- a/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec +++ b/anda/desktops/elementary/wingpanel-indicator-datetime/wingpanel-indicator-datetime.spec @@ -6,7 +6,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.4.1 -Release: 2%{?dist} +Release: 1%{?dist} License: GPL-3.0-or-later URL: https://github.com/elementary/wingpanel-indicator-datetime diff --git a/anda/desktops/elementary/wingpanel/wingpanel.spec b/anda/desktops/elementary/wingpanel/wingpanel.spec index d844b3ce6c..cda694cc5a 100644 --- a/anda/desktops/elementary/wingpanel/wingpanel.spec +++ b/anda/desktops/elementary/wingpanel/wingpanel.spec @@ -12,7 +12,6 @@ License: GPL-2.0-or-later URL: https://github.com/elementary/wingpanel Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: https://github.com/elementary/wingpanel/commit/d6009d9f0d5c7479172093447ccceccba86ff1f3.patch BuildRequires: desktop-file-utils BuildRequires: gettext diff --git a/anda/desktops/kde/kde-liquidshell/kde-liquidshell.spec b/anda/desktops/kde/kde-liquidshell/kde-liquidshell.spec index 44ddb827e9..c483d7cb49 100644 --- a/anda/desktops/kde/kde-liquidshell/kde-liquidshell.spec +++ b/anda/desktops/kde/kde-liquidshell/kde-liquidshell.spec @@ -1,17 +1,12 @@ -%global forgeurl https://invent.kde.org/system/liquidshell -%global commit 9b14b9766f5d8db2b81c9bc7d4163dc07534402c -%global scm git -%forgemeta - Name: kde-liquidshell -Version: 1.8.1 +Version: 1.9.0 Release: %autorelease Summary: Basic desktop shell using QtWidgets Provides: liquidshell = %version License: GPL-3.0 -URL: %{forgeurl} -Source0: %{forgeurl}/-/archive/%{commit}/liquidshell-%{commit}.tar.gz +URL: https://invent.kde.org/system/liquidshell +Source0: https://download.kde.org/stable/liquidshell/liquidshell-%version.tar.xz BuildRequires: cmake BuildRequires: libappstream-glib @@ -49,7 +44,7 @@ Recommends: polkit-kde liquidshell is a basic Desktop Shell implemented using QtWidgets. %prep -%autosetup -n liquidshell-%{commit} +%autosetup -n liquidshell-%version %build %cmake_kf5 -DWITH_PACKAGEKIT=true @@ -69,6 +64,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %{_datadir}/knotifications5/liquidshell.notifyrc %{_metainfodir}/org.kde.liquidshell.appdata.xml %{_datadir}/xsessions/liquidshell-session.desktop +%{_datadir}/locale/*/LC_MESSAGES/liquidshell.mo %changelog %autochangelog diff --git a/anda/desktops/kde/kde-liquidshell/update.rhai b/anda/desktops/kde/kde-liquidshell/update.rhai new file mode 100644 index 0000000000..ff2cd867ca --- /dev/null +++ b/anda/desktops/kde/kde-liquidshell/update.rhai @@ -0,0 +1,2 @@ +let html = get("https://download.kde.org/stable/liquidshell/"); +rpm.version(find(`>liquidshell-([.\\d]+)\\.tar\\.xz`, html, 1)); diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index 846a15bfb9..35732a7fbd 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/KDE/latte-dock/ -%global commit 853a7735a425ec6bb0379da1a8b4fbc13a7992ad +%global commit 71e0243709a0d0bc3f1f9688a801bfce182211f5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} diff --git a/anda/fonts/seto/seto-fonts.spec b/anda/fonts/seto/seto-fonts.spec index 63ecdc60d0..3365601eeb 100644 --- a/anda/fonts/seto/seto-fonts.spec +++ b/anda/fonts/seto/seto-fonts.spec @@ -2,7 +2,7 @@ Name: seto-fonts Version: 6.20 Release: 2%?dist URL: https://setofont.osdn.jp/ -Source0: http://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip +Source0: https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip License: OFL-1.1 Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji BuildRequires: unzip diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index a5c6de91c4..c6391e9dd3 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,7 +1,7 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 25ce11d85d1aa9060e9df335a63f3de5e61c7f6b +%global commit 59e565ef96b85be9a25fa5d4f1723ee87fd5e75e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 8deb5cc749..7b2f18ead7 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,7 +1,7 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 25ce11d85d1aa9060e9df335a63f3de5e61c7f6b +%global commit 59e565ef96b85be9a25fa5d4f1723ee87fd5e75e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index a50acf6704..37514809bb 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,5 +1,5 @@ -%global commit 470c36ceef780ff6189bbd8e2f889941ca828247 -%global ver 1.8.16 +%global commit a65f14fff6de5b6b9cbd0e91cec757c7cf7efc7c +%global ver 1.8.19 Name: tdlib-nightly Version: %ver^%commit Release: 1%{?dist} diff --git a/anda/nim/nim-nightly/nim-nightly.spec b/anda/nim/nim-nightly/nim-nightly.spec index 7b9335560c..5b1b896294 100644 --- a/anda/nim/nim-nightly/nim-nightly.spec +++ b/anda/nim/nim-nightly/nim-nightly.spec @@ -1,5 +1,5 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit b3912c25d3dcb78bc1c8f7d6acc3c512964d3ea8 +%global commit a9e6660a74322f0385f22c89e60c46e3177c2513 %global ver 2.1.1 %global debug_package %nil diff --git a/anda/others/system76-scheduler/system76-scheduler.spec b/anda/others/system76-scheduler/system76-scheduler.spec index 1a0c3c83b7..6f81ab2ef6 100644 --- a/anda/others/system76-scheduler/system76-scheduler.spec +++ b/anda/others/system76-scheduler/system76-scheduler.spec @@ -8,6 +8,8 @@ License: MPL-2.0 URL: https://github.com/pop-os/system76-scheduler Source0: %url/archive/refs/tags/%version.tar.gz BuildRequires: cargo clang clang-devel pipewire-devel pkg-config systemd-rpm-macros rust-packaging just +BuildRequires: bcc-tools +Requires: bcc-tools %description Scheduling service which optimizes Linux's CPU scheduler and automatically @@ -22,11 +24,11 @@ process priority. %autosetup %build -export EXECSNOOP_PATH=$(which execsnoop-bpfcc) +export EXECSNOOP_PATH=/usr/share/bcc/tools/execsnoop %cargo_build %install -just rootdir=%buildroot sysconfdir=%_sysconfdir install +just rootdir=%buildroot sysconfdir=%_datadir install %post @@ -45,11 +47,18 @@ just rootdir=%buildroot sysconfdir=%_sysconfdir install %doc README.md %license LICENSE %_bindir/system76-scheduler -%config %_sysconfdir/dbus-1/system.d/com.system76.Scheduler.conf -%config %_sysconfdir/system76-scheduler/config.kdl -%config %_sysconfdir/system76-scheduler/process-scheduler/pop_os.kdl +%config %ghost %_sysconfdir/dbus-1/system.d/com.system76.Scheduler.conf +%config %ghost %_sysconfdir/system76-scheduler/config.kdl +%config %ghost %_sysconfdir/system76-scheduler/process-scheduler/pop_os.kdl +%_datadir/dbus-1/system.d/com.system76.Scheduler.conf +%_datadir/system76-scheduler/config.kdl +%_datadir/system76-scheduler/process-scheduler/pop_os.kdl %_unitdir/com.system76.Scheduler.service %changelog +* Tue Sep 26 2023 Cappy Ishihara - 2.0.1-2 +- Move default configurations to /usr/share/system76-scheduler +- Add Requires: bcc-tools so execsnoop is available + * Tue May 23 2023 windowsboy111 - 2.0.1-1 - Initial package. diff --git a/anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff b/anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff index 0091bf4a7d..f9fdd38559 100644 --- a/anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff +++ b/anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff @@ -1,16 +1,20 @@ ---- bandwhich-0.20.0/Cargo.toml 2020-10-15T09:07:04+00:00 -+++ bandwhich-0.20.0/Cargo.toml 2020-10-15T09:07:04+00:00 -@@ -83,13 +83,3 @@ - version = "1" +--- bandwhich-0.21.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ bandwhich-0.21.0/Cargo.toml 2023-09-21T07:50:16.506970+00:00 +@@ -104,17 +104,3 @@ [target."cfg(target_os=\"linux\")".dependencies.procfs] - version = "0.7.4" + version = "0.15.1" + -[target."cfg(target_os=\"windows\")".dependencies.netstat2] --version = "0.9.0" +-version = "0.9.1" - -[target."cfg(target_os=\"windows\")".dependencies.sysinfo] --version = "0.15.1" +-version = "0.29.10" +- +-[target."cfg(target_os=\"windows\")".build-dependencies.anyhow] +-version = "1.0.75" +- -[target."cfg(target_os=\"windows\")".build-dependencies.http_req] --version = "0.7.0" +-version = "0.9.3" - -[target."cfg(target_os=\"windows\")".build-dependencies.zip] --version = "0.5.6" +-version = "0.6.6" diff --git a/anda/rust/bandwhich/rust-bandwhich.spec b/anda/rust/bandwhich/rust-bandwhich.spec index 957ac5c18d..c18d71e3b0 100644 --- a/anda/rust/bandwhich/rust-bandwhich.spec +++ b/anda/rust/bandwhich/rust-bandwhich.spec @@ -1,17 +1,20 @@ -# Generated by rust2rpm 23 +# Generated by rust2rpm 24 +#bcond_without check + %global crate bandwhich Name: rust-bandwhich Version: 0.21.0 -Release: 1%{?dist} -Summary: Show network utilization by process/connection/hostname/IP +Release: %autorelease +Summary: Display current network utilization by process, connection and remote IP/hostname + License: MIT URL: https://crates.io/crates/bandwhich Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: bandwhich-fix-metadata-auto.diff -BuildRequires: anda-srpm-macros rust-packaging >= 21 +BuildRequires: anda-srpm-macros rust-packaging >= 23 %global _description %{expand: Display current network utilization by process, connection and remote @@ -21,11 +24,13 @@ IP/hostname.} %package -n %{crate} Summary: %{summary} +License: MIT %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE.md +%license LICENSE.dependencies %doc CHANGELOG.md %doc CODE_OF_CONDUCT.md %doc CONTRIBUTING.md @@ -38,6 +43,8 @@ Summary: %{summary} %build %cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies %install %cargo_install diff --git a/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec b/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec index 18a7190c9b..1980bf0ec1 100644 --- a/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec +++ b/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec @@ -2,7 +2,7 @@ Name: bibata-cursor-theme Version: 2.0.4 Release: 1%{?dist} URL: https://github.com/ful1e5/Bibata_Cursor -Source0: %{url}/releases/download/v%{version}/Bibata.tar.gz +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 diff --git a/anda/tools/anda/rust-anda.spec b/anda/tools/anda/rust-anda.spec index bb3bcf42e9..092db3d0dd 100644 --- a/anda/tools/anda/rust-anda.spec +++ b/anda/tools/anda/rust-anda.spec @@ -46,8 +46,9 @@ Summary: %{summary} %cargo_prep_online %build -cargo run -p xtask -- manpage -cargo run -p xtask -- completion +%cargo_build +cargo run --release -p xtask -- manpage +cargo run --release -p xtask -- completion %install %cargo_install diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 8695b07201..adf9af8ac2 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: 26.2.2 +Version: 26.2.3 Release: 1%{?dist} Summary: Build cross platform desktop apps with web technologies License: MIT diff --git a/anda/tools/limine/limine.spec b/anda/tools/limine/limine.spec index 48d5daf688..e1e9132c0e 100644 --- a/anda/tools/limine/limine.spec +++ b/anda/tools/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 5.20230917.0 +Version: 5.20230924.0 Release: 1%{?dist} Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause diff --git a/anda/tools/subatomic/subatomic.spec b/anda/tools/subatomic/subatomic.spec index cdc590441c..f91f1b2430 100644 --- a/anda/tools/subatomic/subatomic.spec +++ b/anda/tools/subatomic/subatomic.spec @@ -32,9 +32,6 @@ Client for Subatomic repo manager %prep %autosetup -go env -go env -w GOPROXY=proxy.golang.org,direct -go env -w GOSUMDB=sum.golang.org go mod download diff --git a/anda/vala/vala-nightly/vala-nightly.spec b/anda/vala/vala-nightly/vala-nightly.spec index 64268c1495..70471f83f4 100644 --- a/anda/vala/vala-nightly/vala-nightly.spec +++ b/anda/vala/vala-nightly/vala-nightly.spec @@ -3,7 +3,7 @@ %global priority 90 %global real_name vala -%global commit 3a2cdb26bceef7afe48770744a4547eaa44ccdc0 +%global commit ba470e9bbe6eaf7781a0fe37346841443b72fbc4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git