RHEL/Fedora: add support for MGA2/MDV2011 in many applications

1 files changed, 133 insertions, 94 deletions

diff --git a/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec b/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec
index 4f5062344..d592fda62 100644
--- a/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec
+++ b/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec
@@ -1,16 +1,25 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 %define __arch_install_post %{nil}
 
@@ -26,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.simonzone.com/software/guidance
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kde-guidance-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -43,6 +52,11 @@ BuildRequires:	python-trinity
 BuildRequires:	chrpath
 BuildRequires:	gcc-c++
 
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	python-sip
+BuildRequires:	python-qt
+Requires:	python-qt
+%else
 %if 0%{?rhel} == 5
 BuildRequires:	trinity-PyQt-devel
 BuildRequires:	trinity-sip-devel
@@ -52,13 +66,15 @@ BuildRequires:	PyQt-devel
 BuildRequires:	sip-devel
 Requires:		PyQt
 %endif
+%endif
+
 
 Requires:		python-trinity
 Requires:		%{name}-backends
 Requires:		hwdata
 Requires:		python
 
-%if "%{_prefix}" == "/usr"
+%if "%{tde_prefix}" == "/usr"
 Conflicts:	guidance-power-manager
 Conflicts:	kde-guidance-powermanager
 %endif
@@ -103,97 +119,105 @@ suspend using HAL.
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
 
+# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
+export PYTHONDONTWRITEBYTECODE=
+
 ./setup.py build
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
 export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
+
+# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
+export PYTHONDONTWRITEBYTECODE=
+
 %__rm -rf %{buildroot}
 ./setup.py install \
-	--prefix=%{_prefix} \
+	--prefix=%{tde_prefix} \
 	--root=%{buildroot}
 
 # Fix building directories stored inside .py files
