Compare commits

..

38 commits

Author SHA1 Message Date
0149bbdd5f copr build script 2026-05-29 20:03:26 -03:00
06a6cb1dc9 add qt6-qtsensors-devel
Some checks failed
Build RPMs / build (sonic-interface-libraries.spec) (push) Failing after 11s
Build RPMs / build (sonic-win.spec) (push) Failing after 8s
Build RPMs / build (sonic-workspace.spec) (push) Failing after 7s
2026-05-29 18:33:21 -03:00
c37369728a use https
Some checks failed
Build RPMs / build (sonic-interface-libraries.spec) (push) Failing after 6s
Build RPMs / build (sonic-win.spec) (push) Failing after 6s
Build RPMs / build (sonic-workspace.spec) (push) Failing after 6s
2026-05-29 17:59:11 -03:00
c38cb01745 remove green folder color
Some checks failed
Build RPMs / build (sonic-interface-libraries.spec) (push) Failing after 48s
Build RPMs / build (sonic-win.spec) (push) Failing after 7s
Build RPMs / build (sonic-workspace.spec) (push) Failing after 7s
2026-05-29 17:27:16 -03:00
34a76d3ea5 renamed all files and folders 2026-05-29 17:24:36 -03:00
206bdff6d4 Add SDL2 and delete old files 2026-05-29 17:15:12 -03:00
a0c1dd3e52 implement plasma-login-manager
Some checks failed
Build RPMs / build (sonic-win.spec) (push) Has been cancelled
Build RPMs / build (sonic-workspace.spec) (push) Has been cancelled
Build RPMs / build (sonic-interface-libraries.spec) (push) Has been cancelled
2026-05-28 20:01:27 -03:00
6acb7ea10f fix dependency hell 2026-05-28 18:17:45 -03:00
8ea4b127d7 updates 2026-05-28 15:56:44 -03:00
1c689251d3 AI fixes 2026-05-28 13:33:27 -03:00
3b971a8a07 commit before asking AI 2026-05-27 20:23:53 -03:00
6c3d92642e Add missing klookandfeel and ksecretprompter files
- Add ksecretprompter to main package %files
- Add klookandfeel headers to devel package %files
2026-05-27 16:31:53 -03:00
4c01ef1b9f Escape macros in comments and remove missing devel includes
- %%-escape macros in commented-out file entries to suppress RPM warnings
- Remove colorcorrect/ and plasma5support/ from %files devel (not in 6.6.4)
2026-05-27 16:29:21 -03:00
36ef100836 Fix missing files in sonic-workspace 6.6.4 build
Comment out files/directories no longer present in upstream 6.6.4:
- startplasma-wayland binary
- phonon_platform plugin dir
- plasma5support plugin dir
- plasma5support data dir

