Some more cleanup to base components

13 files changed, 99 insertions, 64 deletions

diff --git a/redhat/components.txt b/redhat/components.txt
index c756a28f6..2492fc6f5 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -9,3 +9,5 @@ kdeutils
 kdepim
 kdesdk
 kdevelop
+kdemultimedia
+kdeartwork
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
index 16ccd741e..8793f5d53 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
@@ -18,7 +18,9 @@ Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the KDE sound system
+
 Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Source0:	arts-%{version}.tar.gz
@@ -29,6 +31,7 @@ BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	libtool-ltdl-devel
+BuildRequires:	gsl-devel
 
 Requires:	tqtinterface
 Requires:	audiofile
@@ -65,7 +68,7 @@ Development files for %{name}
 
 %__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
+%__make -f "admin/Makefile.common"
 
 %build
 export PATH="%{_bindir}:${PATH}"
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index 2a2cd2fba..fd2d6104d 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -18,7 +18,9 @@ Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the KDE sound system
+
 Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Source0:	arts-%{version}.tar.gz
@@ -29,6 +31,7 @@ BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	libtool-ltdl-devel
+BuildRequires:	gsl-devel
 
 Requires:	tqtinterface
 Requires:	audiofile
@@ -69,6 +72,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 %__mkdir build
 cd build
 %cmake \
+  -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \
   -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
   -DWITH_MAD=OFF \
   ..
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
index 10c5fd0d6..7532187c3 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
@@ -14,9 +14,9 @@
 %define _includedir %{_prefix}/include/tqt
 
 # TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
+BuildRequires:	autoconf automake libtool m4
 BuildRequires:	qt3-devel >= 3.3.8b
-Requires:	qt3 >= 3.3.8b
+Requires:		qt3 >= 3.3.8b
 
 
 Name:		tqtinterface
