$ git diff --patch-with-stat --summary 14259153333a8ae364829625b23bb9358ba64242..fef3b1b25a28734d2831ca8d5b6724ca73a446cf
.abf.yml | 2 +-
README.md | 6 ++++++
distro-release-desktop-Plasma6.spec | 19 +++++++++++++------
3 files changed, 20 insertions(+), 7 deletions(-)
create mode 100644 README.md
diff --git a/.abf.yml b/.abf.yml
index b208c90..c6505a3 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- distro-release-23.10.tar.gz: 89d0a68318c4e1d40cee945d32fbc5507566c5c5
+ distro-release-24.03.tar.gz: 8ac9e2a9782d32ac3b386c1caf1bca17d73b444b
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a054c9a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+# distro-release-desktop-Plasma6
+### master branch
+
+`Version:`/`Release:` should be aligned with
+
+https://github.com/OpenMandrivaAssociation/distro-release
diff --git a/distro-release-desktop-Plasma6.spec b/distro-release-desktop-Plasma6.spec
index a5497ca..9dfbbb6 100644
--- a/distro-release-desktop-Plasma6.spec
+++ b/distro-release-desktop-Plasma6.spec
@@ -7,7 +7,7 @@
%define new_vendor OpenMandriva
%define new_product OpenMandriva Lx
# (tpg) use codename from here https://wiki.openmandriva.org/en/policies/codename
-%define new_codename ROME
+%define new_codename Nickel
%define vendor_tag %(echo %{new_vendor} |tr A-Z a-z)
%define distribution_tag %(echo %{new_distribution} |tr A-Z a-z |sed -e 's,[ /!?],_,g')
%define product_tag %(echo %{new_product} |tr A-Z a-z |sed -e 's,[ /!?],_,g')
@@ -71,16 +71,15 @@
Summary: %{new_distribution} release file
Name: distro-release-desktop-Plasma6
-Version: 23.10
+Version: 24.03
# (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: 2
+Release: 1
License: GPLv2+
URL: https://github.com/OpenMandrivaSoftware/distro-release
-#Source0: https://github.com/OpenMandrivaSoftware/distro-release/archive/%{version}/%{name}-%{version}.tar.gz
-Source0: distro-release-%{version}.tar.gz
+Source0: https://github.com/OpenMandrivaSoftware/distro-release/archive/%{?am_i_cooker:refs/heads/master}%{!?am_i_cooker:%{version}/distro-release-%{version}}.tar.gz
Group: System/Configuration/Other
BuildRequires: cmake(ECM)
Requires: distro-release-desktop >= %{version}
@@ -109,11 +108,14 @@ mkdir -p %{buildroot}%{_datadir}/kservices5
mkdir -p %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/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}/plasma/layout-templates/org.om.plasma.desktop.globalMenuPanel/contents
mkdir -p %{buildroot}%{_datadir}/konsole
+mkdir -p %{buildroot}%{_datadir}/applications
-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
+for i in kcmdisplayrc kcmfonts kcminputrc kdeglobals kscreenlockerrc ksplashrc kwinrc startupconfig startupconfigfiles kcm-about-distrorc ksmserverrc kiorc dolphinrc konsolerc klaunchrc plasmashellrc plasma_workspace.notifyrc powermanagementprofilesrc PlasmaUserFeedback plasma-org.kde.plasma.desktop-appletsrc startupconfigkeys; do
install -m 0644 desktops/Plasma6/$i %{buildroot}%{_sysconfdir}/xdg/$i
done
+install -m 0644 desktops/Plasma6/mimeapps.list %{buildroot}%{_datadir}/applications/mimeapps.list
install -m 0644 desktops/Plasma6/plasma-firstsetup.sh %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/plasma-firstsetup.sh
ln -sf %{_sysconfdir}/xdg/plasma-workspace/env/plasma-firstsetup.sh %{buildroot}%{_sysconfdir}/xdg/autostart-scripts/plasma-firstsetup.sh
@@ -130,6 +132,9 @@ install -m 0644 desktops/Plasma6/metadata-omP6panel.desktop %{buildroot}%{_datad
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
+install -m 0644 desktops/Plasma6/org.om.plasma.desktop.globalMenuPanel-layout.js %{buildroot}%{_datadir}/plasma/layout-templates/org.om.plasma.desktop.globalMenuPanel/contents/layout.js
+install -m 0644 desktops/Plasma6/metadata-globalMenu.desktop %{buildroot}%{_datadir}/plasma/layout-templates/org.om.plasma.desktop.globalMenuPanel/metadata.desktop
+install -m 0644 desktops/Plasma6/metadata-globalMenu.json %{buildroot}%{_datadir}/plasma/layout-templates/org.om.plasma.desktop.globalMenuPanel/metadata.json
### DESKTOP PLASMA6 END ###
%files
@@ -138,5 +143,7 @@ install -m 0644 desktops/Plasma6/org.om.plasma6.desktop.defaultPanel-layout.js %
%{_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/layout-templates/org.om.plasma.desktop.globalMenuPanel
%{_datadir}/plasma/look-and-feel/org.openmandriva6.desktop
%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/layout.js
+%{_datadir}/applications/mimeapps.list