Branch: master

1e2bd3dd 2014-11-01 16:12:13 François Andriot
RPM Packaging: update tdepim
M redhat/tdegames/tdegames-14.0.0.spec
M redhat/tdemultimedia/tdemultimedia-14.0.0.spec
M redhat/tdepim/tdepim-14.0.0.spec
diff --git a/redhat/tdegames/tdegames-14.0.0.spec b/redhat/tdegames/tdegames-14.0.0.spec
index 92d02de..3f721ce 100644
--- a/redhat/tdegames/tdegames-14.0.0.spec
+++ b/redhat/tdegames/tdegames-14.0.0.spec
@@ -194,7 +194,7 @@
 
 %package -n trinity-libtdegames-devel
 Summary:	Trinity games library headers
-Group:		Amusements/Games/Other
+Group:		Development/Libraries/Other
 Requires:	trinity-libtdegames1 = %{version}-%{release}
 
 %description -n trinity-libtdegames-devel
@@ -274,7 +274,7 @@
 
 %package -n trinity-atlantik-devel
 Summary:	Development files for Atlantik
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-atlantik = %{version}-%{release}
 
 %description -n trinity-atlantik-devel
@@ -780,7 +780,7 @@
 ##########
 
 %package -n trinity-kmahjongg
-Summary:	the classic mahjongg game for Trinity project
+Summary:	The classic mahjongg game for Trinity project
 Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kmahjongg
@@ -938,7 +938,7 @@
 
 %package -n trinity-kolf-devel
 Summary:	Development files for Kolf
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kolf = %{version}-%{release}
 
 %description -n trinity-kolf-devel
@@ -1640,6 +1640,9 @@
 %suse_update_desktop_file -r kolf            Game SportsGame
 %endif
 
+# Links duplicate files
+%fdupes "%{?buildroot}"
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index b7625f3..c27d6ce 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -44,7 +44,7 @@
 Summary:	Multimedia applications for the Trinity Desktop Environment (TDE)
 Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Utilities
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -69,7 +69,6 @@
 Provides:	trinity-kdemultimedia-extras = %{version}-%{release}
 Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
 Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
-
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -246,7 +245,7 @@
 
 %package -n trinity-artsbuilder
 Summary:	Synthesizer designer for aRts
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Mixers
 Requires:	trinity-kicker >= %{tde_version}
 
 %description -n trinity-artsbuilder
@@ -515,7 +514,7 @@
 
 %package -n trinity-kaudiocreator
 Summary:	CD ripper and audio encoder frontend for Trinity
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/CD/Grabbers
 
 Requires:	%{name}-tdeio-plugins = %{version}-%{release}
 Requires:	vorbis-tools
@@ -559,7 +558,7 @@
 
 %package kfile-plugins
 Summary:	An au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Sound/Utilities
 
 %description kfile-plugins
 au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
@@ -604,7 +603,7 @@
 
 %package kappfinder-data
 Summary:	Multimedia data for kappfinder
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Sound/Utilities
 
 Requires: 	trinity-kappfinder >= %{tde_version}
 Requires:	trinity-tdebase-runtime-data-common >= %{tde_version}
@@ -622,7 +621,7 @@
 
 %package tdeio-plugins
 Summary:	Enables the browsing of audio CDs under Konqueror
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Sound/Utilities
 Requires:	trinity-tdebase-tdeio-plugins >= %{tde_version}
 
 Obsoletes:	trinity-tdemultimedia-kio-plugins < %{version}-%{release}
@@ -669,7 +668,7 @@
 
 %package -n trinity-tdemid
 Summary:	MIDI/karaoke player for Trinity
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Sound/Midi
 
 Obsoletes:	trinity-kmid < %{version}-%{release}
 Provides:	trinity-kmid = %{version}-%{release}
@@ -710,7 +709,7 @@
 
 %package -n trinity-kmix
 Summary:	Sound mixer applet for Trinity
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Sound/Mixers
 Requires:	trinity-kicker >= %{tde_version}
 
 %description -n trinity-kmix
@@ -757,7 +756,7 @@
 
 %package -n trinity-krec
 Summary:	Sound recorder utility for Trinity
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/CD/Record
 
 %description -n trinity-krec
 This is a sound recording utility for Trinity.
@@ -811,7 +810,7 @@
 
 %package -n trinity-kscd
 Summary:	Audio CD player for Trinity
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/CD/Players
 
 %description -n trinity-kscd
 This is Trinity's audio CD player.
@@ -848,7 +847,7 @@
 %if 0%{?with_akode}
 %package -n trinity-libarts-akode
 Summary:	Akode plugin for aRts
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Other
 
 %description -n trinity-libarts-akode
 This package contains akode plugins for aRts.
@@ -879,7 +878,7 @@
 
 %package -n trinity-libarts-audiofile
 Summary:	Audiofile plugin for aRts
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Other
 
 %description -n trinity-libarts-audiofile
 This package contains audiofile plugins for aRts.
@@ -903,7 +902,7 @@
 %if 0%{?with_mpeg}
 %package -n trinity-libarts-mpeglib
 Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Other
 
 %description -n trinity-libarts-mpeglib
 This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
@@ -937,7 +936,7 @@
 %if 0%{?with_xine}
 %package -n trinity-libarts-xine
 Summary:	ARTS plugin enabling xine support
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Other
 
 %description -n trinity-libarts-xine
 This package contains aRts' xine plugin, allowing the use of the xine
@@ -967,7 +966,7 @@
 
 %package -n trinity-libkcddb
 Summary:	CDDB library for Trinity
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Other
 Requires:	trinity-kcontrol >= %{tde_version}
 
 %description -n trinity-libkcddb
@@ -999,7 +998,7 @@
 
 %package -n trinity-mpeglib
 Summary:	MP3 and MPEG-1 audio and video library
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Other
 %if 0%{?with_mpeg}
 Requires:	trinity-libarts-mpeglib = %{version}-%{release}
 %endif
@@ -1033,7 +1032,7 @@
 
 %package -n trinity-noatun
 Summary:	Media player for Trinity
-Group:		System/GUI/Other
+Group:		Productivity/Multimedia/Video/Players
 Requires:	trinity-tdebase-bin >= %{tde_version}
 
 # 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec
index bdd4c9c..f538f20 100644
--- a/redhat/tdepim/tdepim-14.0.0.spec
+++ b/redhat/tdepim/tdepim-14.0.0.spec
@@ -1,23 +1,44 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
+#
+# spec file for package tdepim (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
 
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# TDE specific building variables
 ** Diff limit reached (max: 250 lines) **