@@ -24,7 +24,9 @@ Version:	%{version}
 Release:	%{release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity QT Interface
+
 Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{_prefix}
@@ -51,7 +53,7 @@ Development files for %{name}
 
 %__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
+%__make -f "admin/Makefile.common"
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index 1764eda3d..859afa0bd 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -17,9 +17,9 @@
 %define _includedir %{_prefix}/include/tqt
 
 # TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
+BuildRequires:	cmake >= 2.8
 BuildRequires:	qt3-devel >= 3.3.8d
-Requires:	qt3 >= 3.3.8d
+Requires:		qt3 >= 3.3.8d
 
 
 Name:		tqtinterface
@@ -27,7 +27,9 @@ Version:	%{version}
 Release:	%{release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity QT Interface
+
 Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{_prefix}
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 8f2012085..79f260e10 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -1,21 +1,34 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%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"
 %define _variant .opt
 %define _docdir %{_prefix}/share/doc
 %endif
 
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_libdir %{_libdir}/kde3
+
 
 Name:		trinity-kdebase
-Version:	3.5.12
-Release:	9%{?dist}%{?_variant}
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
-Vendor:		Trinity Project
-Packager:	Thales Communications
 Summary:	Trinity KDE Base Programs
 
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
 Prefix:		%{_prefix}
 
-Source0:	http://mirror3.tokra.lv/releases/3.5.12/kdebase-3.5.12.tar.gz
+Source0:	kdebase-%{version}.tar.gz
 
 # Wrapper script to prevent Plasma launch at Trinity Startup
 Source1:	plasma-desktop
@@ -159,7 +172,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 
 %__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
+%__make -f "admin/Makefile.common"
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -298,7 +311,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
 
 %doc AUTHORS COPYING README
-%{_docdir}/HTML/en/*
+%{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
 %{_bindir}/genkdmconf
 %{_bindir}/kaccess
@@ -408,7 +421,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
 %{_docdir}/kdm/README
-%{_libdir}/kde3/*
+%{tde_libdir}/*
 %{_libdir}/libkdeinit_*.*
 %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
 %{_sysconfdir}/xdg/menus/kde-information.menu
@@ -423,10 +436,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/config
 %endif
 # exclude pim-ioslaves files from main package
-%exclude %{_libdir}/kde3/kio_ldap.*
-%exclude %{_libdir}/kde3/kio_nntp.*
-%exclude %{_libdir}/kde3/kio_pop3.*
-%exclude %{_libdir}/kde3/kio_smtp.*
+%exclude %{tde_libdir}/kio_ldap.*
+%exclude %{tde_libdir}/kio_nntp.*
+%exclude %{tde_libdir}/kio_pop3.*
+%exclude %{tde_libdir}/kio_smtp.*
 %exclude %{_datadir}/services/ldap*.protocol
 %exclude %{_datadir}/services/nntp*.protocol
 %exclude %{_datadir}/services/pop3*.protocol
@@ -440,10 +453,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files pim-ioslaves
 %defattr(-,root,root,-)
-%{_libdir}/kde3/kio_ldap.*
-%{_libdir}/kde3/kio_nntp.*
-%{_libdir}/kde3/kio_pop3.*
-%{_libdir}/kde3/kio_smtp.*
+%{tde_libdir}/kio_ldap.*
+%{tde_libdir}/kio_nntp.*
+%{tde_libdir}/kio_pop3.*
+%{tde_libdir}/kio_smtp.*
 %{_datadir}/services/ldap*.protocol
 %{_datadir}/services/nntp*.protocol
 %{_datadir}/services/pop3*.protocol
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index c7e369e28..c52d2f2b0 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -10,14 +10,21 @@
 %define _docdir %{_prefix}/share/doc
 %endif
 
+# TDE 3.5.13 specific building variables
+BuildRequires: cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_libdir %{_libdir}/trinity
+
 
 Name:		trinity-kdebase
-Version:	%{version}
+Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Summary:	Trinity KDE Base Programs
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Trinity KDE Base Programs
+URL:		http://www.trinitydesktop.org/
 
 Prefix:		%{_prefix}
 
@@ -35,7 +42,6 @@ BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	trinity-kdelibs-devel
 BuildRequires:	qt3-devel >= 3.3.8d
-BuildRequires:	cmake >= 2.8
 BuildRequires:	openssl-devel
 BuildRequires:	avahi-devel avahi-qt3-devel
 BuildRequires:	imake
@@ -283,7 +289,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
 
 %doc AUTHORS COPYING README
-%{_docdir}/kde/HTML/en/*
+%{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
 %{_bindir}/genkdmconf
 %{_bindir}/kaccess
@@ -389,7 +395,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
-%{_libdir}/trinity/*
+%{tde_libdir}/*
 %{_libdir}/libkdeinit_*.*
 %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
 %{_sysconfdir}/xdg/menus/kde-information.menu
@@ -403,10 +409,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/config
 %endif
 # exclude pim-ioslaves files from main package
-%exclude %{_libdir}/trinity/kio_ldap.*
-%exclude %{_libdir}/trinity/kio_nntp.*
-%exclude %{_libdir}/trinity/kio_pop3.*
-%exclude %{_libdir}/trinity/kio_smtp.*
+%exclude %{tde_libdir}/kio_ldap.*
+%exclude %{tde_libdir}/kio_nntp.*
+%exclude %{tde_libdir}/kio_pop3.*
+%exclude %{tde_libdir}/kio_smtp.*
 %exclude %{_datadir}/services/ldap*.protocol
 %exclude %{_datadir}/services/nntp*.protocol
 %exclude %{_datadir}/services/pop3*.protocol
@@ -423,10 +429,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files pim-ioslaves
 %defattr(-,root,root,-)
-%{_libdir}/trinity/kio_ldap.*
-%{_libdir}/trinity/kio_nntp.*
-%{_libdir}/trinity/kio_pop3.*
-%{_libdir}/trinity/kio_smtp.*
+%{tde_libdir}/kio_ldap.*
+%{tde_libdir}/kio_nntp.*
+%{tde_libdir}/kio_pop3.*
+%{tde_libdir}/kio_smtp.*
 %{_datadir}/services/ldap*.protocol
 %{_datadir}/services/nntp*.protocol
 %{_datadir}/services/pop3*.protocol
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
index 09bb8658f..2dcdc061f 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
@@ -22,10 +22,11 @@ Version: %{?version}
 Release: %{?release}%{?dist}%{_variant}
 
 License: GPLv2
-URL:     http://developer.kde.org/language-bindings/ 
+Group:   User Interface/Desktops
+
 Vendor:  Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Group:   User Interface/Desktops
+URL:     http://developer.kde.org/language-bindings/ 
 
 Source0: kdebindings-%{version}.tar.gz
 
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index 447db3d1e..f4ea50005 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
@@ -22,10 +22,11 @@ Version: %{?version}
 Release: %{?release}%{?dist}%{_variant}
 
 License: GPLv2
-URL:     http://developer.kde.org/language-bindings/ 
+Group:   User Interface/Desktops
+
 Vendor:  Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Group:   User Interface/Desktops
+URL:     http://developer.kde.org/language-bindings/ 
 
 Source0: kdebindings-%{version}.tar.gz
 
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
index a8dee7851..4604f78d8 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
@@ -10,7 +10,7 @@
 %define _docdir %{_prefix}/share/doc
 %endif
 
-# TDE 3.5.13 specific variables
+# TDE 3.5.12 specific variables
 BuildRequires:	autoconf automake libtool m4
 %define tde_docdir %{_docdir}
 %define tde_libdir %{_libdir}/kde3
@@ -20,9 +20,11 @@ Name:		trinity-kdelibs
 Version:	%{version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Summary:	Trinity KDE Libraries
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Trinity KDE Libraries
+URL:		http://www.trinitydesktop.org/
 
 Source0:	kdelibs-%{version}.tar.gz
 Prefix:		%{_prefix}
@@ -73,7 +75,7 @@ format for easy browsing
 
 %__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 
+%__make -f "admin/Makefile.common"
 
 
 %build
@@ -81,6 +83,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LD_LIBRARY_PATH="%{_libdir}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
 %configure \
   --disable-rpath \
   --enable-new-ldflags \
@@ -113,13 +116,6 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 %__mkdir_p %{?buildroot}
 %make_install
 
-%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
-cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%if "%{?_prefix}" != "/usr"
-%{_libdir}
-%endif
-%{tde_libdir}
-EOF
 
 %clean
 %__rm -rf %{?buildroot}
@@ -193,7 +189,7 @@ EOF
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.la
-%{_libdir}/kde3/
+%{tde_libdir}/
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/autostart/kab2kabc.desktop
 %{_datadir}/applnk/kio_iso.desktop
@@ -207,7 +203,7 @@ EOF
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/icons/crystalsvg/
-%{_docdir}/HTML/en/kspell
+%{tde_docdir}/HTML/en/kspell
 # remove conflicts with kdelibs-4
 %if "%{?_prefix}" != "/usr"
 %{_bindir}/checkXML
@@ -216,7 +212,7 @@ EOF
 %{_bindir}/preparetips
 %{_datadir}/icons/hicolor/index.theme
 %{_datadir}/locale/all_languages
-%{_docdir}/HTML/en/common/*
+%{tde_docdir}/HTML/en/common/*
 %else
 %exclude %{_bindir}/checkXML
 %exclude %{_bindir}/ksvgtopng
@@ -229,9 +225,8 @@ EOF
 %exclude %{_datadir}/config/ui/ui_standards.rc
 %exclude %{_datadir}/icons/hicolor/index.theme
 %exclude %{_datadir}/locale/all_languages
-%exclude %{_docdir}/HTML/en/common/*
+%exclude %{tde_docdir}/HTML/en/common/*
 %endif
-%{_sysconfdir}/ld.so.conf.d/trinity.conf
 
 # Provided by 'redhat-menus' package
 %exclude %{_sysconfdir}/xdg/menus/applications.menu
@@ -250,7 +245,7 @@ EOF
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/
-%{_docdir}/HTML/en/kdelibs*
+%{tde_docdir}/HTML/en/kdelibs*
 
 
 %changelog
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 052e51b12..4b98b33f9 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -20,9 +20,11 @@ Name:		trinity-kdelibs
 Version:	%{version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Summary:	Trinity KDE Libraries
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Trinity KDE Libraries
+URL:		http://www.trinitydesktop.org/
 
 Source0:	kdelibs-%{version}.tar.gz
 Prefix:		%{_prefix}
@@ -190,7 +192,7 @@ EOF
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.la
-%{_libdir}/trinity/
+%{tde_libdir}/
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/autostart/kab2kabc.desktop
 %{_datadir}/applnk/kio_iso.desktop
@@ -204,7 +206,7 @@ EOF
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/icons/crystalsvg/
-%{_docdir}/kde/HTML/en/kspell
+%{tde_docdir}/HTML/en/kspell
 # remove conflicts with kdelibs-4
 %if "%{?_prefix}" != "/usr"
 %{_bindir}/checkXML
@@ -213,7 +215,7 @@ EOF
 %{_bindir}/preparetips
 %{_datadir}/icons/hicolor/index.theme
 %{_datadir}/locale/all_languages
-%{_docdir}/kde/HTML/en/common/*
+%{tde_docdir}/HTML/en/common/*
 %else
 %exclude %{_bindir}/checkXML
 %exclude %{_bindir}/ksvgtopng
@@ -226,7 +228,7 @@ EOF
 %exclude %{_datadir}/config/ui/ui_standards.rc
 %exclude %{_datadir}/icons/hicolor/index.theme
 %exclude %{_datadir}/locale/all_languages
-%exclude %{_docdir}/kde/HTML/en/common/*
+%exclude %{tde_docdir}/HTML/en/common/*
 %endif
 %{_sysconfdir}/ld.so.conf.d/trinity.conf
 
@@ -253,7 +255,7 @@ EOF
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/
-#%{_docdir}/kde/HTML/en/kdelibs*
+#%{tde_docdir}/HTML/en/kdelibs*
 
 
 %changelog
diff --git a/redhat/kdepim/trinity-kdepim-3.5.12.spec b/redhat/kdepim/trinity-kdepim-3.5.12.spec
index 9a0361c86..01b349900 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.12.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.12.spec
@@ -20,10 +20,12 @@ Name:		trinity-kdepim
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Group:		Applications/Productivity
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 Summary:	PIM (Personal Information Manager) applications
-Group:		Applications/Productivity
+
 Prefix:		%{_prefix}
 
 Source0:	kdepim-%{version}.tar.gz
@@ -64,7 +66,7 @@ Development files for %{name}.
 
 %__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
+%__make -f "admin/Makefile.common"
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 4ad751749..604dbd208 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -20,10 +20,12 @@ Name:		trinity-kdepim
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Group:		Applications/Productivity
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 Summary:	PIM (Personal Information Manager) applications
-Group:		Applications/Productivity
+
 Prefix:		%{_prefix}
 
 Source0:	kdepim-%{version}.tar.gz