RPM: merge redhat directory with master branch

1 files changed, 19 insertions, 94 deletions

diff --git a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
index 0b1312a57..668e97ccb 100644
--- a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdeadmin (version R14.0.0)
+# spec file for package tdeadmin (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,10 +21,14 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg tdeadmin
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%define tde_sbindir %{tde_prefix}/sbin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -39,7 +43,7 @@
 Name:		trinity-%{tde_pkg}
 Summary:	Administrative tools for TDE
 Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/
 
@@ -99,7 +103,6 @@ BuildRequires: pam-devel
 BuildRequires:	lilo
 %endif
 
-Requires: trinity-tdeadmin = %{version}-%{release}
 Requires: trinity-kcron = %{version}-%{release}
 Requires: trinity-kdat = %{version}-%{release}
 Requires: %{name}-kfile-plugins = %{version}-%{release}
@@ -147,20 +150,6 @@ It is a graphical user interface to cron, the UNIX system scheduler.
 %{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
@@ -188,20 +177,6 @@ Main features are:
 %{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
@@ -245,18 +220,6 @@ can be used to manage network devices and settings for each device.
 %{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
@@ -274,24 +237,10 @@ install/remove them.
 %{tde_bindir}/kpackage
 %{tde_tdeappdir}/kpackage.desktop
 %{tde_datadir}/apps/kpackage/
-%{tde_datadir}/config/kpackagerc
+%{tde_confdir}/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
@@ -308,27 +257,13 @@ drag and drop GUI.
 %{tde_bindir}/ksysv
 %{tde_tdeappdir}/ksysv.desktop
 %{tde_datadir}/apps/ksysv/
-%{tde_datadir}/config/ksysvrc
+%{tde_confdir}/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
@@ -354,7 +289,7 @@ A user/group administration tool for TDE.
 %{tde_bindir}/kuser
 %{tde_tdeappdir}/kuser.desktop
 %{tde_datadir}/apps/kuser/
-%{tde_datadir}/config/kuserrc
+%{tde_confdir}/kuserrc
 %{tde_datadir}/config.kcfg/kuser.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kuser.png
 %{tde_tdedocdir}/HTML/en/kuser/
@@ -366,20 +301,6 @@ A user/group administration tool for TDE.
 %config(noreplace) /etc/security/console.apps/kuser
 %endif
 
-%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%{?with_lilo}
@@ -420,13 +341,14 @@ touch /etc/lilo.conf
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %__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"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
 %build
 unset QTDIR QTLIB QTINC
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
@@ -453,7 +375,11 @@ fi
   --with-rpm \
   --with-pam=kde \
   --with-shadow \
-  --with-private-groups
+  --with-private-groups \
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+  --with-first-uid=1000 \
+  --with-first-gid=1000 \
+%endif
 
 %__make %{?_smp_mflags} || %__make
 
@@ -470,7 +396,8 @@ comps="kcron kdat knetworkconf kpackage ksysv kuser"
 			%{buildroot}%{tde_sbindir} \
 			%{buildroot}%{_sbindir}
 
-%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
+%__mkdir_p "%{buildroot}%{tde_confdir}/"
+%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} "%{buildroot}%{tde_confdir}/"
 
 %if 0%{?with_consolehelper}
 # Run kuser through consolehelper
@@ -529,5 +456,3 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0