diff --git a/anda/apps/legcord/legcord-bin/anda.hcl b/anda/apps/legcord/legcord-bin/anda.hcl deleted file mode 100644 index 5c31d7cdce..0000000000 --- a/anda/apps/legcord/legcord-bin/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "legcord-bin.spec" - } -} diff --git a/anda/apps/legcord/legcord-bin/legcord-bin.spec b/anda/apps/legcord/legcord-bin/legcord-bin.spec deleted file mode 100644 index 0032ed2e87..0000000000 --- a/anda/apps/legcord/legcord-bin/legcord-bin.spec +++ /dev/null @@ -1,92 +0,0 @@ -%define debug_package %nil -%global _build_id_links none - -%ifarch x86_64 -%global src Legcord-%version-linux-x64 -%elifarch aarch64 -%global src Legcord-%version-linux-arm64 -%elifarch armv7l -%global src Legcord-%version-linux-armv7l -%endif - -# Exclude private libraries -%global __requires_exclude libffmpeg.so -%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so - -Name: legcord-bin -Version: 1.1.5 -Release: 1%?dist -License: OSL-3.0 -Summary: Custom lightweight Discord client designed to enhance your experience -URL: https://github.com/Legcord/Legcord -Group: Applications/Internet -Source0: %url/releases/download/v%version/%src.tar.gz -Source1: legcord.png -Source2: https://raw.githubusercontent.com/Legcord/Legcord/v%version/README.md -Requires: xdg-utils -ExclusiveArch: x86_64 aarch64 armv7l -Conflicts: legcord -Conflicts: legcord-nightly -BuildRequires: add-determinism -Obsoletes: armcord < 3.3.2-1 - -%description -Legcord is a custom client designed to enhance your Discord experience -while keeping everything lightweight. - -%prep -%autosetup -n %src - -cat < .legcord.desktop -[Desktop Entry] -Name=Legcord -Comment=%summary -GenericName=Internet Messenger -Type=Application -Exec=%_bindir/legcord -Icon=legcord -Categories=Network;InstantMessaging; -StartupWMClass=legcord -Keywords=discord;armcord;legcord;vencord;shelter;electron; -EOF - -%build - -%install -mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name -cp -a * %buildroot%_datadir/legcord/ -ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord -ln -s %_datadir/legcord %buildroot%_datadir/armcord -chmod +x -R %buildroot%_datadir/legcord/* -chmod 755 %buildroot%_datadir/legcord/legcord -install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop -install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png -install -Dm644 %SOURCE2 %buildroot%_docdir/%name/ - -# HACK: rpm bug for unability to replace existing files on system. -%pre -if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then - echo "Found old %_datadir/armcord directory, removing…" - rm -rf %_datadir/armcord -fi - -%files -%doc README.md -%_datadir/legcord -%_datadir/armcord -%_bindir/legcord -%_datadir/applications/LegCord.desktop -%_datadir/pixmaps/legcord.png - -%changelog -* Mon Oct 21 2024 madonuko - 1.0.2-2 -- Rename to LegCord. - -* Sat Jun 17 2023 madonuko - 3.2.0-2 -- Remove libnotify dependency. -- Fix desktop entry. -- Set as noarch package because there are not binary files. -- Use /usr/share/ instead of /opt/ - -* Sat May 6 2023 madonuko - 3.1.7-1 -- Initial package diff --git a/anda/apps/legcord/legcord-bin/legcord.png b/anda/apps/legcord/legcord-bin/legcord.png deleted file mode 100644 index bb87d3bafe..0000000000 Binary files a/anda/apps/legcord/legcord-bin/legcord.png and /dev/null differ diff --git a/anda/apps/legcord/legcord-bin/update.rhai b/anda/apps/legcord/legcord-bin/update.rhai deleted file mode 100644 index 15bcc4981d..0000000000 --- a/anda/apps/legcord/legcord-bin/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("LegCord/LegCord")); diff --git a/anda/apps/legcord/nightly/anda.hcl b/anda/apps/legcord/nightly/anda.hcl index 819f094492..bfbaa2b100 100644 --- a/anda/apps/legcord/nightly/anda.hcl +++ b/anda/apps/legcord/nightly/anda.hcl @@ -1,9 +1,8 @@ project pkg { - arches = ["x86_64"] rpm { spec = "legcord-nightly.spec" } labels { nightly = 1 } -} \ No newline at end of file +} diff --git a/anda/apps/legcord/nightly/launch.sh b/anda/apps/legcord/nightly/launch.sh deleted file mode 100644 index 3ce4e0c829..0000000000 --- a/anda/apps/legcord/nightly/launch.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -electron=/usr/bin/electron - -CONFIG=${XDG_CONFIG_HOME:-~/.config} -FLAGS="$CONFIG/armcord-flags.conf" - -# Allow users to override command-line options -if [ -f "$FLAGS" ]; then - USER_FLAGS="$(cat "$FLAGS")" -fi - -# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted -"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@" diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 1a35fa5460..ccfb0c2378 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -2,6 +2,12 @@ %global commit_date 20250602 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil +%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ +%ifnarch aarch64 +%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$ +%elifarch aarch64 +%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$ +%endif Name: legcord-nightly Version: %commit_date.%shortcommit @@ -10,67 +16,60 @@ License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience URL: https://github.com/Legcord/Legcord Group: Applications/Internet -Source0: %url/archive/%commit/Legcord-%commit.tar.gz -Source1: launch.sh Packager: Owen -Requires: electron xdg-utils -Provides: armcord-nightly +Requires: xdg-utils Obsoletes: armcord < 3.3.2-1 -Conflicts: legcord-bin Conflicts: legcord -BuildArch: noarch -BuildRequires: anda-srpm-macros pnpm +BuildRequires: anda-srpm-macros pnpm nodejs-npm git-core gcc gcc-c++ make desktop-file-utils zlib-ng-compat-devel %description Legcord is a custom client designed to enhance your Discord experience while keeping everything lightweight. %prep -%autosetup -n Legcord-%commit - -cat < legcord.desktop -[Desktop Entry] -Name=Legcord -Comment=%summary -GenericName=Internet Messenger -Type=Application -Exec=/usr/bin/legcord -Icon=legcord -Categories=Network;InstantMessaging; -StartupWMClass=legcord -Keywords=discord;armcord;legcord;vencord;shelter;electron; -EOF - +%git_clone %{url}.git %{commit} %build -pnpm install --no-frozen-lockfile -pnpm run packageQuick - +pnpm install +pnpm run build +pnpm run package --linux AppImage tar.gz %install -install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar +mkdir -p %{buildroot}%{_datadir}/legcord +%ifarch aarch64 +mv dist/linux-arm64-unpacked/* %{buildroot}%{_datadir}/legcord +%else +mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/legcord +%endif -install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord -install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop -install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png +mkdir -p %{buildroot}%{_bindir} +ln -sf %{_datadir}/legcord/legcord %{buildroot}%{_bindir}/legcord +install -Dm644 dist/.icon-set/icon_16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/legcord.png +install -Dm644 dist/.icon-set/icon_32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/legcord.png +install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/legcord.png +install -Dm644 dist/.icon-set/icon_64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/legcord.png +install -Dm644 dist/.icon-set/icon_128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/legcord.png +install -Dm644 dist/.icon-set/icon_256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/legcord.png +install -Dm644 dist/.icon-set/icon_512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/legcord.png +install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/legcord.png -ln -s %_datadir/legcord %buildroot%_datadir/armcord - -# HACK: rpm bug for unability to replace existing files on system. -%pre -if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then - echo "Found old %_datadir/armcord directory, removing…" - rm -rf %_datadir/armcord -fi +dist/Legcord-*.AppImage --appimage-extract '*.desktop' +desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" squashfs-root/legcord.desktop %files %doc README.md %license license.txt -/usr/bin/legcord -/usr/share/applications/LegCord.desktop -/usr/share/pixmaps/legcord.png -/usr/share/legcord/app.asar -/usr/share/armcord +%{_bindir}/legcord +%{_datadir}/applications/legcord.desktop +%{_datadir}/legcord/ +%{_iconsdir}/hicolor/16x16/apps/legcord.png +%{_iconsdir}/hicolor/32x32/apps/legcord.png +%{_iconsdir}/hicolor/48x48/apps/legcord.png +%{_iconsdir}/hicolor/64x64/apps/legcord.png +%{_iconsdir}/hicolor/128x128/apps/legcord.png +%{_iconsdir}/hicolor/256x256/apps/legcord.png +%{_iconsdir}/hicolor/512x512/apps/legcord.png +%{_iconsdir}/hicolor/1024x1024/apps/legcord.png %changelog * Fri Nov 22 2024 owen - 1.0.2-2 diff --git a/anda/apps/legcord/stable/anda.hcl b/anda/apps/legcord/stable/anda.hcl index a60a7c45fd..d034d3140e 100644 --- a/anda/apps/legcord/stable/anda.hcl +++ b/anda/apps/legcord/stable/anda.hcl @@ -1,5 +1,4 @@ project pkg { - arches = ["x86_64"] rpm { spec = "legcord.spec" } diff --git a/anda/apps/legcord/stable/launch.sh b/anda/apps/legcord/stable/launch.sh deleted file mode 100644 index 3ce4e0c829..0000000000 --- a/anda/apps/legcord/stable/launch.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -electron=/usr/bin/electron - -CONFIG=${XDG_CONFIG_HOME:-~/.config} -FLAGS="$CONFIG/armcord-flags.conf" - -# Allow users to override command-line options -if [ -f "$FLAGS" ]; then - USER_FLAGS="$(cat "$FLAGS")" -fi - -# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted -"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@" diff --git a/anda/apps/legcord/stable/legcord.spec b/anda/apps/legcord/stable/legcord.spec index 68fad2c554..2d6e752d8f 100644 --- a/anda/apps/legcord/stable/legcord.spec +++ b/anda/apps/legcord/stable/legcord.spec @@ -1,25 +1,26 @@ %define debug_package %nil # Exclude private libraries -%global __requires_exclude libffmpeg.so -%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so +%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ +%ifnarch aarch64 +%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$ +%elifarch aarch64 +%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$ +%endif Name: legcord Version: 1.1.5 -Release: 1%?dist +Release: 2%?dist License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience URL: https://github.com/Legcord/Legcord Group: Applications/Internet -Source1: launch.sh Packager: madonuko -Requires: electron xdg-utils -Provides: armcord +Requires: xdg-utils Obsoletes: armcord < 3.3.2-1 -Conflicts: legcord-bin +Obsoletes: legcord-bin < 1.1.5-2 Conflicts: legcord-nightly -BuildArch: noarch -BuildRequires: anda-srpm-macros pnpm +BuildRequires: anda-srpm-macros pnpm nodejs-npm git-core gcc gcc-c++ make desktop-file-utils zlib-ng-compat-devel %description Legcord is a custom client designed to enhance your Discord experience @@ -28,49 +29,47 @@ while keeping everything lightweight. %prep %git_clone %url v%version -cat < legcord.desktop -[Desktop Entry] -Name=Legcord -Comment=%summary -GenericName=Internet Messenger -Type=Application -Exec=/usr/bin/legcord -Icon=legcord -Categories=Network;InstantMessaging; -StartupWMClass=legcord -Keywords=discord;armcord;legcord;vencord;shelter;electron; -EOF - - %build -pnpm install --no-frozen-lockfile -pnpm run packageQuick - +pnpm install +pnpm run build +pnpm run package --linux AppImage tar.gz %install -install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar +mkdir -p %{buildroot}%{_datadir}/legcord +%ifarch aarch64 +mv dist/linux-arm64-unpacked/* %{buildroot}%{_datadir}/legcord +%else +mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/legcord +%endif -install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord -install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop -install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png +mkdir -p %{buildroot}%{_bindir} +ln -sf %{_datadir}/legcord/legcord %{buildroot}%{_bindir}/legcord +install -Dm644 dist/.icon-set/icon_16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/legcord.png +install -Dm644 dist/.icon-set/icon_32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/legcord.png +install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/legcord.png +install -Dm644 dist/.icon-set/icon_64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/legcord.png +install -Dm644 dist/.icon-set/icon_128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/legcord.png +install -Dm644 dist/.icon-set/icon_256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/legcord.png +install -Dm644 dist/.icon-set/icon_512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/legcord.png +install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/legcord.png -ln -s %_datadir/legcord %buildroot%_datadir/armcord - -# HACK: rpm bug for unability to replace existing files on system. -%pre -if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then - echo "Found old %_datadir/armcord directory, removing…" - rm -rf %_datadir/armcord -fi +dist/Legcord-*.AppImage --appimage-extract '*.desktop' +desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" squashfs-root/legcord.desktop %files %doc README.md %license license.txt -/usr/bin/legcord -/usr/share/applications/LegCord.desktop -/usr/share/pixmaps/legcord.png -/usr/share/legcord/app.asar -/usr/share/armcord +%{_bindir}/legcord +%{_datadir}/applications/legcord.desktop +%{_datadir}/legcord/ +%{_iconsdir}/hicolor/16x16/apps/legcord.png +%{_iconsdir}/hicolor/32x32/apps/legcord.png +%{_iconsdir}/hicolor/48x48/apps/legcord.png +%{_iconsdir}/hicolor/64x64/apps/legcord.png +%{_iconsdir}/hicolor/128x128/apps/legcord.png +%{_iconsdir}/hicolor/256x256/apps/legcord.png +%{_iconsdir}/hicolor/512x512/apps/legcord.png +%{_iconsdir}/hicolor/1024x1024/apps/legcord.png %changelog * Mon Oct 21 2024 madonuko - 1.0.2-2