funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 09:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: halloy (#5855) (#5858)

Browse Source 
* fix(halloy): Add anda.hcl and fix update.rhai

* fix: Spec

* fix: Don't build twice

* fix: Licenses

* fix: .desktop file

* fix: Icon install

* chore: Cleanup install steps

* fix: Make the needed directory first

* fix: Missing build deps

* fix: More build deps

* I swear if this is it



* Update halloy.spec



* fix: Install section and files



* fix: Oops accidentally pasted over the directory



* fix: hicolor



* Maybe not -r?



* ?



* fix: Oh I see it now



* fix: Accidentally recursed some macros



* fix: Release



* fix: Revert the glob too



* fix: Typo



---------


(cherry picked from commit 949a7b3c74)

Signed-off-by: Gilver <rockgrub@disroot.org>
Co-authored-by: Gilver <rockgrub@disroot.org>
This commit is contained in:
Raboneko
2025-07-15 00:13:25 -07:00
committed by GitHub
parent 11b2aabc40
commit 291d149b1a
3 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/apps/halloy/anda.hcl
+5
View File
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "halloy.spec"
}
}
anda/apps/halloy/halloy.spec
+30 -28
View File
@@ -1,22 +1,27 @@
# Generated by rust2rpm 27
%bcond check 1
%global appid org.squidowl.halloy
%global crate halloy
Name: halloy
Version: 2025.6
Release: %autorelease
Release: 1%{?dist}
Summary: An open-source IRC client written in Rust, with the Iced GUI library
Packager: Yoong jin <solomoncyj@gmail.com>
SourceLicense: GPL-3.0-or-later
License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND (BSD-3-Clause) AND (BSD-3-Clause OR MIT OR Apache-2.0) AND (BSL-1.0) AND (CC0-1.0) AND (CC0-1.0 OR Apache-2.0) AND (GPL-3.0+ OR BSD-3-Clause) AND (GPL-3.0-or-later) AND (ISC) AND (LGPL-3.0-or-later OR MPL-2.0) AND (MIT) AND (MIT AND (MIT OR Apache-2.0)) AND (MIT OR Apache-2.0) AND ((MIT OR Apache-2.0) AND NCSA) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (MIT OR Apache-2.0 OR BSD-1-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND (MPL-2.0) AND (Unicode-3.0) AND (Unlicense) AND (Unlicense OR MIT) AND (Zlib) AND (Zlib OR Apache-2.0 OR MIT)
License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-3-Clause AND (BSD-3-Clause OR MIT OR Apache-2.0) AND BSL-1.0 AND CC0-1.0 AND (CC0-1.0 OR Apache-2.0) AND (GPL-3.0+ OR BSD-3-Clause) AND (GPL-3.0-or-later) AND ISC AND (LGPL-3.0-or-later OR MPL-2.0) AND MIT AND (MIT AND (MIT OR Apache-2.0)) AND (MIT OR Apache-2.0) AND ((MIT OR Apache-2.0) AND NCSA) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (MIT OR Apache-2.0 OR BSD-1-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND Unicode-3.0 AND Unlicense AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT)
URL: https://github.com/squidowl/halloy
Source: https://github.com/squidowl/halloy/archive/refs/tags/%{Version}.tar.gz
Source: https://github.com/squidowl/halloy/archive/refs/tags/%{version}.tar.gz
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: alsa-lib-devel
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: desktop-file-utils
BuildRequires: openssl-devel
%description %{Summary}
%description
%{summary}.
%prep
%autosetup -n halloy-%{version} -p1
@@ -25,29 +30,17 @@ BuildRequires: desktop-file-utils
%build
%cargo_build
%cargo_license_summary_online
%{cargo_license} > LICENSE.dependencies
%install
#copy logo file to be used in desktop file
cp ./assets/logo.png %{buildroot}/%{_datadir}/icons/halloy.png
%cargo_install
#generate desktop file
desktop-file-edit \
--set-key=Type \
--set-value=Application \
--set-key=Name\
--set-value=Halloy\
--set-key=Comment \
--set-value=%{Summary} \
--set-key=Exec \
--set-value=%{_bindir}/halloy \
--set-key=Icon \
--set-value=%{_datadir}/icons/halloy.png \
--set-key=Terminal \
--set-value=false \
%{buildroot}/%{_datadir}/applications/halloy.desktop
%crate_install_bin
desktop-file-install assets/linux/%{appid}.desktop
install -Dpm644 assets/linux/%{appid}.appdata.xml -t %{buildroot}%{_datadir}/metainfo
mkdir -p %{buildroot}%{_datadir}
cp -r assets/linux/icons -t %{buildroot}%{_datadir}
%cargo_license_summary_online
%{cargo_license_online} > LICENSE.dependencies
%if %{with check}
%check
@@ -61,8 +54,17 @@ desktop-file-edit \
%doc CHANGELOG.md
%doc README.md
%{_bindir}/halloy
%{_datadir}/icons/halloy.png
%{_datadir}/applications/halloy.desktop
%{_datadir}/applications/%{appid}.desktop
%{_datadir}/metainfo/%{appid}.appdata.xml
%{_iconsdir}/hicolor/16x16/apps/%{appid}.png
%{_iconsdir}/hicolor/24x24/apps/%{appid}.png
%{_iconsdir}/hicolor/32x32/apps/%{appid}.png
%{_iconsdir}/hicolor/48x48/apps/%{appid}.png
%{_iconsdir}/hicolor/64x64/apps/%{appid}.png
%{_iconsdir}/hicolor/96x96/apps/%{appid}.png
%{_iconsdir}/hicolor/128x128/apps/%{appid}.png
%{_iconsdir}/hicolor/256x256/apps/%{appid}.png
%{_iconsdir}/hicolor/512x512/apps/%{appid}.png
%changelog
%autochangelog
anda/apps/halloy/update.rhai
+1 -2
View File
@@ -1,2 +1 @@
let ver = gh("squidowl/halloy"); // gets latest version from GitHub
rpm.version(ver); // updates the version in the spec file using `ver`
rpm.version(gh("squidowl/halloy"));