17 files changed, 467 insertions, 51 deletions

diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
index d08ac8647..c29fa5c9b 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.12.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
@@ -122,13 +122,13 @@ Requires: %{name}-libs = %{version}-%{release}
 # set in k3brc too 
 %patch4 -p1 -b .manualbufsize
 %patch102 -p0 -b .kde#156684
-%patch105 -p1 -b .hidden
 %patch106 -p1 -b .desktopfile
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
+%patch105 -p1 -b .hidden
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
index 8793f5d53..4b6fcfe1a 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 4
+%define release 5
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -18,6 +18,7 @@ Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the KDE sound system
+Group:		System Environment/Daemons 
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -54,8 +55,9 @@ playing a wave file with some effects.
 
 
 %package devel
-Requires:	%{name}
+Group:		Development/Libraries
 Summary:	%{name} - Development files
+Requires:	%{name} = %{version}-%{release}
 %if "%{?_prefix}" == "/usr"
 Obsoletes:	arts-devel
 %endif
@@ -121,6 +123,9 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
+- Add "Group" field
+
 * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
 - Import to GIT
 - Removes cmake stuff, build with autotools only
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
index 7532187c3..79102f528 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 7
+%define release 8
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -24,6 +24,7 @@ Version:	%{version}
 Release:	%{release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity QT Interface
+Group:		System Environment/Libraries
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -42,8 +43,9 @@ BuildRequires:	pth-devel
 Trinity QT Interface
 
 %package devel
-Requires:	%{name}
+Group:		Development/Libraries
 Summary:	%{name} - Development files
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Development files for %{name}
@@ -85,6 +87,9 @@ CFLAGS=$( pkg-config --libs qt-mt )
 
 
 %changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
+- Add "Group"
+
 * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
 - Import to GIT
 - Removes cmake stuff, build with autotools only
diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec
index c01e6d976..6ce1809ab 100644
--- a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec
+++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec
@@ -89,6 +89,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %install
+export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %make_install
 
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec
index addc8d84a..a63d01271 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec
@@ -92,6 +92,10 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
+%if 0%{?fedora} > 0
+export CXXFLAGS="${CXXFLAGS} -fpermissive"
+%endif
+
 %configure \
   --includedir=%{_includedir}/kde \
   --disable-rpath \
@@ -105,6 +109,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %install
+export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %make_install
 
diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec
index 95dbad557..83f0aafe0 100644
--- a/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec
+++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec
@@ -76,6 +76,10 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
+%if 0%{?fedora} > 0
+export CXXFLAGS="${CXXFLAGS} -fpermissive"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -83,7 +87,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
    --with-rpm \
    --enable-final \
    --with-private-groups \
-  --with-extra-includes=%{_includedir}/tqt
+   --with-extra-includes=%{_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 79f260e10..9616f45d6 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 6
+%define release 10
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -21,6 +21,7 @@ Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity KDE Base Programs
+Group:		User Interface/Desktops
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -477,6 +478,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libkdeinit_*.*
 
 %changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-10
+- Add "Group" field
+
 * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
 - Import to GIT
 
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
index 2dcdc061f..fe7565d72 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
@@ -121,6 +121,7 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
   --disable-dependency-tracking \
   --with-extra-libs=%{_libdir} \
   --with-pythondir=%{_usr} \
+  --enable-closure \
   --disable-final \
   %{?_with_java} %{!?_with_java:--without-java} \
   %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.12.spec b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
index ea7d9774f..dd7df51eb 100644
--- a/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
+++ b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
@@ -90,7 +90,7 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -q -n kdeedu
 
-%if 0%{?rhel} > 1
+%if 0%{?rhel} > 0
 rm -rf doc/kgeography kgeography
 perl -pi -e "s|kgeography||" subdirs
 %endif
@@ -108,6 +108,10 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 # Fix link with kparts
 export CXXFLAGS="${CXXFLAGS} -lkparts"
 
+%if 0%{?fedora}
+export CXXFLAGS="${CXXFLAGS} -fpermissive"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -116,6 +120,7 @@ export CXXFLAGS="${CXXFLAGS} -lkparts"
    --disable-debug \
    --disable-warnings \
    --enable-final \
+   --enable-closure \
    --includedir=%{_includedir}/kde \
    --disable-ocamlsolver \
    --with-extra-includes=%{_includedir}/tqt
@@ -126,6 +131,7 @@ export CXXFLAGS="${CXXFLAGS} -lkparts"
 
 
 %install
+export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %make_install
 
diff --git a/redhat/kdegames/trinity-kdegames-3.5.12.spec b/redhat/kdegames/trinity-kdegames-3.5.12.spec
index 8ac91240b..1c382332f 100644
--- a/redhat/kdegames/trinity-kdegames-3.5.12.spec
+++ b/redhat/kdegames/trinity-kdegames-3.5.12.spec
@@ -81,6 +81,10 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
+%if 0%{?fedora} > 0
+export CXXFLAGS="${CXXFLAGS} -lkio"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -96,6 +100,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %install
+export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %make_install
 
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
index 4604f78d8..b81d77cb5 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 5
+%define release 6
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -21,6 +21,7 @@ Version:	%{version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity KDE Libraries
+Group:		System Environment/Libraries
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -50,24 +51,35 @@ Obsoletes:	kdelibs3
 %endif
 
 %description
-Libraries for the Trinity K Desktop Environment
+Libraries for the Trinity Desktop Environment:
+KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
+kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
+kspell (spelling checker), jscript (javascript), kab (addressbook),
+kimgio (image manipulation).
+
 
 %package devel
-Requires:	%{name}
 Summary:	%{name} - Development files
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 %if "%{?_prefix}" == "/usr"
 Obsoletes:	kdelibs3-devel
 %endif
 
 %description devel
-Development files for %{name}
+This package includes the header files you will need to compile
+applications for TDE.
 
 %package apidocs
-Requires:	%{name}
+Group:		Development/Libraries
 Summary:	%{name} - API documentation
+Requires:	%{name} = %{version}-%{release}
+%if "%{?_prefix}" == "/usr"
+Obsoletes:	kdelibs3-apidocs-devel
+%endif
 
 %description apidocs
-This package includes the KDE 3 API documentation in HTML
+This package includes the TDE API documentation in HTML
 format for easy browsing
 
 %prep
@@ -249,6 +261,9 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
+- Add "Group" field
+
 * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
 - Import to GIT
 - Removes cmake stuff, build with autotools only
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
index 05a076bd4..16023a89d 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
@@ -139,6 +139,10 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
+%if 0%{?fedora} > 0
+export CXXFLAGS="${CXXFLAGS} -lDCOP"
+%endif
+
 %configure  \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -164,6 +168,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %install
+export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot} 
 
 %make_install
@@ -230,7 +235,6 @@ for f in crystalsvg hicolor locolor ; do
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -238,10 +242,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %post extras-libs -p /sbin/ldconfig
 
 %postun extras-libs -p /sbin/ldconfig
-%endif
 
 %post extras
-%{?libs:/sbin/ldconfig}
+/sbin/ldconfig
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -249,7 +252,7 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun extras
-%{?libs:/sbin/ldconfig}
+/sbin/ldconfig
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
diff --git a/redhat/kdeutils/kcmlaptoprc b/redhat/kdeutils/kcmlaptoprc
new file mode 100644
index 000000000..66d400f5d
--- /dev/null
+++ b/redhat/kdeutils/kcmlaptoprc
@@ -0,0 +1,114 @@
+[AcpiDefault]
+EnableHibernate=true
+EnablePerformance=false
+EnableStandby=true
+EnableSuspend=true
+EnableThrottle=false
+
+[BatteryCritical]
+Brightness=false
+BrightnessValue=255
+CriticalValPercent=3
+CriticalValTime=5
+Hibernate=false
+Logout=false
+Notify=true
+Performance=false
+PerformanceValue=
+PlaySound=false
+PlaySoundPath=
+RunCommand=false
+RunCommandPath=
+Shutdown=true
+Standby=false
+Suspend=false
+SystemBeep=true
+Throttle=false
+ThrottleValue=00%
+TimeBasedAction=true
+
+[BatteryDefault]
+BlankSaver=false
+ChargePixmap=laptop_charge
+Enable=true
+NoBatteryPixmap=laptop_nobattery
+NoChargePixmap=laptop_nocharge
+NotifyMe=false
+Poll=20
+
+[BatteryLow]
+Brightness=false
+BrightnessValue=255
+Hibernate=false
+Logout=false
+LowValPercent=7
+LowValTime=15
+Notify=true
+Performance=false
+PerformanceValue=
+PlaySound=false
+PlaySoundPath=
+RunCommand=false
+RunCommandPath=
+Shutdown=false
+Standby=false
+Suspend=false
+SystemBeep=true
+Throttle=false
+ThrottleValue=00%
+TimeBasedAction=true
+
+[LaptopButtons]
+LidBrightness=0
+LidBrightnessEnabled=false
+LidPerformance=
+LidPerformanceEnabled=false
+LidSuspend=0
+LidThrottle=00%
+LidThrottleEnabled=false
+PowerBrightness=0
+PowerBrightnessEnabled=false
+PowerPerformance=
+PowerPerformanceEnabled=false
+PowerSuspend=0
+PowerThrottle=
+PowerThrottleEnabled=false
+
+[LaptopPower]
+LavEnabled=false
+NoLavEnabled=false
+NoPowerBrightness=0
+NoPowerBrightnessEnabled=false
+NoPowerLav=0
+NoPowerPerformance=
+NoPowerPerformanceEnabled=false
+NoPowerSuspend=0
+NoPowerThrottle=00%
+NoPowerThrottleEnabled=false
+NoPowerWait=5
+PowerBrightness=255
+PowerBrightnessEnabled=false
+PowerLav=0
+PowerPerformance=
+PowerPerformanceEnabled=false
+PowerSuspend=0
+PowerThrottle=00%
+PowerThrottleEnabled=false
+PowerWait=20
+
+[ProfileDefault]
+BrightnessOffLevel=160
+BrightnessOnLevel=255
+EnableBrightnessOff=0
+EnableBrightnessOn=0
+EnablePerformanceOff=0
+EnablePerformanceOn=0
+EnableThrottleOff=0
+EnableThrottleOn=0
+PerformanceOffLevel=
+PerformanceOnLevel=
+ThrottleOffLevel=00%
+ThrottleOnLevel=00%
+
+[SoftwareSuspendDefault]
+EnableHibernate=false
diff --git a/redhat/kdeutils/kdf-3.0.2-label.patch b/redhat/kdeutils/kdf-3.0.2-label.patch
new file mode 100644
index 000000000..6ea620472
--- /dev/null
+++ b/redhat/kdeutils/kdf-3.0.2-label.patch
@@ -0,0 +1,13 @@
+--- kdeutils-3.0.3/kdf/disklist.cpp.label	2002-08-19 14:36:13.000000000 +0200
++++ kdeutils-3.0.3/kdf/disklist.cpp	2002-08-19 14:37:34.000000000 +0200
+@@ -163,8 +163,9 @@
+     while (! t.eof()) {
+       s=t.readLine();
+       s=s.simplifyWhiteSpace();
+-      if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) ) {
++      if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) && (s.find("LABEL")!=0) ) {
+                // not empty or commented out by '#'
++	       // skip LABEL entries as long as kdf can't handle them properly
+ 	//	kdDebug() << "GOT: [" << s << "]" << endl;
+ 	disk = new DiskEntry();// Q_CHECK_PTR(disk);
+         disk->setMounted(FALSE);
diff --git a/redhat/kdeutils/klaptop_acpi_helper.console b/redhat/kdeutils/klaptop_acpi_helper.console
new file mode 100644
index 000000000..6a738ec88
--- /dev/null
+++ b/redhat/kdeutils/klaptop_acpi_helper.console
@@ -0,0 +1 @@
+FALLBACK=true
diff --git a/redhat/kdeutils/klaptop_acpi_helper.pam b/redhat/kdeutils/klaptop_acpi_helper.pam
new file mode 100644
index 000000000..321c2eefb
--- /dev/null
+++ b/redhat/kdeutils/klaptop_acpi_helper.pam
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth       sufficient	pam_rootok.so
+auth       required	pam_console.so
+account    required	pam_permit.so
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
index 4c73139e6..ef98b3c56 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 5
+%define release 6
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -13,6 +13,7 @@
 # TDE 3.5.12 specific building variables
 BuildRequires: autoconf automake libtool m4
 %define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/kde3
 
 
@@ -20,34 +21,93 @@ Name:		trinity-kdeutils
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Summary:	TDE Utilities
+Group:		Applications/System
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Trinity KDE Utilities
+URL:		http://www.trinitydesktop.org/
+
 Prefix:		%{_prefix}
 
 Source0:	kdeutils-%{version}.tar.gz
+Source1: klaptop_acpi_helper.pam
+Source2: klaptop_acpi_helper.console
+Source3: kcmlaptoprc
 
 BuildRequires:	tqtinterface
 BuildRequires:	trinity-arts
 BuildRequires:	trinity-kdelibs
 
+# RedHat / Fedora legacy patches
+Patch1: kdf-3.0.2-label.patch
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Requires:	tqtinterface
 Requires:	trinity-kdelibs
 
-%description
-Trinity KDE Utilities.
+BuildRequires: gettext
+BuildRequires: net-snmp-devel
+BuildRequires: python-devel
+BuildRequires: gmp-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: libXScrnSaver-devel libXtst-devel
+%endif
+BuildRequires: xmms-devel
 
+%define superkaramba_ver 0.39
+Obsoletes: superkaramba < 0:%{superkaramba_ver}
+Provides:  superkaramba = 0:%{superkaramba_ver}
 
+%description
+Utilities for the Trinity Desktop Environment, including:
+  * ark (tar/gzip archive manager)
+  * kcalc (scientific calculator)
+  * kcharselect (character selector)
+  * kdepasswd (change password)
+  * kdessh (ssh front end)
+  * kdf (view disk usage)
+  * kedit (simple text editor)
+  * kfloppy (floppy formatting tool)
+  * kgpg (gpg gui)
+  * khexedit (hex editor)
+  * kjots (note taker)
+  * kregexpeditor (regular expression editor)
+  * ktimer (task scheduler)
+  * kwikdisk (removable media utility)
+
+# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
 %package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
+Summary: Development files for %{name} 
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-extras = %{version}-%{release}
+Requires: trinity-kdelibs-devel
 %description devel
 Development files for %{name}.
 
+%package extras
+Summary: Extras packages from %{name} 
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
+Requires: pm-utils
+%endif
+Requires: usermode
+%description extras
+More Utilities for the K Desktop Environment:
+ * kmilo
+ * ksim (system information monitor);
+ * klaptopdaemon (battery monitoring and management for laptops);
+
 
 %prep
 %setup -q -n kdeutils
 
+%patch1 -p1 -b .label
+
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
 %__make -f admin/Makefile.common
@@ -58,54 +118,224 @@ export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 %configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-dependency-tracking \
-  --disable-debug --disable-warnings --enable-final \
-  --with-xinerama \
-  --with-extra-includes=%{_includedir}/tqt \
-  --enable-closure
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+   --disable-rpath \
+   --disable-debug --disable-warnings \
+   --enable-final \
+   --includedir=%{tde_includedir} \
+   --with-snmp \
+   --with-xscreensaver \
+   --with-extra-includes=%{_includedir}/tqt \
+   --enable-closure
 
 %__make %{?_smp_mflags}
 
 %install
-%__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}
 export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{?buildroot}
 %make_install
 
