fix build process

2026-06-16 16:40:38 +00:00 · 2026-06-16 17:06:09 +02:00
7 changed files with 10 additions and 125 deletions
@@ -29,15 +29,6 @@ jobs:
          ref: f${{ matrix.version }}
          fetch-depth: 1

-      - name: Setup build environment
-        run: |
-          sed -i 's/.fc%{fedora}/.fcrawhide/g' /usr/lib/rpm/macros.d/macros.dist
-          cat<<EOF >> /etc/dnf/dnf.conf
-          gpgcheck=1
-          install_weak_deps=0
-          max_parallel_downloads=20
-          EOF
-
      - name: Build anda-srpm-macros
        run: |
          mkdir -p anda-build/rpm/rpms
@@ -46,7 +37,7 @@ jobs:
          dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm

      - name: Install build dependencies
-        run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros,appstream-helper}/*.spec anda/{buildsys/anda,tools/subatomic}/*.spec
+        run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/{buildsys/anda,tools/subatomic}/*.spec

      - name: Install Anda
        run: |
@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-    spec = "noctalia-greeter.spec"
-  }
-  labels {
-    nightly = 1
-  }
-}
@@ -1,72 +0,0 @@
-%global ver 1.0.0
-
-%global commit          db60c06b5f6ff5da4d5f1126eff312b2a41ef614
-%global shortcommit     %(c=%{commit}; echo ${c:0:7})
-%global commitdate      20260609
-
-Name:   	noctalia-greeter
-Version:	%{ver}^%{commitdate}git.%{shortcommit}
-Release:	1%{?dist}
-Summary:	A minimal login greeter for greetd that matches the look and feel of Noctalia Shell.
-
-License:    shortcommit
-URL:        https://github.com/noctalia-dev/noctalia-greeter
-Source0:    https://github.com/noctalia-dev/noctalia-greeter/archive/%{commit}/noctalia-greeter-%{commit}.tar.gz
-
-BuildRequires:  cage
-BuildRequires:  dbus
-BuildRequires:  gcc-c++
-BuildRequires:  greetd
-BuildRequires:  just
-BuildRequires:  meson
-BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(glesv2)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(librsvg-2.0)
-BuildRequires:  pkgconfig(libwebp)
-BuildRequires:  pkgconfig(pango)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  polkit
-BuildRequires:  wlr-randr
-
-Requires:       cage
-Requires:       dbus
-Requires:       greetd
-
-Packager:       Cypress Reed <cypress@fyralabs.com>
-
-%description
-Noctalia Greeter is the screen you see before your desktop session starts.
-It lets you pick a user, enter your password, choose a Wayland session, and pick a color scheme - with the same visual language as Noctalia Shell.
-
-%prep
-%autosetup -n noctalia-greeter-%{commit}
-
-%conf
-export LDFLAGS="%{__global_ldflags} -Wl,-z,notext"
-%meson
-
-%build
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%{_bindir}/%{name}
-%{_bindir}/%{name}-apply-appearance
-%{_bindir}/%{name}-print-greetd-config
-%{_bindir}/%{name}-session
-%{_datadir}/%{name}/*
-%{_datadir}/polkit-1/actions/org.noctalia.greeter.apply-appearance.policy
-
-%changelog
-* Tue Jun 09 2026 Cypress Reed <cypress@fyralabs.com>
- Port to terra from Fedora COPR lionheartp/Hyprland
@@ -1,6 +0,0 @@
-rpm.global("commit", get("https://api.github.com/repos/noctalia-dev/noctalia-greeter/commits/main").json().sha);
-if rpm.changed() {
-        rpm.global("ver", gh("noctalia-dev/noctalia-greeter"));
-        rpm.global("commit_date", date());
-        rpm.release();
-}
@@ -9,8 +9,8 @@
 %bcond docs 0

 Name:           LCEVCdec
-Version:        4.2.0
-Release:        1%{?dist}
+Version:        4.1.0
+Release:        2%{?dist}
 Summary:        MPEG-5 LCEVC Decoder
 License:        BSD-3-Clause-Clear
 URL:            https://docs.v-nova.com/v-nova/lcevc/lcevc-sdk-overview
@@ -1,13 +1,11 @@
 Name:           taidan
 Version:        0.2.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Out-Of-Box-Experience (OOBE) and Welcome App
 SourceLicense:  GPL-3.0-or-later AND GPL-2.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 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND Unicode-3.0 AND (Unlicense OR MIT) AND Zlib AND GPL-3.0-or-later AND GPL-2.0-or-later
 URL:            https://github.com/Ultramarine-Linux/taidan
 Packager:       Terra Packaging Team <terra@fyralabs.com>
-Requires:       %name-configs
-Suggests:       %name-default-configs
 Conflicts:      initial-setup
 Requires:       dbus-daemon
 Requires:       (glib2 or (/usr/bin/plasma-apply-colorscheme and kf6-kconfig))
@@ -34,14 +32,6 @@ BuildRequires:  glibc-all-langpacks
 Taidan is a GUI Out-Of-Box-Experience (OOBE) and Welcome App for Ultramarine
 Linux, written in Rust and the Helium toolkit.

-%package default-configs
-Summary:        Default configurations for Taidan
-Provides:       %name-configs
-BuildArch:      noarch
-
-%description default-configs
-This package contains the default configuration files for taidan.
-
 %prep
 %git_clone
 %cargo_prep_online
@@ -61,6 +51,7 @@ DESTDIR=%buildroot ./scripts/install.sh
 %_datadir/polkit-1/rules.d/100-taidan.rules
 %_datadir/taidan/
 %_presetdir/95-taidan.preset
+%_sysconfdir/com.fyralabs.Taidan/
 %_sysconfdir/pam.d/taidan
 %_sysusersdir/taidan.conf
 %_unitdir/taidan-initial-setup.service
@@ -68,10 +59,6 @@ DESTDIR=%buildroot ./scripts/install.sh
 %dir %_prefix/lib/taidan/
 %_prefix/lib/taidan/labwc/*

-%files default-configs
-%config %_sysconfdir/com.fyralabs.Taidan/
-%config %_datadir/taidan/
-
 %changelog
 * Sun Mar 15 2026 Tulip Blossom <tulilirockz@outlook.com>
 - Add dbus-daemon as runtime dependency
@@ -13,8 +13,6 @@ License:          GPL-3.0-or-later AND LGPL-2.1-or-later AND MIT AND GPL-2.0-or-

 Requires:         gtk3 pulseaudio-libs alsa-lib pipewire-jack-audio-connection-kit
 BuildRequires:    gcc g++ gtk3-devel pulseaudio-libs-devel alsa-lib-devel pipewire-jack-audio-connection-kit-devel
-# for lscpu check below
-BuildRequires:    util-linux
 # to install desktop file
 BuildRequires:    desktop-file-utils
 # to generate the icon files
@@ -33,16 +31,11 @@ Packager:         june-fish <june@fyralabs.com>
 %autosetup -n praat.github.io-%{version}

 %build
-# .LE makefile hardcodes little endian
-if [[ "$(lscpu | grep Endian)" == *"Little Endian"* ]]
-then
-  cp makefiles/makefile.defs.linux.pulse-gcc.LE ./makefile.defs
-elif [[ "%{lscpu | grep Endian}" == *"Big Endian"* ]]
-then
-  cp makefiles/makefile.defs.linux.pulse-gcc.BE ./makefile.defs
-fi
-
-%make_build
+%ifarch x86_64
+%make_build PRAAT_ARCH=x64v1
+%else
+%make_build PRAAT_ARCH=native
+%endif

 %install
 install -pDm755 praat %{buildroot}%{_bindir}/praat