distro-release-desktop-Plasma6 23.09-2 (znver1;x86_64;aarch64) 2023-17572
-9999

Status rejected
Submitter bero [@T] lindev.ch
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/365919
Packages
distro-release-desktop-Plasma6-23.09-2.znver1.source
distro-release-desktop-Plasma6-23.09-2.znver1.binary
distro-release-desktop-Plasma6-23.09-2.x86_64.source
distro-release-desktop-Plasma6-23.09-2.x86_64.binary
distro-release-desktop-Plasma6-23.09-2.aarch64.binary
distro-release-desktop-Plasma6-23.09-2.aarch64.source
Build Date 2023-09-17 00:11:29 +0000 UTC
Last Updated 2023-09-25 13:28:22.810214944 +0000 UTC
?
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
$ git diff --patch-with-stat --summary 8a3b20c4359b5a8a86b54ca70f8e2a3ba846fcd0..ffbb0b93e354e470e81c55328b626af0fc7baf58
 
 .abf.yml                            |  2 +-
 distro-release-desktop-Plasma6.spec | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)
 
diff --git a/.abf.yml b/.abf.yml
index 54f5368..47cc528 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  master.tar.gz: 773d617a746d2737bed312f851f3127da3d0999d
+  distro-release-desktop-Plasma6-23.09.tar.gz: a6110b89ef9ca4a282bc108166745dab7bda84c5
diff --git a/distro-release-desktop-Plasma6.spec b/distro-release-desktop-Plasma6.spec
index b4bf654..93e9793 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
@@ -76,10 +76,10 @@ Version:    23.09
 # 3001 = 3.1
 # 3001 = 3.2 etc.
 DistTag:   %{shorttag}%{distro_tag}
-Release:   1
+Release:   2
 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-desktop-Plasma6-%{?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.560d 15hrs
benbullard79 [@T] cox.netNo Comment.560d 15hrs