Mageia 2: add support for MGA2 build in redhat packages

2 files changed, 374 insertions, 58 deletions

diff --git a/redhat/kdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch b/redhat/kdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch
new file mode 100644
index 000000000..77047f5f8
--- /dev/null
+++ b/redhat/kdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch
@@ -0,0 +1,17 @@
+commit d3d702117d757d6c16d0dd41969bc44229123330
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1331690654 -0500
+
+    Remove "More Applications" from TDE menu.
+    This partially resolves bug report 653.
+
+diff --git a/kdat/kdat.desktop b/kdat/kdat.desktop
+index 3aeb7ac..7016d05 100644
+--- a/kdat/kdat.desktop
++++ b/kdat/kdat.desktop
+@@ -89,4 +89,4 @@ X-KDE-StartupNotify=true
+ DocPath=kdat/index.html
+ Terminal=false
+ X-DCOP-ServiceType=Multi
+-Categories=Qt;KDE;System;X-KDE-More;
++Categories=Qt;KDE;System;
diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
index 66c877e97..a4aeac80e 100644
--- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
+++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
@@ -1,19 +1,28 @@
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_sbindir %{_prefix}/sbin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
 
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
 
-Name:			trinity-kdeadmin
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-tdeadmin
 Summary:		Administrative tools for TDE
 Version:		3.5.13
-Release:		4%{?dist}%{?_variant}
+Release:		5%{?dist}%{?_variant}
 
 License:		GPLv2
 Group:			User Interface/Desktops
@@ -25,6 +34,9 @@ URL:			http://www.trinitydesktop.org/
 
 Prefix:			%{_prefix}
 
+Obsoletes:		trinity-kdeadmin < %{version}-%{release}
+Provides:		trinity-kdeadmin = %{version}-%{release}
+
 Source0: kdeadmin-%{version}.tar.gz
 Source1: kuser.pam
 Source2: kuser.pamd
@@ -32,36 +44,342 @@ Source5: kpackagerc
 Source6: ksysvrc
 Source7: kuserrc
 
-# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17
+# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17 [Commit #59394e6b]
 Patch1:		kdeadmin-3.5.13-add_rhel_fedora.patch
-
 # [kdeadmin] Fix linear alphabet string errors [Commit #1f719050]
 Patch2:		bp004-1f719050.diff
-
-Requires: trinity-kdelibs
-Requires: pkgconfig
-Requires: usermode-gtk
+# [tdeadmin] Remove "More Applications" from TDE menu. [Bug #653] [Commit #d3d70211]
+Patch3:		kdeadmin-3.5.13-remove_more_applications_in_menu.patch
 
 BuildRequires: autoconf automake libtool m4
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: rpm-devel
+BuildRequires: pam-devel
+%if 0%{?mgaversion}
+BuildRequires:	lilo
+%endif
+
+Requires: trinity-tdeadmin = %{version}-%{release}
+Requires: trinity-kcron = %{version}-%{release}
+Requires: trinity-kdat = %{version}-%{release}
+Requires: %{name}-kfile-plugins = %{version}-%{release}
+Requires: trinity-knetworkconf = %{version}-%{release}
+Requires: trinity-kpackage = %{version}-%{release}
+Requires: trinity-ksysv = %{version}-%{release}
+Requires: trinity-kuser = %{version}-%{release}
+%if 0%{?mgaversion}
+Requires: trinity-lilo-config = %{version}-%{release}
+%endif
+
 
 %description
-The kdeadmin package includes administrative tools for the Trinity Desktop
+The tdeadmin package includes administrative tools for the Trinity Desktop
 Environment (TDE) including:
 kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
 