Also escape macros in commented Requires to suppress RPM warning.
2026-05-27 16:03:34 -03:00
ea2a9b2d96 Fix mockbuild user missing in chroot
The AlmaLinux 10 mock base config does not create the mockbuild user
inside the chroot, causing 'Failed to resolve user mockbuild' during
SRPM installation. Add explicit user creation via mock --chroot
after --init, and use --scrub=all + --no-clean to prevent stale
state from interfering.
2026-05-27 15:19:17 -03:00
a55dbbd764 Revert "test"
Some checks failed
Build RPMs / build (sonic-win.spec) (push) Has been cancelled
Build RPMs / build (sonic-interface-libraries.spec) (push) Has been cancelled
Build RPMs / build (sonic-workspace.spec) (push) Failing after 13s
This reverts commit 05dc5dfe72.
2026-05-27 15:09:23 -03:00
db62c6ca62 Revert "Build only spec files that were changed in the push"
This reverts commit 7cbd8b6f3d.
2026-05-27 15:08:04 -03:00
f11a33cad0 Revert "Simplify workflow: single job loop over changed specs"
This reverts commit 80b2b48515.
2026-05-27 15:07:55 -03:00
05dc5dfe72 test
Some checks failed
Build RPMs / build (push) Failing after 5s
2026-05-27 18:06:02 +00:00
80b2b48515 Simplify workflow: single job loop over changed specs
Remove the overcomplicated two-job dynamic matrix setup.
Now a single job determines changed specs with git diff and loops
over them sequentially. Much simpler and less error-prone.
2026-05-27 15:03:53 -03:00
020a56822f add knighttime to sonic-workspace
Some checks failed
Build RPMs / changed (push) Failing after 3s
2026-05-27 15:01:19 -03:00
7cbd8b6f3d Build only spec files that were changed in the push
Add a 'changed' job that determines which .spec files were modified
using git diff between push before/after SHAs. The build job now
uses a dynamic matrix (fromJSON) so only changed specs are built.
For workflow_dispatch, all specs are still built.
2026-05-27 15:00:15 -03:00
1e507a71fa Scrub mock chroot before build and force --clean on rebuild
Cancelled jobs can leave the mock chroot in a corrupted state, causing
either 'Failed to resolve user mockbuild' or missing directories like
/var/lib/mock/custom/root/var. Add --scrub=chroot before build and
--clean flag to --rebuild to always start from a fresh chroot.
2026-05-27 14:51:38 -03:00
f8372d9df4 Fix Source0 URL fragment for consistent tarball naming
Some checks failed
Build RPMs / build (sonic-win.spec) (push) Has been cancelled
Build RPMs / build (sonic-interface-libraries.spec) (push) Has been cancelled
Build RPMs / build (sonic-workspace.spec) (push) Failing after 10s
GitHub archive URLs without a filename fragment download as just the
version number (e.g. 6.6.4.tar.gz), which confuses %setup when it tries
to cd into the expected %{name}-%{version} directory. Add
#/%{name}-%{version}.tar.gz suffix to ensure correct local filenames
matching the extracted directory names.
2026-05-27 14:43:16 -03:00
8d06d0d2e8 Fix mock: override root name after include to prevent cache collision
The included alma+epel-10-x86_64.cfg sets config_opts['root'], which
overrides --root custom and causes mock to reuse the old cached chroot
where mockbuild user was missing. Explicitly set config_opts['root'] after
the include to force a fresh custom root.
2026-05-27 14:03:37 -03:00
7ba22c2249 add knighttime
Some checks failed
Build RPMs / build (sonic-workspace.spec) (push) Has been cancelled
Build RPMs / build (sonic-interface-libraries.spec) (push) Has been cancelled
Build RPMs / build (sonic-win.spec) (push) Failing after 47s
2026-05-27 13:45:20 -03:00
7c3341d729 Fix mock: use --root with name instead of -r path for mockbuild user
When using -r /path/to/custom.cfg, mock fails to resolve the mockbuild
user because the config isn't in the standard /etc/mock/ directory.
Copy the generated config to /etc/mock/custom.cfg and reference it with
--root custom instead.
2026-05-27 13:18:54 -03:00
d357aae360 Fix mock: use custom config with extra repos instead of --shell injection
The --init/--shell/--no-clean approach caused a corrupted RPM database
in the chroot. Instead, generate a custom mock config that includes
both the Forgejo package registry and the xlibre Copr repos directly
in config_opts['yum.conf'] before the chroot is created. This is the
standard, reliable way to add extra repositories to mock.
2026-05-27 13:14:52 -03:00
b868b75011 Add Copr xlibre-xserver repo to mock chroot for build deps
sonic-win.spec requires xlibre-xserver-devel which is only available in
the xlibre Copr repository. Download and inject this alongside the
existing Forgejo package registry repo before mock --rebuild.
2026-05-27 13:10:25 -03:00
de70b9ccc0 Fix mock --shell: create /etc/yum.repos.d with mkdir -p before writing repo file 2026-05-27 13:05:00 -03:00
5820feee12 Fix mock repo injection: use --shell instead of --copyin 2026-05-27 13:00:59 -03:00
abae2a5400 add own repo 2026-05-27 12:57:40 -03:00
17dcd83976 Also clean up SRPMS directory after build 2026-05-27 12:52:07 -03:00
20a249a768 Add Forgejo Actions workflow to build RPMs with mock
- Build all three spec files on push via matrix strategy
- Use mock (alma+epel-10-x86_64) for clean isolated buildroot
- Inject Forgejo Package Registry as DNF repo inside mock chroot
- Derive exact SRPM path from rpmspec to avoid stale package matches
- Upload built RPMs to Forgejo Package Registry
- Clean up mock-results after each job (always)
- Bump all specs to 6.6.4-1 and fix Source0 tag (drop v-prefix)
2026-05-27 12:49:53 -03:00
02e484411c use alma+epel 2026-05-27 12:28:14 -03:00
71458745d9 Upgrade to 6.6.4
Some checks failed
Build RPMs / build (sonic-interface-libraries.spec) (push) Failing after 21s
Build RPMs / build (sonic-win.spec) (push) Failing after 22s
Build RPMs / build (sonic-workspace.spec) (push) Failing after 19s
2026-05-27 12:23:52 -03:00
f7e5b1e324 use mock instead 2026-05-27 12:19:07 -03:00
7910fb076b fix runner name 2026-05-27 11:58:52 -03:00
2 changed files with 10 additions and 16 deletions