-for f in %{buildroot}%{_datadir}/apps/guidance/*.py; do
+for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
 	%__sed -i "${f}" -e "s|%{buildroot}||g"
 done
 
 ##### MAIN PACKAGE INSTALLATION 
 # install icons to right place
-%__mkdir_p %{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/hi32-app-daemons.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/kcmpartitions.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/hi32-user.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/hi32-display.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/pics/32-wine.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
+%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
 %__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
-	%{buildroot}%{_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
 
 # fix binary-or-shlib-defines-rpath
-chrpath -d %{buildroot}%{tde_libdir}/kcm_*.so
+chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so
 
 # fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{_datadir}/apps/guidance/pics/kdewinewizard.png
+%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
 
 # move python modules in %{python_sitearch}
 %__mkdir_p %{buildroot}%{python_sitearch}/%{name} 
-%__mv -f %{buildroot}%{_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name}
 
 # fix the link properly
-%__rm -f %{buildroot}%{_bindir}/*
-%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{_bindir}/displayconfig
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{_bindir}/grubconfig
+%__rm -f %{buildroot}%{tde_bindir}/*
+#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
+%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
+%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
+%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
+%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
+%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
 
-# put this here since gnome people probably don't want it by default
-%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{_bindir}/displayconfig-restore
+# (obsolete)  put this here since gnome people probably don't want it by default
+#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore
 
 # fix script-not-executable
 %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
 %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
 
-%__mv -f %{buildroot}%{_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{_datadir}/applications/kde/guidance-displayconfig.desktop
+%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop
 
 ##### BACKENDS INSTALLATION
 # install displayconfig-hwprobe.py script
 %__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
 	%{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py
 
-%__mv -f %{buildroot}%{_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
+# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
+%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
+%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
 
-%__rm -f %{buildroot}%{_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{_datadir}/apps/guidance/MonitorsDB
+%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
+%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
 
 
 
 ##### POWERMANAGER INSTALLATION
 # install icon to right place
 %__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
-		%{buildroot}%{_datadir}/icons/hicolor/22x22/apps/power-manager.png
+		%{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
 %__install -D -p -m0644 kde/powermanager/pics/*.png \
-		%{buildroot}%{_datadir}/apps/guidance/pics/
+		%{buildroot}%{tde_datadir}/apps/guidance/pics/
 
 # install desktop file
 %__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		%{buildroot}%{_datadir}/autostart/guidance-power-manager.desktop
+		%{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
 
 # copy python modules in PYSUPPORT_PATH
 %__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
@@ -201,12 +225,12 @@ chrpath -d %{buildroot}%{tde_libdir}/kcm_*.so
 %__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
 
 # generate guidance-power-manager script
-cat <<EOF >%{buildroot}%{_bindir}/guidance-power-manager
+cat <<EOF >%{buildroot}%{tde_bindir}/guidance-power-manager
 #!/bin/sh
 export PYTHONPATH=%{python_sitearch}/%{name}
 %{python_sitearch}/%{name}/guidance-power-manager.py &
 EOF
-chmod +x %{buildroot}%{_bindir}/guidance-power-manager
+chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
 
 # fix script-not-executable
 chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
@@ -227,51 +251,59 @@ for i in `find %{buildroot} -type f`; do
 	fi;
 done
 
+# Removes useless files
 find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
 #find %{buildroot}%{_libdir} -name "*.a" -exec rm -f {} \;
 
+%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyc
+%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyo
+
+# Removes obsolete display config manager
+%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.*
+%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py
+%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py 
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 %post powermanager
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun powermanager
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
-%{_bindir}/displayconfig
-%{_bindir}/displayconfig-restore
-%{_bindir}/grubconfig
-%{_bindir}/mountconfig
-%{_bindir}/serviceconfig
-%{_bindir}/userconfig
-%{_bindir}/wineconfig
-%attr(0644,root,root) %{tde_libdir}/*.so
-%attr(0644,root,root) %{tde_libdir}/*.la
-%{_datadir}/apps/guidance
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/icons/crystalsvg/*/*/*.png
-%{_datadir}/icons/crystalsvg/*/*/*.svg
-%{tde_docdir}/HTML/en/guidance
-%exclude /etc/X11/Xsession.d/40guidance-displayconfig_restore
+#%{tde_bindir}/displayconfig
+#%{tde_bindir}/displayconfig-restore
+%{tde_bindir}/grubconfig
+%{tde_bindir}/mountconfig
+%{tde_bindir}/serviceconfig
+%{tde_bindir}/userconfig
+%{tde_bindir}/wineconfig
+%attr(0644,root,root) %{tde_tdelibdir}/*.so
+%attr(0644,root,root) %{tde_tdelibdir}/*.la
+%{tde_datadir}/apps/guidance/
+%{tde_datadir}/applications/kde/*.desktop
+%{tde_datadir}/icons/crystalsvg/*/*/*.png
+%{tde_datadir}/icons/crystalsvg/*/*/*.svg
 %{python_sitearch}/%{name}/SMBShareSelectDialog.py 
 %{python_sitearch}/%{name}/SimpleCommandRunner.py
 %{python_sitearch}/%{name}/fuser.py
@@ -285,11 +317,21 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{python_sitearch}/%{name}/unixauthdb.py
 %{python_sitearch}/%{name}/userconfig.py
 %{python_sitearch}/%{name}/wineconfig.py
-
-# Removes obsolete display config manager
-%exclude %{tde_libdir}/kcm_displayconfig.*
-%exclude %{python_sitearch}/%{name}/displayconfig.py
-%exclude %{python_sitearch}/%{name}/displayconfigwidgets.py 
+%{tde_tdedocdir}/HTML/en/guidance/
+
+# Files from backends
+%exclude %{tde_datadir}/apps/guidance/vesamodes
+%exclude %{tde_datadir}/apps/guidance/extramodes
+%exclude %{tde_datadir}/apps/guidance/widescreenmodes
+%exclude %{tde_datadir}/apps/guidance/Cards+
+%exclude %{tde_datadir}/apps/guidance/pcitable
+%exclude %{tde_datadir}/apps/guidance/MonitorsDB
+
+# Files from powermanager
+%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
+%exclude %{tde_datadir}/apps/guidance/pics/processor.png
 
 %files -n trinity-guidance-backends
 %defattr(-,root,root,-)
@@ -306,18 +348,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{python_sitearch}/%{name}/xf86misc.py
 %{python_sitearch}/%{name}/xorgconfig.py
 %{python_sitearch}/ixf86misc.so
-%{_datadir}/apps/guidance/vesamodes
-%{_datadir}/apps/guidance/extramodes
-%{_datadir}/apps/guidance/widescreenmodes
-%{_datadir}/apps/guidance/Cards+
-%{_datadir}/apps/guidance/pcitable
-%{_datadir}/apps/guidance/MonitorsDB
+%{tde_datadir}/apps/guidance/vesamodes
+%{tde_datadir}/apps/guidance/extramodes
+%{tde_datadir}/apps/guidance/widescreenmodes
+%{tde_datadir}/apps/guidance/Cards+
+%{tde_datadir}/apps/guidance/pcitable
+%{tde_datadir}/apps/guidance/MonitorsDB
 
 
 
 %files powermanager
 %defattr(-,root,root,-)
-%{_bindir}/guidance-power-manager
+%{tde_bindir}/guidance-power-manager
 %{python_sitearch}/%{name}/MicroHAL.py
 %{python_sitearch}/%{name}/guidance-power-manager.py
 %{python_sitearch}/%{name}/powermanage.py
@@ -326,14 +368,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{python_sitearch}/%{name}/guidance_power_manager_ui.py
 %{python_sitearch}/%{name}/notify.py
 %{python_sitearch}/%{name}/tooltip.py
-%{_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{_datadir}/apps/guidance/pics/ac-adapter.png
-%{_datadir}/apps/guidance/pics/battery*.png
-%{_datadir}/apps/guidance/pics/processor.png
-%{_datadir}/autostart/guidance-power-manager.desktop
-
-%exclude %{python_sitearch}/%{name}/*.pyc
-%exclude %{python_sitearch}/%{name}/*.pyo
+%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%{tde_datadir}/apps/guidance/pics/battery*.png
+%{tde_datadir}/apps/guidance/pics/processor.png
+%{tde_datadir}/autostart/guidance-power-manager.desktop