Merge branch 'main' into maintenance/lint

This commit is contained in:
windowsboy111
2023-01-04 12:01:38 +08:00
4 changed files with 14 additions and 24 deletions
+7 -12
View File
@@ -4,16 +4,16 @@ Release: %autorelease
Summary: Flashcard program for using space repetition learning
License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY
URL: https://apps.ankiweb.net/
BuildRequires: python3-devel python3-setuptools python3-beautifulsoup4 python3-waitress python3-decorator python3-markdown python3-protobuf python3-pysocks
BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-requests python3-send2trash python3-certifi python3-pyqt5-sip python3-simplejson
BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command
BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks
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: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
Patch0: 0001-Force-qt5.patch
Patch1: 0001-No-update.patch
Obsoletes: anki <= 2.1.15
BuildArch: noarch
Conflicts: anki
Patch0: 0001-No-update.patch
Patch1: 0001-Force-qt5.patch
%description
Anki is a program designed to help you remember facts (such as words
@@ -26,15 +26,10 @@ git checkout %{version}
%patch0 -p1
%patch1 -p1
cat > .cargo/config.toml << EOF
[target.x86_64-unknown-linux-gnu]
rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"]
EOF
# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
%build
./tools/build
mold -run ./tools/build
%install
for file in out/wheels/*.whl; do
+5 -10
View File
@@ -4,13 +4,13 @@ Release: %autorelease
Summary: Flashcard program for using space repetition learning
License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY
URL: https://apps.ankiweb.net/
BuildRequires: python3-devel python3-setuptools python3-beautifulsoup4 python3-waitress python3-decorator python3-markdown python3-protobuf python3-pysocks
BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-requests python3-send2trash python3-certifi python3-pyqt6 python3-simplejson
BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command
BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks
BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson
BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
Obsoletes: anki <= 2.1.15
BuildArch: noarch
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
Conflicts: anki-qt5
Patch0: 0001-No-update.patch
@@ -24,15 +24,10 @@ git clone https://github.com/ankitects/anki .
git checkout %{version}
%patch0 -p1
cat > .cargo/config.toml << EOF
[target.x86_64-unknown-linux-gnu]
rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"]
EOF
# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki
%build
./tools/build
mold -run ./tools/build
%install
@@ -1,6 +1,6 @@
%global forgeurl https://github.com/KDE/latte-dock/
%global commit af28885b81c5cfa32703ccf6c973341872790855
%global commit 29ae2aa6986f108ee2afb92776b89892854b2b89
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
+1 -1
View File
@@ -1,6 +1,6 @@
Summary: tauOS Icon Theme
Name: tau-hydrogen
Version: 1.0.4
Version: 1.0.5
Release: 1%{?dist}
License: GPLv3
URL: https://github.com/tau-OS/tau-hydrogen