Accepting request 1119539 from home:stacheldrahtje:branches:devel:microos:kalpa

- extra script to cater aarch64 with an rpm for MozillaFirefox as 
  a flatpak for it does not exist on flathub.org
- changed spec file to call the right script %ifarch aarch64

OBS-URL: https://build.opensuse.org/request/show/1119539
OBS-URL: https://build.opensuse.org/package/show/devel:microos:kalpa/plasma-branding-Kalpa?expand=0&rev=2
This commit is contained in:
Shawn Dunn 2023-10-27 03:28:16 +00:00 committed by Git OBS Bridge
parent 9923f4ace1
commit f6f9b7a56f
4 changed files with 66 additions and 1 deletions

28
kalpa-firstboot-aarch64 Normal file
View File

@ -0,0 +1,28 @@
#!/bin/sh
dbusRef=$(kdialog --title "openSUSE Kalpa Desktop Firstboot" --geometry 600x400 --progressbar "openSUSE Kalpa Desktop Firstboot" 6)
run_task() {
local step="$1"
local label="$2"
shift 2
qdbus-qt5 "$dbusRef" setLabelText "$label"
if "$@"; then
qdbus-qt5 "$dbusRef" Set "" value "$step"
else
kdialog --error "Operation Failed: $label"
exit 1
fi
}
run_task 1 "Waiting for Internet connection" 'until /usr/bin/ping -q -c 1 flathub.org; do sleep 1; done'
run_task 2 "Adding Flathub Repository" /usr/bin/flatpak remote-add --user --if-not-exists flathub /usr/share/microos-desktop/flathub.flatpakrepo
run_task 3 "Installing KCalc" /usr/bin/flatpak install --user --noninteractive flathub org.kde.kcalc
run_task 4 "Installing Ark" /usr/bin/flatpak install --user --noninteractive flathub org.kde.ark
run_task 5 "Installing KWrite" /usr/bin/flatpak install --user --noninteractive flathub org.kde.kwrite
run_task 6 "Cleaning up" rm -f ~/.config/autostart/kalpa-firstboot.desktop
qdbus-qt5 "$dbusRef" close

View File

@ -0,0 +1,9 @@
[Desktop Entry]
Name=Kalpa Desktop FirstBoot Setup
Comment=Sets up Kalpa Desktop Correctly On FirstBoot
Exec=/usr/bin/kalpa-firstboot-aarch64
Icon=org.kde.konsole
Type=Application
Categories=Utility;System;
Name[en_GB]=startup
Name[en_US]=startup

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 23 06:19:58 UTC 2023 - Natasha Ament <stacheldrahtje@gmail.com>
- extra script to cater aarch64 with an rpm for MozillaFirefox as
a flatpak for it does not exist on flathub.org
- changed spec file to call the right script %ifarch aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 4 15:50:36 UTC 2023 - Shawn Dunn <sfalken@opensuse.org> Wed Oct 4 15:50:36 UTC 2023 - Shawn Dunn <sfalken@opensuse.org>

View File

