chore: sync with Terra 38

This commit is contained in:
madomado
2023-11-13 23:24:57 +08:00
parent 4055b9c57f
commit 4f16cd5f47
41 changed files with 293 additions and 222 deletions
+9 -10
View File
@@ -5,9 +5,10 @@ Summary: Flashcard program for using space repetition learning (Installed with
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
URL: https://apps.ankiweb.net/
BuildRequires: python3-installer python3.11 rpm_macro(fdupes)
Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
Requires: python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine
Requires: python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
Requires: python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
Requires: libxcrypt-compat hicolor-icon-theme sox mpv
ExclusiveArch: x86_64
Conflicts: anki
Source0: https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
@@ -28,13 +29,8 @@ Anki is based on a theory called spaced repetition.
%build
%install
python3.11 -m ensurepip
python3.11 -m venv .
source ./bin/activate
pip install PyInstaller==3.5
python -m installer --destdir="%{buildroot}" %{SOURCE0}
python -m installer --destdir="%{buildroot}" %{SOURCE1}
python3.11 -m installer --destdir="%{buildroot}" %{SOURCE0}
python3.11 -m installer --destdir="%{buildroot}" %{SOURCE1}
install -Dm755 %{SOURCE2} "%{buildroot}/usr/bin/anki"
install -Dm644 %{SOURCE3} "%{buildroot}/usr/share/applications/anki.desktop"
install -Dm644 %{SOURCE4} "%{buildroot}/usr/share/pixmaps/anki.png"
@@ -57,5 +53,8 @@ install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md"
/usr/share/pixmaps/anki.png
%changelog
* Fri Nov 10 2023 hazel-bunny <dabiswas112@gmail.com> - 23.10-2
- Add python3-orjson and mpv as dependencies
* Wed Jan 11 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
- Initial package
+8 -8
View File
@@ -1,20 +1,20 @@
diff -uNr anki-2.1.55.old/qt/aqt/qt/__init__.py anki-2.1.55/qt/aqt/qt/__init__.py
--- anki-2.1.55.old/qt/aqt/qt/__init__.py 2023-01-02 18:34:13.716216913 +0800
+++ anki-2.1.55/qt/aqt/qt/__init__.py 2023-01-02 18:34:00.410033708 +0800
@@ -9,16 +9,7 @@
--- a/qt/aqt/qt/__init__.py
+++ b/qt/aqt/qt/__init__.py
@@ -9,16 +9,7 @@ import sys
import traceback
from typing import Callable, TypeVar, Union
-try:
- import PyQt6
-except:
- from .qt5 import * # type: ignore
-else:
- if not os.getenv("DISABLE_QT5_COMPAT"):
- if os.getenv("ENABLE_QT5_COMPAT"):
- print("Running with temporary Qt5 compatibility shims.")
- print("Run with DISABLE_QT5_COMPAT=1 to confirm compatibility with Qt6.")
- from . import qt5_compat # needs to be imported first
- from .qt6 import *
-
+from .qt5 import * # type: ignore
from anki.utils import is_mac, is_win
# fix buggy ubuntu12.04 display of language selector
+13
View File
@@ -0,0 +1,13 @@
diff --git a/qt/aqt/update.py b/qt/aqt/update.py
index 212ddf93d..6f716cc04 100644
--- a/qt/aqt/update.py
+++ b/qt/aqt/update.py
@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
def check_for_update() -> None:
+ return
+
from aqt import mw
def do_check(_col: Collection) -> CheckForUpdateResponse:
+2 -2
View File
@@ -7,11 +7,11 @@ URL: https://apps.ankiweb.net/
BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip
BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash python3-orjson mpv python3-qt5-webengine
Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt5-sip
ExclusiveArch: x86_64
Conflicts: anki
#Patch0: 0001-No-update.patch
Patch0: 0001-No-update.patch
Patch1: 0001-Force-qt5.patch
%description
+13
View File
@@ -0,0 +1,13 @@
diff --git a/qt/aqt/update.py b/qt/aqt/update.py
index 212ddf93d..6f716cc04 100644
--- a/qt/aqt/update.py
+++ b/qt/aqt/update.py
@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
def check_for_update() -> None:
+ return
+
from aqt import mw
def do_check(_col: Collection) -> CheckForUpdateResponse:
+1 -1
View File
@@ -12,7 +12,7 @@ Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-h
Recommends: mpv
Obsoletes: anki <= 2.1.15
Conflicts: anki-qt5
#Patch0: 0001-No-update.patch
Patch0: 0001-No-update.patch
%description
Anki is a program designed to help you remember facts (such as words and
+1 -1
View File
@@ -1,5 +1,5 @@
Name: flutter
Version: 3.13.9
Version: 3.16.0.0.5.pre
Release: 1%{?dist}
Summary: SDK for crafting beautiful, fast user experiences from a single codebase
License: BSD-3-Clause
@@ -4,7 +4,7 @@
Name: vala-panel-appmenu
Version: 0.7.6
Release: 1%?dist
Release: 2%?dist
License: LGPL-3.0-or-later
Summary: Application Menu plugin for vala-panel
URL: %{forgeurl}
+1 -1
View File
@@ -1,5 +1,5 @@
let readme = get("https://raw.githubusercontent.com/sharanda/manrope/master/README.md");
let ver = find("## Changelog\n- v (.+?) \\/", readme, 1);
let ver = find("## Changelog\\n+- v (.+?) \\/", readme, 1);
if ver != find("Version:\\s*([\\d.]+)\n", rpm.f, 1) {
let req = new_req("https://api.github.com/repos/sharanda/manrope/commits/HEAD");
let sha = req.get().json().sha;
@@ -20,7 +20,7 @@ of information.}
%global godocs README.md
Name: %{goname}
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Generate .desktop files and download .png icons
License: BSD-3-Clause
@@ -1,7 +1,7 @@
Name: ayatana-indicator-session
Summary: Ayatana Indicator Session Applet
Version: 23.10.0
Release: 1%?dist
Version: 23.10.1
Release: 1%{?dist}
License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-session
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -18,7 +18,6 @@ BuildRequires: pkgconfig(dbustest-1)
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(rda)
BuildRequires: intltool
%description
+1 -1
View File
@@ -4,7 +4,7 @@
Name: libusermetrics
Version: 1.3.0
Release: 1%?dist
Release: 2%?dist
Summary: library for retrieving anonymous metrics about users
License: GPLv3 AND LGPLv3 AND LGPLv2
URL: https://gitlab.com/ubports/development/core/libusermetrics
@@ -4,7 +4,7 @@
Name: lomiri-indicator-network
Version: 1.0.0
Release: 1%?dist
Release: %autorelease
Summary: The Network indicator for Ubuntu Touch
License: GPL-3.0 AND LGPL-3.0
URL: https://gitlab.com/ubports/development/core/lomiri-indicator-network
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
%global commit 0822514d99cb887bf9919edbe032ec1b1e5b0af7
%global commit c8062dca48c6ce3fc26a243f0641e4f0ed4b6e3a
%forgemeta
Name: lomiri-ui-toolkit
+2 -2
View File
@@ -1,9 +1,9 @@
# ref: https://src.fedoraproject.org/rpms/openh264
%global commit1 3a01c086d1b0394238ff1b5ad22e76022830625a
%global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
%global openh264_version 2.3.1
%global gst_version 1.22.5
%global gst_version 1.22.7
Name: openh264
Version: %{openh264_version}
+3 -1
View File
@@ -1,4 +1,6 @@
rpm.global("commit1", get("https://api.github.com/repos/mozilla/gmp-api/commits/HEAD").json().sha);
rpm.global("openh264_version", gh("cisco/openh264"));
let h264 = gh("cisco/openh264");
h264.crop(1);
rpm.global("openh264_version", h264);
let html = get("https://gstreamer.freedesktop.org/src/gst-plugins-bad/?C=N;O=D");
rpm.global("gst_version", find("gst-plugins-bad-([\\d.]+).tar.xz", html, 1));
+1 -1
View File
@@ -3,7 +3,7 @@
Name: pqmarble
Version: %ver^%commit
Release: 2%{?dist}
Release: 1%{?dist}
Summary: My GTK library
License: GPL-3.0
URL: https://gitlab.gnome.org/raggesilver/marble
+1 -1
View File
@@ -5,7 +5,7 @@
Name: qtmir
Version: 0.8.0
Release: 1%?dist
Release: %autorelease
Summary: Mir backed compositor using Qt
License: LGPLv3+ AND GPLv3+
+1 -1
View File
@@ -1,6 +1,6 @@
Name: librda
Version: 0.0.5
Release: 2%?dist
Release: 1%?dist
Summary: Remote Desktop Awareness Shared Library
Group: System Environment/Libraries
License: LGPL2.1+ or GPL3+
+1 -1
View File
@@ -1 +1 @@
rpm.version(gh("ArcticaProject/librda"));
rpm.version(gh_tag("ArcticaProject/librda"));
@@ -4,7 +4,7 @@
Name: lomiri-session
Version: 0.2
Release: 1%?dist
Release: %autorelease
Summary: Configuration schemas for lomiri
License: LGPLv3
URL: https://gitlab.com/ubports/development/core/lomiri-session
@@ -1,7 +1,7 @@
Name: unity-scope-home
Summary: Home scope that aggregates results from multiple scopes
Version: 19.04.20190412
Release: 1%?dist
Release: %autorelease
License: GPL-3.0
URL: https://launchpad.net/unity-scope-home
Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-scope-home/unity-scope-home_6.8.2+%{version}.orig.tar.gz
@@ -1,6 +1,6 @@
--- 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 @@
--- bandwhich-0.21.1/Cargo.toml 1970-01-01T00:00:01+00:00
+++ bandwhich-0.21.1/Cargo.toml 2023-10-30T06:12:20.956389+00:00
@@ -119,17 +119,3 @@
[target."cfg(target_os=\"linux\")".dependencies.procfs]
version = "0.15.1"
@@ -14,7 +14,7 @@
-version = "1.0.75"
-
-[target."cfg(target_os=\"windows\")".build-dependencies.http_req]
-version = "0.9.3"
-version = "0.10.0"
-
-[target."cfg(target_os=\"windows\")".build-dependencies.zip]
-version = "0.6.6"
+8 -9
View File
@@ -1,20 +1,20 @@
# Generated by rust2rpm 24
# Generated by rust2rpm 25
#bcond_without check
%global crate bandwhich
Name: rust-bandwhich
Version: 0.21.1
Release: 1%{?dist}
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
# Automatically generated patch to strip dependencies and normalize metadata
Patch: bandwhich-fix-metadata-auto.diff
BuildRequires: anda-srpm-macros rust-packaging >= 23
BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24
%global _description %{expand:
Display current network utilization by process, connection and remote
@@ -30,7 +30,7 @@ License: MIT
%files -n %{crate}
%license LICENSE.md
%license LICENSE.dependencies
#license LICENSE.dependencies
%doc CHANGELOG.md
%doc CODE_OF_CONDUCT.md
%doc CONTRIBUTING.md
@@ -38,17 +38,16 @@ License: MIT
%{_bindir}/bandwhich
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%autosetup -n %{crate}-%{version} -p1
%cargo_prep_online
%build
%cargo_build
%{cargo_license_summary}
%{cargo_license} > LICENSE.dependencies
#{cargo_license_summary}
#{cargo_license} > LICENSE.dependencies
%install
%cargo_install
rm %{buildroot}/.cargo -rf
%if %{with check}
%check
+1 -1
View File
@@ -2,7 +2,7 @@
%global crate felix
Name: rust-felix
Version: 2.10.0
Version: 2.10.1
Release: 1%{?dist}
Summary: Tui file manager with vim-like key mapping
+1 -1
View File
@@ -5,7 +5,7 @@
Name: rust-joshuto
Version: 0.9.5
Release: 2%{?dist}
Release: 1%{?dist}
Summary: Terminal file manager inspired by ranger
License: LGPL-3.0
+5
View File
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "nushell.spec"
}
}
+47
View File
@@ -0,0 +1,47 @@
Name: nushell
Version: 0.86.0
Release: 1%{?dist}
Summary: A new type of shell
License: MIT
URL: https://www.nushell.sh/
Source0: https://github.com/nushell/nushell/archive/refs/tags/%version.tar.gz
BuildRequires: anda-srpm-macros rust-packaging openssl-devel
Requires: glibc gcc-libs openssl zlib
%description
%summary.
%prep
%autosetup
%cargo_prep_online
%build
%{cargo_build -f extra,dataframe} --workspace
%install
%cargo_install -f extra,dataframe
rm -rf .cargo
%post
if [ "$1" = 1 ]; then
if [ ! -f %{_sysconfdir}/shells ] ; then
echo "%{_bindir}/nu" > %{_sysconfdir}/shells
echo "/bin/nu" >> %{_sysconfdir}/shells
else
grep -q "^%{_bindir}/nu$" %{_sysconfdir}/shells || echo "%{_bindir}/nu" >> %{_sysconfdir}/shells
grep -q "^/bin/nu$" %{_sysconfdir}/shells || echo "/bin/nu" >> %{_sysconfdir}/shells
fi
%postun
if [ "$1" = 0 ] && [ -f %{_sysconfdir}/shells ] ; then
sed -i '\!^%{_bindir}/nu$!d' %{_sysconfdir}/shells
sed -i '\!^/bin/nu$!d' %{_sysconfdir}/shells
fi
%files
%doc README.md
%license LICENSE
%_bindir/nu*
%changelog
%autochangelog
+1
View File
@@ -0,0 +1 @@
rpm.version(gh("nushell/nushell"));
+55 -23
View File
@@ -1,34 +1,40 @@
# Generated by rust2rpm 23
# Generated by rust2rpm 25
%bcond_without check
%global crate oxipng
Name: rust-oxipng
Version: 9.0.0
Release: 1%{?dist}
Release: %autorelease
Summary: Lossless PNG compression optimizer
License: MIT
URL: https://crates.io/crates/oxipng
Source: %{crates_source}
# Automatically generated patch to strip dependencies and normalize metadata
Patch: oxipng-fix-metadata-auto.diff
BuildRequires: anda-srpm-macros rust-packaging >= 21
BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24
%global _description %{expand:
Lossless PNG compression optimizer.}
A lossless PNG compression optimizer.}
%description %{_description}
%package -n %{crate}
Summary: %{summary}
# FIXME: paste output of %%cargo_license_summary here
License: # FIXME
# LICENSE.dependencies contains a full license breakdown
%description -n %{crate} %{_description}
%files -n %{crate}
%license LICENSE
#license LICENSE.dependencies
%doc CHANGELOG.md
%doc MANUAL.txt
%doc README.md
%doc README.template.md
%{_bindir}/oxipng
%package devel
@@ -43,8 +49,8 @@ use the "%{crate}" crate.
%files devel
%license %{crate_instdir}/LICENSE
%doc %{crate_instdir}/CHANGELOG.md
%doc %{crate_instdir}/MANUAL.txt
%doc %{crate_instdir}/README.md
%doc %{crate_instdir}/README.template.md
%{crate_instdir}/
%package -n %{name}+default-devel
@@ -83,6 +89,30 @@ use the "clap" feature of the "%{crate}" crate.
%files -n %{name}+clap-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+crossbeam-channel-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+crossbeam-channel-devel %{_description}
This package contains library source intended for building other packages which
use the "crossbeam-channel" feature of the "%{crate}" crate.
%files -n %{name}+crossbeam-channel-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+env_logger-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+env_logger-devel %{_description}
This package contains library source intended for building other packages which
use the "env_logger" feature of the "%{crate}" crate.
%files -n %{name}+env_logger-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+filetime-devel
Summary: %{summary}
BuildArch: noarch
@@ -107,6 +137,18 @@ use the "freestanding" feature of the "%{crate}" crate.
%files -n %{name}+freestanding-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+image-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+image-devel %{_description}
This package contains library source intended for building other packages which
use the "image" feature of the "%{crate}" crate.
%files -n %{name}+image-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+parallel-devel
Summary: %{summary}
BuildArch: noarch
@@ -131,28 +173,16 @@ use the "rayon" feature of the "%{crate}" crate.
%files -n %{name}+rayon-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+stderrlog-devel
%package -n %{name}+sanity-checks-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+stderrlog-devel %{_description}
%description -n %{name}+sanity-checks-devel %{_description}
This package contains library source intended for building other packages which
use the "stderrlog" feature of the "%{crate}" crate.
use the "sanity-checks" feature of the "%{crate}" crate.
%files -n %{name}+stderrlog-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+wild-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+wild-devel %{_description}
This package contains library source intended for building other packages which
use the "wild" feature of the "%{crate}" crate.
%files -n %{name}+wild-devel
%files -n %{name}+sanity-checks-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+zopfli-devel
@@ -168,11 +198,13 @@ use the "zopfli" 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_license_summary}
#{cargo_license} > LICENSE.dependencies
%install
%cargo_install
+1 -1
View File
@@ -6,7 +6,7 @@ License: GPL-3.0
URL: https://github.com/flxzt/rnote
Source0: %{url}/archive/refs/tags/v%version.tar.gz
Requires: gtk4
BuildRequires: cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python
BuildRequires: cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils
BuildRequires: pkgconfig(glib-2.0) >= 2.66
BuildRequires: pkgconfig(gtk4) >= 4.7
BuildRequires: pkgconfig(libadwaita-1) >= 1.2
+12
View File
@@ -0,0 +1,12 @@
diff --git a/crates/youki/Cargo.toml b/crates/youki/Cargo.toml
index b494cf1..e415f15 100644
--- a/crates/youki/Cargo.toml
+++ b/crates/youki/Cargo.toml
@@ -49,6 +49,7 @@ wasmtime-wasi = {version = "10.0.2", optional = true }
tracing = { version = "0.1.37", features = ["attributes"]}
tracing-subscriber = { version = "0.3.16", features = ["json", "env-filter"] }
tracing-journald = "0.3.0"
+protobuf = "= 3.2.0"
[dev-dependencies]
serial_test = "2.0.0"
+1 -1
View File
@@ -1 +1 @@
rpm.version(gh("containers/youki"));
rpm.version(crates("youki"));
+10 -4
View File
@@ -6,6 +6,7 @@ Summary: A container runtime written in Rust
License: Apache-2.0
URL: https://github.com/containers/youki
Source0: https://github.com/containers/youki/archive/refs/tags/v%{version}.tar.gz
Patch0: dep-protobuf.diff
BuildRequires: pkg-config
BuildRequires: rust-packaging
@@ -22,10 +23,15 @@ BuildRequires: fdupes
youki is an implementation of the OCI runtime-spec in Rust, similar to runc.
%prep
%autosetup -n youki-%{version} -S git -v -p0
%setup -q -n youki-%{version}
git init .
git remote add origin https://github.com/containers/youki
git fetch origin
git config user.name "username"
git config user.email "dunno@idk.com"
git add * .*
git commit -a -m "idk"
git checkout v%{version}
# add host key for github
@@ -38,17 +44,17 @@ git submodule sync
# download git submodules
git submodule update --init --recursive
%patch 0 -p1
%cargo_prep_online
%build
pushd crates/
%cargo_build
%install
install -D -m 0755 target/release/youki %{buildroot}%{_bindir}/youki
ls target/*
install -D -m 0755 target/rpm/youki %{buildroot}%{_bindir}/youki
%fdupes docs/
%files
+2 -2
View File
@@ -10,8 +10,8 @@ execution of applications written in Java and other JVM languages along with
support for JavaScript, Ruby, Python, and a number of other popular languages.}
Name: graalvm
Version: 23.0.0
Release: 1%{?dist}
Version: 22.3.2
Release: 2%{?dist}
URL: https://www.graalvm.org/
Summary: %{gsummary}
License: GPL-2.0
-3
View File
@@ -2,9 +2,6 @@ let ver = gh("graalvm/graalvm-ce-builds");
if ver.starts_with("vm-") {
ver.crop(3);
rpm.version(ver);
} else if ver.starts_with("graal-") {
ver.crop(6);
rpm.version(ver);
} else {
print(`graalvm: ${ver}?`);
}
+1 -1
View File
@@ -18,7 +18,7 @@
Name: terra-HandBrake
Version: 1.6.1
Release: 2%?dist
Release: 1%?dist
Summary: An open-source multiplatform video transcoder
License: GPL-2.0-or-later
URL: https://handbrake.fr/
+1 -1
View File
@@ -6,7 +6,7 @@ Release: 1%{?dist}
Summary: The vicious image builder
License: MIT
URL: https://github.com/FyraLabs/katsu
Source0: %url/archive/refs/tags/v%version.tar.gz
Source0: %url/archive/refs/tags/%version.tar.gz
Requires: xorriso dracut limine grub2 systemd-devel squashfs-tools
Requires: dracut-live dracut-config-generic dracut-config-rescue grub2-tools-extra dracut-squash
BuildRequires: cargo rust-packaging pkgconfig(libudev) clang-devel
+75 -129
View File
@@ -1,13 +1,8 @@
%bcond_without single
%bcond_without replace
%global coreutils_ver 9.3
Name: uutils-coreutils
Version: 0.0.22
Release: 2%?dist
Release: 1%?dist
Summary: Cross-platform Rust rewrite of the GNU coreutils
License: MIT
URL: https://github.com/uutils/coreutils
@@ -19,20 +14,16 @@ BuildRequires: libselinux-devel
BuildRequires: selinux-policy-devel
BuildRequires: clang-devel
%description
uutils coreutils is a cross-platform reimplementation of the GNU coreutils in Rust.
While all programs have been implemented, some options might be missing or different
behavior might be experienced.
%if %{with replace}
%package replace
Summary: Cross-platform Rust replacement of the GNU coreutils
Provides: coreutils = %coreutils_ver
Provides: coreutils(%arch)
Provides: coreutils-full
Suggests: uutils-coreutils-replace-bash-completion = %version-%release
%description replace
uutils coreutils is a cross-platform reimplementation of the GNU coreutils in Rust.
@@ -41,109 +32,58 @@ behavior might be experienced.
This package removes the `uu-` prefixes.
%package replace-bash-completion
Summary: Bash completion for uutils coreutils
Requires: uutils-coreutils = %version-%release
Provides: bash-completion
%package util-linux
Summary: uutil-coreutils single binary, with util-linux commands
Requires: uutils-coreutils
%description replace-bash-completion
Bash completion for uutils coreutils
%endif
%if %{with single}
%package single
Summary: Cross-platform Rust replacement of the GNU coreutils
Provides: coreutils = %coreutils_ver
Provides: coreutils(%arch)
Provides: coreutils-full
Provides: coreutils-single
Suggests: bash-completion
%description single
%description util-linux
uutils coreutils is a cross-platform reimplementation of the GNU coreutils in Rust.
While all programs have been implemented, some options might be missing or different
behavior might be experienced.
This package provides a single binary symlinked to replace all coreutils.
This package provides a single binary with commands for util-linux with the `uu-` prefix.
%package util-linux-replace
Summary: uutils-coreutils single-binary, replaces coreutils and util-linux
Provides: util-linux
%description util-linux-replace
uutils coreutils is a cross-platform reimplementation of the GNU coreutils in Rust.
While all programs have been implemented, some options might be missing or different
behavior might be experienced.
This package provides a single binary with all commands, and replaces the GNU coreutils and util-linux commands.
%endif
%prep
%autosetup -n coreutils-%version
%global skip_utils "hostname kill more uptime"
%global cargo_flags "--verbose -F feat_selinux"
%build
export CARGOFLAGS=%cargo_flags
export SKIP_UTILS=%skip_utils
export CARGOFLAGS="-vv --verbose"
%make_build PROFILE=release SELINUX_ENABLED=1
%install
export CARGOFLAGS=%cargo_flags
export SKIP_UTILS=%skip_utils
sums=(
md5sum
sha1sum
sha224sum
sha256sum
sha384sum
sha512sum
b2sum
b3sum
sha3sum
sha3sum
sha3-224sum
sha3-256sum
sha3-384sum
sha3-512sum
shake128sum
shake256sum
)
%make_install PROFILE=release MULTICALL=n DESTDIR=%buildroot PREFIX=%_prefix SELINUX_ENABLED=1 PROG_PREFIX=uu- &
%make_install PROFILE=release MULTICALL=n DESTDIR=%buildroot PREFIX=%_prefix SELINUX_ENABLED=1 &
wait
# function to remove files from a file list (used below for excludes)
rm_filelist() {
local filelist=$1
for file in $(cat $filelist); do
echo ":: --> $file"
if [ -f "$file" ]; then
rm -vf "$file"
fi
if [ -f "%buildroot/$file" ]; then
rm -vf "%buildroot/$file"
fi
done
}
%define cmds() $(echo %1{runcon,arch,base{32,64,name,nc},cat,ch{grp,mod,own,root,con},cksum,comm,cp,csplit,cut,date,dd,df,dir{,colors,name},du,echo,env,expand,expr,factor,false,fmt,fold,groups,hashsum,head,host{id},id,install,join,link,ln,logname,ls,mk{dir,fifo,nod,temp},mv,nice,nl,nohup,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm{,dir},seq,shred,shuf,sleep,sort,split,stat,stdbuf,sum,sync,tac,tail,tee,test,timeout,touch,tr,true,truncate,tsort,tty,uname,un{expand,iq,link},users,vdir,wc,who{,ami},yes}%2)
### files-replace
cat <<EOF > files-replace.txt
%cmds %_bindir/ ""
%_bindir/[
%cmds %_datadir/fish/vendor_completions.d/ .fish
%cmds %_mandir/man1/ .1.gz
%cmds %_datadir/zsh/site-functions/_ ""
EOF
sed -i 's@ @\n@g' files-replace.txt
cat <<EOF > files-replace-bash-completion.txt
%cmds %_datadir/bash-completion/completions/ ""
EOF
sed -i "s@%buildroot@/@g" files-replace-bash-completion.txt
sed -i 's@ @\n@g' files-replace-bash-completion.txt
# remove buildroot from paths in files.txt
sed -i "s@%buildroot@/@g" files-replace.txt
%if %{with single}
%make_install PROFILE=release MULTICALL=y DESTDIR=%buildroot PREFIX=%_prefix SELINUX_ENABLED=1 &
%endif
%if %{with replace}
%make_install PROFILE=release MULTICALL=n DESTDIR=%buildroot PREFIX=%_prefix SELINUX_ENABLED=1 &
%endif
for sum in "${sums[@]}"; do
mkdir -p "$RPM_BUILD_ROOT/%_bindir"
ln -svf %_bindir/hashsum "$RPM_BUILD_ROOT/%_bindir/$sum"
echo "%_bindir/$sum" >> files-replace.txt
done
## normal binary
%make_install PROFILE=release MULTICALL=n DESTDIR=%buildroot PREFIX=%_prefix SELINUX_ENABLED=1 PROG_PREFIX=uu- &
%define excludes() $(echo %1{hostname,kill,more,uptime}%2)
cat <<EOF > files.txt
%cmds %_bindir/uu- ""
@@ -155,30 +95,49 @@ cat <<EOF > files.txt
EOF
sed -i 's@ @\n@g' files.txt
# okay, let's symlink some hashsum binaries
for sum in "${sums[@]}"; do
ln -svf %_bindir/uu-hashsum "$RPM_BUILD_ROOT/%_bindir/uu-$sum"
echo "%_bindir/uu-$sum" >> files.txt
done
cat <<EOF > files-exclude.txt
%excludes %_datadir/bash-completion/completions/uu- ""
%excludes %_datadir/fish/vendor_completions.d/uu- .fish
%excludes %_mandir/man1/uu- .1.gz
%excludes %_datadir/zsh/site-functions/_uu- ""
%excludes %_bindir/uu- ""
EOF
sed -i 's@ @\n@g' files-exclude.txt
# remove buildroot from paths in files.txt
sed -i "s@%buildroot@/@g" files.txt
### files-replace
cat <<EOF > files-replace.txt
%cmds %_bindir/ ""
%_bindir/[
%cmds %_datadir/bash-completion/completions/ ""
%cmds %_datadir/fish/vendor_completions.d/ .fish
%cmds %_mandir/man1/ .1.gz
%cmds %_datadir/zsh/site-functions/_ ""
EOF
sed -i 's@ @\n@g' files-replace.txt
cat <<EOF > files-replace-exclude.txt
%excludes %_datadir/bash-completion/completions/ ""
%excludes %_datadir/fish/vendor_completions.d/ .fish
%excludes %_mandir/man1/ .1.gz
%excludes %_datadir/zsh/site-functions/_ ""
%excludes %_bindir/ ""
EOF
sed -i 's@ @\n@g' files-replace-exclude.txt
# remove buildroot from paths in files.txt
sed -i "s@%buildroot@/@g" files-replace.txt
echo "=== Files ==="
cat files.txt
echo "=== Files (Replace) ==="
cat files-replace.txt
####
wait
#echo "=== Removing files ==="
@@ -189,26 +148,13 @@ wait
%doc README.md
%license LICENSE
%if %{with single}
%files single -f files.txt
/usr/bin/coreutils
/usr/share/bash-completion/completions/coreutils
/usr/share/fish/vendor_completions.d/coreutils.fish
/usr/share/man/man1/coreutils.1.gz
/usr/share/zsh/site-functions/_coreutils
%doc README.md
%license LICENSE
%endif
%if %{with replace}
%files replace -f files-replace.txt
%doc README.md
%license LICENSE
%files replace-bash-completion -f files-replace-bash-completion.txt
%endif
%files util-linux -f files-exclude.txt
%files util-linux-replace -f files-replace-exclude.txt
%changelog
%autochangelog
@@ -10,7 +10,7 @@
Name: vala-language-server-nightly
Summary: Language server for the Vala programming language
Version: 0.48.7^%{snapshot_info}
Release: 2%{?dist}
Release: 1%{?dist}
# The entire source is LGPLv2+, except plugins/gnome-builder/vala_langserv.py, which is GPLv3+.
# It is not installed when the "plugins" meson option is set to false.
# Since GNOME Builder 41, the VLS the plugin has been included.
@@ -9,7 +9,7 @@
Name: vala-lint-nightly
Summary: Check Vala code files for code-style errors
Version: 0.1.0^%{snapshot_info}
Release: 2%{?dist}
Release: 1%{?dist}
License: GPL-2.0-or-later
URL: https://github.com/vala-lang/vala-lint