View file

@ -1,9 +1,9 @@
#!/bin/bash
set -e
COPR="@SonicDE/SonicDE-EL10"
COPR="andersrh/sonicDE"
GIT_URL="https://pc-rytteren.dk/forge/anders/SonicDE-rpmspecs.git"
BRANCH="master"
BRANCH="10_2"
METHOD="rpkg"
# Build order tiers (sequential within tier for dependency safety)

View file

@ -7,7 +7,7 @@
Name: sonic-workspace
Summary: Plasma workspace, applications and applets
Version: 6.6.4
Release: 13%{?dist}
Release: 11%{?dist}
# Automatically converted from old format: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT - review is highly recommended.
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
@ -285,7 +285,7 @@ BuildRequires: pkgconfig(iso-codes)
Requires: iso-codes
# Split of Xorg session into subpackage
Obsoletes: plasma-workspace < %{version}-%{release}
Obsoletes: plasma-workspace <= %{plasma_version}
# khotkeys was dropped
Obsoletes: khotkeys < 6
@ -306,16 +306,13 @@ Conflicts: plasma-workspace-x11
Conflicts: plasma-workspace
Provides: sonic-workspace = %{version}-%{release}
Provides: sonic-workspace%{?_isa} = %{version}-%{release}
Provides: plasma-workspace = %{version}-%{release}
Provides: plasma-workspace%{?_isa} = %{version}-%{release}
%description
Plasma 6 libraries and runtime components
%package common
Summary: Common files for %{name}
Provides: plasma-workspace-common = %{version}-%{release}
Obsoletes: plasma-workspace-common < %{version}-%{release}
Conflicts: plasma-workspace-x11-common
%description common
%{name}.
@ -324,8 +321,6 @@ Summary: Runtime libkworkspace6 library
# when spilt occurred
Obsoletes: plasma-workspace < 5.4.2-2
Obsoletes: libkworkspace5 < %{version}-%{release}
Provides: libkworkspace6 = %{version}-%{release}
Provides: libkworkspace6%{?_isa} = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
%description -n libkworkspace6
%{summary}.
@ -340,8 +335,8 @@ Obsoletes: plasma-workspace < 5.4.2-2
Requires: %{name}-common = %{version}-%{release}
# consider splitting out plasma_packagestructure content later
Provides: plasma-packagestructure = %{version}-%{release}
Provides: plasma-workspace-libs = %{version}-%{release}
Provides: plasma-workspace-libs%{?_isa} = %{version}-%{release}
Conflicts: plasma-workspace-x11-libs
Conflicts: plasma-workspace-libs
Obsoletes: plasma-workspace-libs < %{version}-%{release}
%description libs
%{summary}.
@ -350,8 +345,7 @@ Obsoletes: plasma-workspace-libs < %{version}-%{release}
Summary: Development files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: libkworkspace6%{?_isa} = %{version}-%{release}
Provides: plasma-workspace-devel = %{version}-%{release}
Provides: plasma-workspace-devel%{?_isa} = %{version}-%{release}
Conflicts: plasma-workspace-x11-devel
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
@ -362,6 +356,7 @@ Summary: Documentation and user manuals for %{name}
License: LicenseRef-Callaway-GFDL
# switch to noarch
Obsoletes: plasma-workspace-doc < 5.3.1-2
Conflicts: plasma-workspace-x11-doc
Requires: %{name}-common = %{version}-%{release}
BuildArch: noarch
%description doc
@ -402,9 +397,8 @@ Summary: Fedora look-and-feel for Plasma
Requires: %{name} = %{version}-%{release}
# lockscreen look-and-feel imports qml: QtQuick.VirtualKeyboard
Requires: qt6-qtvirtualkeyboard
Provides: plasma-lookandfeel-fedora = %{version}-%{release}
# when switched to noarch
Obsoletes: plasma-lookandfeel-fedora < %{version}-%{release}
Obsoletes: plasma-lookandfeel-fedora < 5.8.0-5
# https://bugzilla.redhat.com/show_bug.cgi?id=1356890
Obsoletes: f22-kde-theme < 22.4
Obsoletes: f23-kde-theme < 23.1