RPM: updates for openmandriva

Signed-off-by: François Andriot <albator78@libertysurf.fr>

4 files changed, 14 insertions, 12 deletions

diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec
index 51c543109..a11c0c654 100644
--- a/redhat/core/tdeaddons/tdeaddons.spec
+++ b/redhat/core/tdeaddons/tdeaddons.spec
@@ -94,7 +94,7 @@ BuildRequires:	SDL-devel
 %endif
 
 # ALSA supportl
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 24090000
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index 463576b35..c1dcce65c 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -576,7 +576,7 @@ BuildRequires:	font-util
 BuildRequires:	bdftopcf
 %endif
 
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 %if 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	drakconf
 %endif
@@ -2683,7 +2683,7 @@ ever launching another application.
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
 %endif
@@ -2705,7 +2705,7 @@ ever launching another application.
 %{tde_mandir}/man1/kfmclient.1*
 %{tde_mandir}/man1/konqueror.1*
 
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 
 %post -n trinity-konqueror
 if [ $1 -eq 1 ]; then
@@ -2906,7 +2906,7 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess
 
 %postun -n trinity-ksmserver
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 fndSession
 %endif
 %endif
@@ -3493,7 +3493,7 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then
   %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
 fi
 
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 # Makes 'media_safelyremove.desktop' an alternative.
 # This allows the use of 'tdeio-umountwrapper' package.
 %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
diff --git a/redhat/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te
index 3278f6ac9..f3bcb40d4 100644
--- a/redhat/core/tdebase/tdm.fc39.te
+++ b/redhat/core/tdebase/tdm.fc39.te
@@ -8,12 +8,13 @@ require {
 	type tmp_t;
 	type unconfined_service_t;
 	type unconfined_t;
+	type var_lib_t;
 	type var_run_t;
 	type xdm_t;
 	class capability2 mac_admin;
 	class dbus send_msg;
-	class fifo_file { getattr open read setattr };
-	class file { getattr lock map open read unlink write };
+	class fifo_file { getattr open read setattr unlink };
+	class file { create entrypoint getattr lock map open read rename unlink write };
 	class lnk_file unlink;
 	class process transition;
 }
@@ -21,8 +22,9 @@ require {
 allow fprintd_t init_t:dbus send_msg;
 allow unconfined_service_t unconfined_t:process transition;
 allow unconfined_t self:capability2 mac_admin;
-allow xdm_t etc_t:file write;
-allow xdm_t tmp_t:fifo_file { getattr open read setattr };
+allow xdm_t etc_t:file { create rename unlink write };
+allow xdm_t tmp_t:fifo_file { getattr open read setattr unlink };
 allow xdm_t tmp_t:file { map open unlink };
 allow xdm_t tmp_t:lnk_file unlink;
+allow xdm_t var_lib_t:file { unlink };
 allow xdm_t var_run_t:file { getattr lock open read write };
diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec
index a67205930..67a60e45f 100644
--- a/redhat/core/tdegraphics/tdegraphics.spec
+++ b/redhat/core/tdegraphics/tdegraphics.spec
@@ -201,7 +201,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 24090000
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel
@@ -227,7 +227,7 @@ BuildRequires: libdrm-devel
 %endif
 
 # OPENEXR support
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 24090000
 BuildRequires:	%{_lib}openexr-devel
 %else
 BuildRequires:	OpenEXR-devel