distro-release-desktop-Plasma6 23.09-1 (aarch64) 2023-17571
-9999

Status rejected
Submitter bero [@T] lindev.ch
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/365475
Packages
distro-release-desktop-Plasma6-23.09-1.aarch64.source
distro-release-desktop-Plasma6-23.09-1.aarch64.binary
Build Date 2023-09-16 14:17:13 +0000 UTC
Last Updated 2023-09-25 13:28:25.268802823 +0000 UTC
$ git diff --patch-with-stat --summary 8a3b20c4359b5a8a86b54ca70f8e2a3ba846fcd0..235a3fddbcfe1461238f3c2296b804e6ec3fa122

 .abf.yml                            |  2 +-
 distro-release-desktop-Plasma6.spec | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 54f5368..0029386 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  master.tar.gz: 773d617a746d2737bed312f851f3127da3d0999d
+  distro-release-desktop-Plasma6-23.09.tar.gz: a79cd689cfee18e8139ef642d2c9ed752ec47bd9
diff --git a/distro-release-desktop-Plasma6.spec b/distro-release-desktop-Plasma6.spec
index b4bf654..5fea6ac 100644
--- a/distro-release-desktop-Plasma6.spec
+++ b/distro-release-desktop-Plasma6.spec
@@ -15,8 +15,8 @@
 %define new_disturl http://openmandriva.org/
 %define new_bugurl https://github.com/OpenMandrivaAssociation/distribution/issues/
 
-%define am_i_cooker 1
-%undefine am_i_rolling
+%undefine am_i_cooker
+%define am_i_rolling 1
 %if 0%?am_i_cooker
 %define distrib Cooker
 %else
@@ -79,7 +79,7 @@ DistTag:	%{shorttag}%{distro_tag}
 Release:	1
 License:	GPLv2+
 URL:		https://github.com/OpenMandrivaSoftware/distro-release
-Source0:	https://github.com/OpenMandrivaSoftware/distro-release/archive/%{?am_i_cooker:refs/heads/master}%{!?am_i_cooker:%{version}/%{name}-%{version}}.tar.gz
+Source0:	https://github.com/OpenMandrivaSoftware/distro-release/archive/%{version}/%{name}-%{version}.tar.gz
 Group:		System/Configuration/Other
 BuildRequires:	cmake(ECM)
 Requires:	distro-release-desktop >= %{version}
@@ -94,7 +94,7 @@ BuildArch:	noarch
 %{distribution} release file for Plasma 6
 
 %prep
-%autosetup -p1 %{?am_i_cooker:-n distro-release-master}
+%autosetup -p1 -n distro-release-%{?am_i_cooker:master}%{!?am_i_cooker:%{version}}
 
 %install
 ### DESKTOP PLASMA6 ###
@@ -107,7 +107,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/shutdown
 mkdir -p %{buildroot}%{_datadir}/kservices5
 mkdir -p %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents
-mkdir -p %{buildroot}%{_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.defaultPanel/contents
+# mkdir -p %{buildroot}%{_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.defaultPanel/contents
+mkdir -p %{buildroot}%{_datadir}/plasma/layout-templates/org.om.plasma6.desktop.defaultPanel/contents
 mkdir -p %{buildroot}%{_datadir}/konsole
 
 for i in kcmdisplayrc kcmfonts kcminputrc kdeglobals kscreenlockerrc ksplashrc kwinrc startupconfig startupconfigfiles kcm-about-distrorc ksmserverrc kiorc dolphinrc konsolerc klaunchrc plasma_workspace.notifyrc powermanagementprofilesrc PlasmaUserFeedback plasma-org.kde.plasma.desktop-appletsrc startupconfigkeys; do
@@ -122,12 +123,15 @@ ln -sf %{_sysconfdir}/xdg/plasma-workspace/env/kdeglobals.sh %{buildroot}%{_sysc
 install -m 0644 desktops/Plasma6/qtlogging.ini %{buildroot}%{_sysconfdir}/xdg/QtProject/qtlogging.ini
 install -m 0644 desktops/Plasma6/OM.profile %{buildroot}%{_datadir}/konsole/OM.profile
 mkdir -p %{buildroot}%{_datadir}/plasma/look-and-feel
-cp -a desktops/Plasma6/org.openmandriva5.desktop %{buildroot}%{_datadir}/plasma/look-and-feel/org.openmandriva5.desktop
+# cp -a desktops/Plasma6/org.openmandriva5.desktop %{buildroot}%{_datadir}/plasma/look-and-feel/org.openmandriva5.desktop
+cp -a desktops/Plasma6/org.openmandriva6.desktop %{buildroot}%{_datadir}/plasma/look-and-feel/org.openmandriva6.desktop
 
 ### DESKTOP PLASMA6 END ###
 
 %files
 %{_sysconfdir}/xdg/*
 %{_datadir}/konsole/OM.profile
-%{_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.defaultPanel
-%{_datadir}/plasma/look-and-feel/org.openmandriva5.desktop
+# %{_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.defaultPanel
+%{_datadir}/plasma/layout-templates/org.om.plasma6.desktop.defaultPanel
+# %{_datadir}/plasma/look-and-feel/org.openmandriva5.desktop
+%{_datadir}/plasma/look-and-feel/org.openmandriva6.desktop
Not Available

benbullard79 [@T] cox.netNo Comment.154d 18hrs
benbullard79 [@T] cox.netNo Comment.154d 18hrs