RPM: initial support for OpenMandriva

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

2 files changed, 113 insertions, 18 deletions

diff --git a/redhat/core/tdebase/pamd.tde.omv5000 b/redhat/core/tdebase/pamd.tde.omv5000
new file mode 100644
index 000000000..9e0557414
--- /dev/null
+++ b/redhat/core/tdebase/pamd.tde.omv5000
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       required    pam_env.so
+auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
+auth       include     system-auth
+account    include     system-auth
+password   include     system-auth
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    required    pam_loginuid.so
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index dc1cdf422..463576b35 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -63,10 +63,14 @@ Source1:		%{name}-rpmlintrc
 
 # Pam configuration files for RHEL / Fedora
 %if 0%{?suse_version} == 0
-Source2:		pamd.kdm-trinity%{?dist}
-Source3:		pamd.kdm-trinity-np%{?dist}
-Source4:		pamd.kcheckpass-trinity%{?dist}
-Source5:		pamd.kscreensaver-trinity%{?dist}
+%if 0%{?mdkver}
+Source2:		pamd.tde.omv5000
+%else
+Source2:		pamd.kdm-trinity%{?pamd_suffix}
+Source3:		pamd.kdm-trinity-np%{?pamd_suffix}
+Source4:		pamd.kcheckpass-trinity%{?pamd_suffix}
+Source5:		pamd.kscreensaver-trinity%{?pamd_suffix}
+%endif
 %endif
 
 # openSUSE: configuration file for TDM
@@ -187,6 +191,12 @@ Requires:	mandriva-theme
 %define tde_starticon /usr/share/icons/mandriva.png
 %endif
 
+# OpenMandriva
+%if 0%{?mdkver}
+Requires:	distro-release-theme
+%define tde_bg /usr/share/wallpapers/default.png
+%endif
+
 # PCLINUXOS
 %if 0%{?pclinuxos}
 Requires:	desktop-common-data
@@ -221,19 +231,36 @@ BuildRequires:	fdupes
 BuildRequires:	htdig
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # AUDIOFILE support
 BuildRequires:	audiofile-devel
 
 # ALSA supportl
-BuildRequires:	alsa-lib-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
 
 # RAW1394 support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires:	%{_lib}raw1394-devel
+%else
 BuildRequires:	libraw1394-devel
+%endif
 
 # VORBIS support
-BuildRequires:	libvorbis-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
 
 # GLIB2 support
 BuildRequires:	glib2-devel
@@ -242,9 +269,13 @@ BuildRequires:	glib2-devel
 BuildRequires:	pcre-devel
 
 # SASL support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}sasl-devel
+%else
 BuildRequires:	%{_lib}sasl2-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	cyrus-sasl-devel
 %endif
@@ -283,8 +314,12 @@ BuildRequires:	gamin-devel
 
 # OPENLDAP support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires:	lib64ldap-devel
+%else
 BuildRequires:	openldap-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
 %endif
@@ -306,13 +341,21 @@ BuildRequires:	libsensors4-devel
 %if 0%{?suse_version} >= 1310
 BuildRequires:	udev
 %endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
+%endif
 %define with_tsak 1
 %define with_tdehwlib 1
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # XRANDR support
 #  On RHEL5, xrandr library is too old.
@@ -337,8 +380,12 @@ BuildRequires:	hal-devel >= 0.5
 #  Disabled on RHEL4
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_exr 1
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openexr-devel
+%else
 BuildRequires:	OpenEXR-devel
 %endif
+%endif
 
 # XSCREENSAVER support
 #  RHEL 4: disabled
@@ -396,8 +443,12 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
 BuildRequires: mesaglu-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel
@@ -428,8 +479,12 @@ BuildRequires:	libart_lgpl-devel
 BuildRequires:	samba-common
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}smbclient-devel
+%else
 BuildRequires:	libsmbclient-devel
 %endif
+%endif
 
 # IMAKE
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
@@ -441,8 +496,12 @@ BuildRequires:	imake
 BuildRequires:	xorg-x11-libxkbfile-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}xkbfile-devel
+%else
 BuildRequires:	libxkbfile-devel
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%endif
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7
 BuildRequires:	xkeyboard-config-devel
 %endif
 %endif
@@ -517,16 +576,22 @@ BuildRequires:	font-util
 BuildRequires:	bdftopcf
 %endif
 
+%if 0%{?mdkver} == 0
 %if 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	drakconf
 %endif
+%endif
 
 # LIBCONFIG support
 # Needed for "compton" stuff
 %if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
 %define with_libconfig 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}config-devel
+%else
 BuildRequires:	libconfig-devel
 %endif
+%endif
 
 # KBDLEDSYNC support
 %if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
@@ -556,7 +621,12 @@ BuildRequires:		libnsl-devel
 %endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 # SELINUX support
 %if 0%{?rhel} >= 6 || 0%{?fedora}
@@ -2113,10 +2183,10 @@ already. Most users won't need this.
 %if 0%{?suse_version} >= 1210
 /usr/lib/X11/displaymanagers/
 %endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} >= 7
 /usr/lib/systemd/system/tdm.service
 %endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version}
 %{_datadir}/xsessions/tde.desktop
 %endif
 
@@ -2613,8 +2683,10 @@ 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
 %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
+%endif
 %{tde_datadir}/apps/konqueror/tiles/
 %{tde_datadir}/autostart/konqy_preload.desktop
 %{tde_datadir}/config.kcfg/keditbookmarks.kcfg
@@ -2633,6 +2705,8 @@ ever launching another application.
 %{tde_mandir}/man1/kfmclient.1*
 %{tde_mandir}/man1/konqueror.1*
 
+%if 0%{?mdkver} == 0
+
 %post -n trinity-konqueror
 if [ $1 -eq 1 ]; then
   update-alternatives --install \
@@ -2649,6 +2723,8 @@ if [ $1 -eq 0 ]; then
     %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
 fi
 
+%endif
+
 ##########
 
 %package -n trinity-konqueror-devel
@@ -2830,8 +2906,10 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess
 
 %postun -n trinity-ksmserver
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver} == 0
 fndSession
 %endif
+%endif
 
 # openSUSE 15.0 alternatives
 %if 0%{?suse_version} >= 1500
@@ -3257,7 +3335,7 @@ if [ -d "/usr/include/tirpc" ]; then
   RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}"
 fi
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi
@@ -3329,7 +3407,7 @@ fi
 %if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320
   -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
 %endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver}
   -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \
 %endif
   ..
@@ -3348,7 +3426,7 @@ fi
 # Adds a GDM/KDM/XDM session called 'TDE'
 
 # Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mdkver} || 0%{?mgaversion} >= 6
 %__install -D -m 644 \
 	"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
 	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
@@ -3378,24 +3456,29 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k"
 %else
 %if 0%{?mgaversion} >= 6
 FNDSESSION_EXEC="/usr/sbin/chksession -l"
-%else
-FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
-%endif
 %endif
 EOF
 %endif
+%endif
 
 # PAM configuration files (except openSUSE)
 %if 0%{?suse_version} == 0
+%if 0%{?mdkver}
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
+%else
 %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
 %__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
 %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
 %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
 %endif
+%endif
 
 # TDM configuration
 %__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver}
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
 	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
@@ -3410,11 +3493,13 @@ 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
 # 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"
 %__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives"
 %__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop"
+%endif
 
 # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
 #  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'