@ -31,6 +31,8 @@ Source7: distrobox-upgrade-all.service
Source8: distrobox-upgrade-all.timer Source8: distrobox-upgrade-all.timer
Source9: 49-kalpa.rules Source9: 49-kalpa.rules
Source10: 50-kalpa Source10: 50-kalpa
Source11: kalpa-firstboot-aarch64.desktop
Source12: kalpa-firstboot-aarch64
BuildRequires: flatpak BuildRequires: flatpak
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: transactional-update BuildRequires: transactional-update
@ -42,7 +44,7 @@ Requires: transactional-update
Conflicts: gnome-branding-MicroOS Conflicts: gnome-branding-MicroOS
Provides: plasma-branding-MicroOS Provides: plasma-branding-MicroOS
Obsoletes: plasma-branding-MicroOS Obsoletes: plasma-branding-MicroOS
BuildArch: noarch #BuildArch: noarch
%description %description
This package provides default configurations and applications for openSUSE Kalpa. This package provides default configurations and applications for openSUSE Kalpa.
@ -51,8 +53,14 @@ This package provides default configurations and applications for openSUSE Kalpa
%setup -q -T -c %{name}-%{version} %setup -q -T -c %{name}-%{version}
cp -a %{SOURCE0} COPYING cp -a %{SOURCE0} COPYING
cp -a %{SOURCE1} flathub.flatpakrepo cp -a %{SOURCE1} flathub.flatpakrepo
%ifarch aarch64
cp -a %{SOURCE11} kalpa-firstboot-aarch64.desktop
cp -a %{SOURCE12} kalpa-firstboot-aarch64
%endif
%ifnarch aarch64
cp -a %{SOURCE2} kalpa-firstboot.desktop cp -a %{SOURCE2} kalpa-firstboot.desktop
cp -a %{SOURCE3} kalpa-firstboot cp -a %{SOURCE3} kalpa-firstboot
%endif
cp -a %{SOURCE4} 50-desktop.conf cp -a %{SOURCE4} 50-desktop.conf
cp -a %{SOURCE7} distrobox-upgrade-all.service cp -a %{SOURCE7} distrobox-upgrade-all.service
cp -a %{SOURCE8} distrobox-upgrade-all.timer cp -a %{SOURCE8} distrobox-upgrade-all.timer
@ -65,9 +73,16 @@ cp -a %{SOURCE10} 50-kalpa
install -d %{buildroot}%{_datadir}/kalpa install -d %{buildroot}%{_datadir}/kalpa
install -m0644 flathub.flatpakrepo %{buildroot}%{_datadir}/kalpa install -m0644 flathub.flatpakrepo %{buildroot}%{_datadir}/kalpa
install -d %{buildroot}%{_sysconfdir}/skel/.config/autostart install -d %{buildroot}%{_sysconfdir}/skel/.config/autostart
%ifnarch aarch64
install -m0644 kalpa-firstboot.desktop %{buildroot}%{_sysconfdir}/skel/.config/autostart/kalpa-firstboot.desktop install -m0644 kalpa-firstboot.desktop %{buildroot}%{_sysconfdir}/skel/.config/autostart/kalpa-firstboot.desktop
install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_bindir}
install -m0755 kalpa-firstboot %{buildroot}%{_bindir}/kalpa-firstboot install -m0755 kalpa-firstboot %{buildroot}%{_bindir}/kalpa-firstboot
%endif
%ifarch aarch64
install -m0644 kalpa-firstboot-aarch64.desktop %{buildroot}%{_sysconfdir}/skel/.config/autostart/kalpa-firstboot-aarch64.desktop
install -d %{buildroot}%{_bindir}
install -m0755 kalpa-firstboot-aarch64 %{buildroot}%{_bindir}/kalpa-firstboot-aarch64
%endif
install -d %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.conf.d install -d %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.conf.d
install -m644 50-desktop.conf %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.conf.d/50-desktop.conf install -m644 50-desktop.conf %{buildroot}%{_prefix}%{_sysconfdir}/transactional-update.conf.d/50-desktop.conf
install -d %{buildroot}%{_userunitdir} install -d %{buildroot}%{_userunitdir}
@ -98,8 +113,14 @@ install -m0444 49-kalpa.rules %{buildroot}%{_datadir}/polkit-1/rules.d/49-kalpa.
%{_datadir}/kalpa/flathub.flatpakrepo %{_datadir}/kalpa/flathub.flatpakrepo
%dir %{_sysconfdir}/skel/.config %dir %{_sysconfdir}/skel/.config
%dir %{_sysconfdir}/skel/.config/autostart %dir %{_sysconfdir}/skel/.config/autostart
%ifnarch aarch64
%config(noreplace) %{_sysconfdir}/skel/.config/autostart/kalpa-firstboot.desktop %config(noreplace) %{_sysconfdir}/skel/.config/autostart/kalpa-firstboot.desktop
%{_bindir}/kalpa-firstboot %{_bindir}/kalpa-firstboot
%endif
%ifarch aarch64
%config(noreplace) %{_sysconfdir}/skel/.config/autostart/kalpa-firstboot-aarch64.desktop
%{_bindir}/kalpa-firstboot-aarch64
%endif
%dir %{_prefix}%{_sysconfdir}/transactional-update.conf.d %dir %{_prefix}%{_sysconfdir}/transactional-update.conf.d
%{_prefix}%{_sysconfdir}/transactional-update.conf.d/50-desktop.conf %{_prefix}%{_sysconfdir}/transactional-update.conf.d/50-desktop.conf
%{_userunitdir}/distrobox-upgrade-all.service %{_userunitdir}/distrobox-upgrade-all.service