From 571a6402593d21eb67afdbd43e0aaa7eca52a7f9 Mon Sep 17 00:00:00 2001 From: madonuko Date: Mon, 19 Aug 2024 15:17:51 +0800 Subject: [PATCH 01/10] feat: add fastfetch and include in comps; update hyfetch --- comps.xml | 1 + ultramarine/hyfetch/hyfetch.spec | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/comps.xml b/comps.xml index 80e63f4..f29d2c9 100644 --- a/comps.xml +++ b/comps.xml @@ -52,6 +52,7 @@ sipa-fonts ibus-mozc mozc + fastfetch diff --git a/ultramarine/hyfetch/hyfetch.spec b/ultramarine/hyfetch/hyfetch.spec index dc4d5d5..6e32556 100644 --- a/ultramarine/hyfetch/hyfetch.spec +++ b/ultramarine/hyfetch/hyfetch.spec @@ -1,9 +1,9 @@ Name: hyfetch -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.4.11 +Release: 1%{?dist} Summary: neofetch with pride flags <3 URL: https://github.com/hykilpikonna/hyfetch -Source0: %{url}/archive/refs/tags/1.4.1.tar.gz +Source0: %{url}/archive/refs/tags/%version.tar.gz License: MIT BuildArch: noarch @@ -33,7 +33,7 @@ Recommends: xwininfo %package -n hyfetch-neofetch Summary: Replacement for neofetch -Obsoletes: neofetch < 7.1.0 +Obsoletes: neofetch Provides: neofetch = 7.3.1-%{release} Requires: bash >= 3.2 Requires: bind-utils From bb0a94172fdb22a68f4438c0065d5ac02e1e3e19 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 19 Aug 2024 15:28:51 +0800 Subject: [PATCH 02/10] fix: hyfetch python-unversioned-command --- ultramarine/hyfetch/hyfetch.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ultramarine/hyfetch/hyfetch.spec b/ultramarine/hyfetch/hyfetch.spec index 6e32556..381cb21 100644 --- a/ultramarine/hyfetch/hyfetch.spec +++ b/ultramarine/hyfetch/hyfetch.spec @@ -13,6 +13,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-wheel BuildRequires: python3-pip +BuildRequires: python-unversioned-command Requires: bash >= 3.2 Requires: bind-utils Requires: catimg From e133f32846459aa75b405100dc86d81295f42bad Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 19 Aug 2024 15:35:06 +0800 Subject: [PATCH 03/10] fix(hyfetch): move files --- ultramarine/hyfetch/hyfetch.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ultramarine/hyfetch/hyfetch.spec b/ultramarine/hyfetch/hyfetch.spec index 381cb21..757820f 100644 --- a/ultramarine/hyfetch/hyfetch.spec +++ b/ultramarine/hyfetch/hyfetch.spec @@ -75,6 +75,8 @@ Recommends: xwininfo %install %make_install +mv %buildroot%_bindir/{hyfetch,neofetch} +mv %buildroot%_mandir/man1/{hyfetch,neofetch}.1.gz #%%pyproject_install #%%pyproject_save_files hyfetch # bash commands From 1bd8691de49f93398595a047320b29d31e5e9c28 Mon Sep 17 00:00:00 2001 From: madonuko Date: Mon, 19 Aug 2024 16:27:02 +0800 Subject: [PATCH 04/10] fix: hyfetch --- ultramarine/hyfetch/hyfetch.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ultramarine/hyfetch/hyfetch.spec b/ultramarine/hyfetch/hyfetch.spec index 757820f..05c2f49 100644 --- a/ultramarine/hyfetch/hyfetch.spec +++ b/ultramarine/hyfetch/hyfetch.spec @@ -34,7 +34,8 @@ Recommends: xwininfo %package -n hyfetch-neofetch Summary: Replacement for neofetch -Obsoletes: neofetch +Obsoletes: neofetch <= 7.3 +Conflicts: hyfetch Provides: neofetch = 7.3.1-%{release} Requires: bash >= 3.2 Requires: bind-utils @@ -56,8 +57,11 @@ Recommends: xwininfo %description -n hyfetch-neofetch %{summary}. %files -n hyfetch-neofetch +%{_bindir}/neowofetch %{_bindir}/neofetch %{_mandir}/man1/neofetch.1.gz +%{_mandir}/man1/neowofetch.1.gz +/usr/lib/python*/site-packages/HyFetch-%version-py*.egg/ %description @@ -74,9 +78,11 @@ Recommends: xwininfo #%%pyproject_wheel %install -%make_install +make install PREFIX=%buildroot%_prefix +make install-doc DESTDIR=%{?buildroot} INSTALL="%{__install} -p" mv %buildroot%_bindir/{hyfetch,neofetch} -mv %buildroot%_mandir/man1/{hyfetch,neofetch}.1.gz +mv %buildroot%_mandir/man1/{hyfetch,neofetch}.1 +sed -i 's@#!/usr/bin/python@#!/usr/bin/python3@' %buildroot%_bindir/neofetch #%%pyproject_install #%%pyproject_save_files hyfetch # bash commands From 9089101413145bcdd5dbcbe3ebf46eafc025df5f Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 19 Aug 2024 16:40:18 +0800 Subject: [PATCH 05/10] fix(hyfetch): files again --- ultramarine/hyfetch/hyfetch.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ultramarine/hyfetch/hyfetch.spec b/ultramarine/hyfetch/hyfetch.spec index 05c2f49..d27e23c 100644 --- a/ultramarine/hyfetch/hyfetch.spec +++ b/ultramarine/hyfetch/hyfetch.spec @@ -83,6 +83,7 @@ make install-doc DESTDIR=%{?buildroot} INSTALL="%{__install} -p" mv %buildroot%_bindir/{hyfetch,neofetch} mv %buildroot%_mandir/man1/{hyfetch,neofetch}.1 sed -i 's@#!/usr/bin/python@#!/usr/bin/python3@' %buildroot%_bindir/neofetch +rm /usr/lib/python*/site-packages/typing_extensions-*.egg #%%pyproject_install #%%pyproject_save_files hyfetch # bash commands From 6aa9e3cb1b03c0a9240a780c8193e2b6e2ab1caa Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 26 Aug 2024 15:22:15 +0800 Subject: [PATCH 06/10] fix(hyfetch): of course I forgot about %buildroot --- ultramarine/hyfetch/hyfetch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/hyfetch/hyfetch.spec b/ultramarine/hyfetch/hyfetch.spec index d27e23c..f3b31ed 100644 --- a/ultramarine/hyfetch/hyfetch.spec +++ b/ultramarine/hyfetch/hyfetch.spec @@ -83,7 +83,7 @@ make install-doc DESTDIR=%{?buildroot} INSTALL="%{__install} -p" mv %buildroot%_bindir/{hyfetch,neofetch} mv %buildroot%_mandir/man1/{hyfetch,neofetch}.1 sed -i 's@#!/usr/bin/python@#!/usr/bin/python3@' %buildroot%_bindir/neofetch -rm /usr/lib/python*/site-packages/typing_extensions-*.egg +rm %buildroot/usr/lib/python*/site-packages/typing_extensions-*.egg #%%pyproject_install #%%pyproject_save_files hyfetch # bash commands From 2071f43b1d464f9e00b98a029852aeb719798a8d Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 26 Aug 2024 15:51:24 +0800 Subject: [PATCH 07/10] fix(hyfetch): rm -rf --- ultramarine/hyfetch/hyfetch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/hyfetch/hyfetch.spec b/ultramarine/hyfetch/hyfetch.spec index f3b31ed..45061a8 100644 --- a/ultramarine/hyfetch/hyfetch.spec +++ b/ultramarine/hyfetch/hyfetch.spec @@ -83,7 +83,7 @@ make install-doc DESTDIR=%{?buildroot} INSTALL="%{__install} -p" mv %buildroot%_bindir/{hyfetch,neofetch} mv %buildroot%_mandir/man1/{hyfetch,neofetch}.1 sed -i 's@#!/usr/bin/python@#!/usr/bin/python3@' %buildroot%_bindir/neofetch -rm %buildroot/usr/lib/python*/site-packages/typing_extensions-*.egg +rm -rf %buildroot/usr/lib/python*/site-packages/typing_extensions-*.egg #%%pyproject_install #%%pyproject_save_files hyfetch # bash commands From 20000a09f8747305d949a26a9b364ee806704e1e Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 26 Aug 2024 21:07:49 +0800 Subject: [PATCH 08/10] remove fastfetch from comps again --- comps.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/comps.xml b/comps.xml index 1e93153..9d05767 100644 --- a/comps.xml +++ b/comps.xml @@ -54,7 +54,6 @@ sipa-fonts ibus-mozc mozc - fastfetch From e67c06358e8b41d2e15a48426d2d1219ced41857 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 26 Aug 2024 21:08:56 +0800 Subject: [PATCH 09/10] fix(hyfetch): use macros --- ultramarine/hyfetch/hyfetch.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ultramarine/hyfetch/hyfetch.spec b/ultramarine/hyfetch/hyfetch.spec index 45061a8..ad67780 100644 --- a/ultramarine/hyfetch/hyfetch.spec +++ b/ultramarine/hyfetch/hyfetch.spec @@ -61,7 +61,8 @@ Recommends: xwininfo %{_bindir}/neofetch %{_mandir}/man1/neofetch.1.gz %{_mandir}/man1/neowofetch.1.gz -/usr/lib/python*/site-packages/HyFetch-%version-py*.egg/ +/usr/lib/python*/site-packages/HyFetch-%version-py%{python3_version}.egg-info +%python3_sitelib/HyFetch-%version- %description From 0dc69ecf111cdc6b98925b81fda21bc13607ab12 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 6 Sep 2024 16:36:28 +0800 Subject: [PATCH 10/10] wtf happened --- ultramarine/hyfetch/hyfetch.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ultramarine/hyfetch/hyfetch.spec b/ultramarine/hyfetch/hyfetch.spec index ad67780..1793f35 100644 --- a/ultramarine/hyfetch/hyfetch.spec +++ b/ultramarine/hyfetch/hyfetch.spec @@ -61,8 +61,7 @@ Recommends: xwininfo %{_bindir}/neofetch %{_mandir}/man1/neofetch.1.gz %{_mandir}/man1/neowofetch.1.gz -/usr/lib/python*/site-packages/HyFetch-%version-py%{python3_version}.egg-info -%python3_sitelib/HyFetch-%version- +%python3_sitelib/HyFetch-%version-py%{python3_version}.egg-info %description