+%files
+%defattr(-,root,root,-)
+# The following files are not installed in any binary package.
+# This is deliberate.
+
+# - This file serves no purpose that we can see, and conflicts
+#   with GNOME system tools, so be sure to leave it out.
+%exclude %{tde_libdir}/pkgconfig/*.pc
+
+# Extract from changelog:
+# tdeadmin (4:3.5.5-2) unstable; urgency=low
+#  +++ Changes by Ana Beatriz Guerrero Lopez:
+#  * Removed useless program secpolicy. (Closes: #399426)
+%exclude %{tde_bindir}/secpolicy
+
+# LILO is not provided in RHEL or Fedora
+%if 0%{?rhel} || 0%{?fedora}
+%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
+%endif
+
+##########
+
+%package -n trinity-kcron
+Summary:	The Trinity crontab editor
+Group:		Applications/Utilities
+
+%description -n trinity-kcron
+KCron is an application for scheduling programs to run in the background.
+It is a graphical user interface to cron, the UNIX system scheduler.
+
+%files -n trinity-kcron
+%defattr(-,root,root,-)
+%{tde_bindir}/kcron
+%{tde_tdeappdir}/kcron.desktop
+%{tde_datadir}/apps/kcron/kcronui.rc
+%{tde_datadir}/icons/hicolor/*/apps/kcron.png
+%{tde_tdedocdir}/HTML/en/kcron/
+
+%post -n trinity-kcron
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kcron
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kdat
+Summary:	A Trinity tape backup tool
+Group:		Applications/Utilities
+
+%description -n trinity-kdat
+KDat is a tar-based tape archiver. It is designed to work with multiple
+archives on a single tape.
+
+Main features are:
+* Simple graphical interface to local filesystem and tape contents.
+* Multiple archives on the same physical tape.
+* Complete index of archives and files is stored on local hard disk.
+* Selective restore of files from an archive.
+* Backup profiles for frequently used backups.
+
+%files -n trinity-kdat
+%defattr(-,root,root,-)
+%doc rpmdocs/kdat/*
+%{tde_bindir}/kdat
+%{tde_tdeappdir}/kdat.desktop
+%{tde_datadir}/apps/kdat/
+%{tde_datadir}/icons/hicolor/*/apps/kdat.png
+%{tde_datadir}/icons/locolor/*/apps/kdat.png
+%{tde_tdedocdir}/HTML/en/kdat/
+
+%post -n trinity-kdat
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kdat
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package kfile-plugins
+Summary:	Trinity file metainfo plugins for deb and rpm files
+Group:		Environment/Libraries
+
+%description kfile-plugins
+File metainfo plugins for deb and rpm package files.
+
+%files kfile-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kfile_deb.la
+%{tde_tdelibdir}/kfile_deb.so
+%{tde_tdelibdir}/kfile_rpm.la
+%{tde_tdelibdir}/kfile_rpm.so
+%{tde_datadir}/services/kfile_deb.desktop
+%{tde_datadir}/services/kfile_rpm.desktop
+
+##########
+
+%package -n trinity-knetworkconf
+Summary:	Trinity network configuration tool
+Group:		Applications/Utilities
+
+%description -n trinity-knetworkconf
+This is a TDE control center module to configure TCP/IP settings.  It
+can be used to manage network devices and settings for each device.
+
+%files -n trinity-knetworkconf
+%defattr(-,root,root,-)
+%doc rpmdocs/knetworkconf/*
+%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png
+%{tde_datadir}/apps/knetworkconf/
+%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop
+%{tde_tdelibdir}/kcm_knetworkconfmodule.so
+%{tde_tdelibdir}/kcm_knetworkconfmodule.la
+%{tde_tdedocdir}/HTML/en/knetworkconf/
+
+%post -n trinity-knetworkconf
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+%postun -n trinity-knetworkconf
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
+##########
+
+%package -n trinity-kpackage
+Summary:	Trinity package management tool
+Group:		Applications/Utilities
+
+%description -n trinity-kpackage
+This is a frontend to both .rpm and .deb package formats. It allows you
+to view currently installed packages, browse available packages, and
+install/remove them.
+
+%files -n trinity-kpackage
+%defattr(-,root,root,-)
+%doc rpmdocs/kpackage/*
+%{tde_bindir}/kpackage
+%{tde_tdeappdir}/kpackage.desktop
+%{tde_datadir}/apps/kpackage/
+%{tde_datadir}/config/kpackagerc
+%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
+%{tde_tdedocdir}/HTML/en/kpackage/
+
+%post -n trinity-kpackage
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kpackage
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-ksysv
+Summary:	Trinity SysV-style init configuration editor
+Group:		Applications/Utilities
+
+%description -n trinity-ksysv
+This program allows you to edit your start and stop scripts using a
+drag and drop GUI.
+
+%files -n trinity-ksysv
+%defattr(-,root,root,-)
+%doc rpmdocs/ksysv/*
+%{tde_bindir}/ksysv
+%{tde_tdeappdir}/ksysv.desktop
+%{tde_datadir}/apps/ksysv/
+%{tde_datadir}/config/ksysvrc
+%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png
+%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
+%{tde_datadir}/mimelnk/application/x-ksysv.desktop
+%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
+%{tde_tdedocdir}/HTML/en/ksysv/
+
+%post -n trinity-ksysv
+for icon_theme in crystalsvg hicolor  ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-ksysv
+for icon_theme in crystalsvg hicolor  ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%package -n trinity-kuser
+Summary:	Trinity user/group administration tool
+Group:		Applications/Utilities
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	usermode-gtk
+%else
+Requires:	usermode
+%endif
+
+%description -n trinity-kuser
+A user/group administration tool for TDE.
+
+%files -n trinity-kuser
+%defattr(-,root,root,-)
+%doc rpmdocs/kuser/*
+%{tde_bindir}/kuser
+%{tde_sbindir}/kuser
+%{tde_tdeappdir}/kuser.desktop
+%{tde_datadir}/apps/kuser/
+%{tde_datadir}/config/kuserrc
+%{tde_datadir}/config.kcfg/kuser.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kuser.png
+%{tde_tdedocdir}/HTML/en/kuser/
+%config(noreplace) /etc/pam.d/kuser
+%config(noreplace) /etc/security/console.apps/kuser
+
+%post -n trinity-kuser
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+%postun -n trinity-kuser
+for icon_theme in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+
+##########
+
+%if 0%{?mgaversion}
+%package -n trinity-lilo-config
+Summary:	Trinity frontend for lilo configuration
+Group:		Applications/Utilities
+Requires:	trinity-kcontrol
+Requires:	trinity-tdebase-bin
+Requires:	lilo
+
+%description -n trinity-lilo-config
+lilo-config is a TDE based frontend to the lilo boot manager configuration.
+It runs out of the TDE Control Center.
+
+If you want to use the menu entry to launch lilo-config, you need to install
+tdebase-bin since it uses the tdesu command to gain root privileges.
+
+%files -n trinity-lilo-config
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_lilo.la
+%{tde_tdelibdir}/kcm_lilo.so
+%{tde_tdeappdir}/lilo.desktop
+%{tde_tdedocdir}/HTML/en/lilo-config/
+%endif
+
+##########
+
+
+
 
 %prep
 %setup -q -n kdeadmin
 
 %patch1 -p1 -b .knetworkconf
+%patch2 -p1
+%patch3 -p1
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -70,42 +388,50 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
+   --exec-prefix=%{_prefix} \
+   --bindir=%{tde_bindir} \
+   --sbindir=%{tde_sbindir} \
+   --libdir=%{tde_libdir} \
+   --datadir=%{tde_datadir} \
+   --includedir=%{tde_tdeincludedir} \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
    --with-rpm \
+   --with-pam=kde \
+   --with-shadow \
+   --with-private-groups \
    --enable-final \
    --enable-closure \
    --with-private-groups \
-   --with-extra-includes=%{_includedir}/tqt
+   --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 comps="kcron kdat knetworkconf kpackage ksysv kuser"
-%__mkdir_p	%{buildroot}%{_datadir}/config \
+%__mkdir_p	%{buildroot}%{tde_datadir}/config \
 			%{buildroot}/etc/security/console.apps \
 			%{buildroot}/etc/pam.d \
-			%{buildroot}%{_sbindir}
+			%{buildroot}%{tde_sbindir}
 
-%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/
+%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
 
 # Run kuser through consolehelper
 %__install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
 %__install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
-%__mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir}
-%__ln_s consolehelper %{buildroot}%{_bindir}/kuser
+%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
+%__ln_s consolehelper %{buildroot}%{tde_bindir}/kuser
 
 # locale's
-%find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d %{buildroot}/$HTML_DIR ]; then
 for lang_dir in %{buildroot}/$HTML_DIR/* ; do
@@ -129,46 +455,19 @@ for dir in $comps ; do
   done
 done
 
-%post
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%doc rpmdocs/*
-%{_bindir}/*
-%{_sbindir}/*
-%config(noreplace) /etc/pam.d/*
-%config(noreplace) /etc/security/console.apps/*
-%{_datadir}/config*/*
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/apps/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/service*/*.desktop
-%{tde_libdir}/*
-%{_libdir}/pkgconfig/*.pc
-
 
 %changelog
+* Fri Jul 13 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Renames 'trinity-kdeadmin' to 'trinity-tdeadmin'
+- Split in several packages
+- Fix configure options
+- Remove "More Applications" from TDE menu. [Bug #653] [Commit #d3d70211]
+
 * Thu Apr 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Fix knetworkconf support for Fedora, adds Fedora 17
 - Fix linear alphabet string errors [Commit #1f719050]