+# Show only in KDE (really? -- Rex)
+for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
+  KCharSelect ark kwalletmanager kwalletconfig \
+ irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
+ if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
+   echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
+ fi
+done
+
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+    pushd $lang_dir/kcontrol
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# using pam
+install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
+install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+
+pushd %{buildroot}%{_bindir}
+  mkdir -p %{buildroot}%{_sbindir}
+  mv klaptop_acpi_helper ../sbin
+  ln -s consolehelper klaptop_acpi_helper
+popd
+
+# klaptop setting
+install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
+
+
 %clean
 %__rm -rf %{?buildroot}
 
-%files
+
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%post extras
+/sbin/ldconfig
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+%postun extras
+/sbin/ldconfig
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+
+%files extras
+%defattr(-,root,root,-)
+
+# kmilo
+%{tde_libdir}/kded_kmilod.*
+%{tde_libdir}/kmilo*
+%{_libdir}/libkmilo.la
+%{_libdir}/libkmilo.so.*
+%{_datadir}/services/kded/kmilod.desktop
+%{_datadir}/services/kmilo
+%{_datadir}/servicetypes/kmilo
+
+# ksim
+%{tde_docdir}/HTML/*/ksim/
+%{tde_libdir}/ksim*
+%{_libdir}/libksimcore.la
+%{_libdir}/libksimcore.so.*
+%{_datadir}/apps/kicker/extensions/ksim.desktop
+%{_datadir}/apps/ksim/
+%config %{_datadir}/config/ksim_panelextensionrc
+%{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
+%{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
+
+# klaptop
+%{tde_docdir}/HTML/en/kcontrol
+%{_sysconfdir}/pam.d/klaptop_acpi_helper
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%{_bindir}/klaptop*
+%{tde_libdir}/kded_klaptopdaemon.*
+%{_sbindir}/klaptop_acpi_helper
+%{_datadir}/apps/klaptopdaemon
+%{_datadir}/services/kded/klaptopdaemon.desktop
+%{tde_libdir}/kcm_laptop.*
+%{_libdir}/libkcmlaptop.*
+%{_datadir}/applications/kde/laptop.desktop
+%config %{_datadir}/config/kcmlaptoprc
+%{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
+%{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
+%{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
+
+# kmilo
+%exclude %{tde_libdir}/kded_kmilod.*
+%exclude %{tde_libdir}/kmilo*
+%exclude %{_libdir}/libkmilo.la
+%exclude %{_libdir}/libkmilo.so.*
+%exclude %{_datadir}/services/kded/kmilod.desktop
+%exclude %{_datadir}/services/kmilo
+%exclude %{_datadir}/servicetypes/kmilo
+
+# ksim
+%exclude %{tde_docdir}/HTML/*/ksim/
+%exclude %{tde_libdir}/ksim*
+%exclude %{_libdir}/libksimcore.la
+%exclude %{_libdir}/libksimcore.so.*
+%exclude %{_datadir}/apps/kicker/extensions/ksim.desktop
+%exclude %{_datadir}/apps/ksim/
+%exclude %{_datadir}/config/ksim_panelextensionrc
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
+%exclude %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
+
+# klaptop
+%exclude %{_sysconfdir}/pam.d/klaptop_acpi_helper
+%exclude %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%exclude %{_bindir}/klaptop*
+%exclude %{tde_libdir}/kded_klaptopdaemon.*
+%exclude %{_sbindir}/klaptop_acpi_helper
+%exclude %{_datadir}/apps/klaptopdaemon
+%exclude %{_datadir}/services/kded/klaptopdaemon.desktop
+%exclude %{tde_libdir}/kcm_laptop.*
+%exclude %{_libdir}/libkcmlaptop.*
+%exclude %{_datadir}/applications/kde/laptop.desktop
+%exclude %{_datadir}/config/kcmlaptoprc
+%exclude %{tde_docdir}/HTML/en/kcontrol/
+%exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
+%exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+
+%{tde_docdir}/HTML/en/*
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/*
+%attr(644,root,root) %{_sysconfdir}/pam.d/*
 %{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
+%{_sbindir}/*
+%{tde_libdir}/*
+%{_libdir}/*.la
+%{_libdir}/libkdeinit*.so
+%{_libdir}/lib*.so.*
+%{_datadir}/icons/*/*/*/*
 %{_datadir}/apps/*
-%{_datadir}/autostart/*.desktop
-%{_datadir}/config/*
-%{_datadir}/icons/*
-%{_datadir}/services/*
+%config %{_datadir}/config/*
 %{_datadir}/config.kcfg/*
-%{_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
-%{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit*.so
-%{tde_libdir}/*.so
-%{tde_docdir}/HTML/en/*
-
-%if 0%{?rhel} >= 4
-%{_datadir}/applnk/*/*
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+%{_datadir}/applications/kde/*
+%if 0%{?rhel} > 6
+%{_datadir}/applnk/Utilities/*
 %{_datadir}/mimelnk/application/*
 %endif
+%{_datadir}/autostart/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_includedir}/*
-%{tde_libdir}/*.la
+%{tde_includedir}/*
+%{_libdir}/libkcmlaptop.so
+%{_libdir}/libkhexeditcommon.so
+%{_libdir}/libkmilo.so
+%{_libdir}/libkregexpeditorcommon.so
+%{_libdir}/libksimcore.so
+
 
 %changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
+- Merge Spec file from Fedora8 "kdeutils-3.5.10-6"
+
 * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
 - Import to GIT