$ git diff --patch-with-stat --summary 8a3b20c4359b5a8a86b54ca70f8e2a3ba846fcd0..7c533b27c5e801e5ce15620fe04ecfad40680ad9

 .abf.yml                            |  2 +-
 distro-release-desktop-Plasma6.spec | 36 ++++++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 54f5368..014a1d0 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  master.tar.gz: 773d617a746d2737bed312f851f3127da3d0999d
+  distro-release-23.09.tar.gz: bbc6dc339c0966bc57d68f18fc839077d4a43c67
diff --git a/distro-release-desktop-Plasma6.spec b/distro-release-desktop-Plasma6.spec
index b4bf654..f92ef6c 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
@@ -72,14 +72,13 @@
 Summary:	%{new_distribution} release file
 Name:		distro-release-desktop-Plasma6
 Version:	23.09
-# (tpg) something needs to be done to make comparision 3.0 > 2015.0 came true
-# 3001 = 3.1
-# 3001 = 3.2 etc.
 DistTag:	%{shorttag}%{distro_tag}
-Release:	1
+Release:	3
 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
+#Source0:	https://github.com/OpenMandrivaSoftware/distro-release/archive/%{?am_i_cooker:refs/heads/master}%{!?am_i_cooker:%{version}/%{name}-%{version}}.tar.gz
+Source0:	distro-release-%{version}.tar.gz
 Group:		System/Configuration/Other
 BuildRequires:	cmake(ECM)
 Requires:	distro-release-desktop >= %{version}
@@ -94,7 +93,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 +106,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/look-and-feel
+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
@@ -121,13 +121,21 @@ install -m 0644 desktops/Plasma6/kdeglobals.sh %{buildroot}%{_sysconfdir}/xdg/pl
 ln -sf %{_sysconfdir}/xdg/plasma-workspace/env/kdeglobals.sh %{buildroot}%{_sysconfdir}/xdg/autostart-scripts/kdeglobals.sh
 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.openmandriva6.desktop %{buildroot}%{_datadir}/plasma/look-and-feel/org.openmandriva6.desktop
+# (rugyada)
+install -m 0644 desktops/Plasma6/metadata-omP6panel.desktop %{buildroot}%{_datadir}/plasma/layout-templates/org.om.plasma6.desktop.defaultPanel/metadata.desktop
+install -m 0644 desktops/Plasma6/metadata-omP6panel.json %{buildroot}%{_datadir}/plasma/layout-templates/org.om.plasma6.desktop.defaultPanel/metadata.json
+install -m 0644 desktops/Plasma6/metadata-omP6panel.desktop %{buildroot}%{_datadir}/kservices5/plasma-layout-template-org.om.plasma6.desktop.defaultPanel.desktop
+install -m 0644 desktops/Plasma6/metadata-omP6panel.json %{buildroot}%{_datadir}/kservices5/plasma-layout-template-org.om.plasma6.desktop.defaultPanel.json
+install -m 0644 desktops/Plasma6/org.kde.plasma.desktop-layout.js %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/layout.js
+install -m 0644 desktops/Plasma6/org.om.plasma6.desktop.defaultPanel-layout.js %{buildroot}%{_datadir}/plasma/layout-templates/org.om.plasma6.desktop.defaultPanel/contents/layout.js
 ### 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}/kservices5/plasma-layout-template-org.om.plasma6.desktop.defaultPanel.desktop
+%{_datadir}/kservices5/plasma-layout-template-org.om.plasma6.desktop.defaultPanel.json
+%{_datadir}/plasma/layout-templates/org.om.plasma6.desktop.defaultPanel
+%{_datadir}/plasma/look-and-feel/org.openmandriva6.desktop
+%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/layout.js