summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-11-01 22:12:13 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-11-01 22:12:13 +0100
commit1e2bd3dd5038c1c8c479e5ee547c41c9c32e1211 (patch)
treec6adcca216c3434ea0b71dc3873df8fed650b3b7
parent4b12fba11b57c78864a260667e9472f799d4dd6f (diff)
downloadtde-packaging-1e2bd3dd5038c1c8c479e5ee547c41c9c32e1211.tar.gz
tde-packaging-1e2bd3dd5038c1c8c479e5ee547c41c9c32e1211.zip
RPM Packaging: update tdepim
-rw-r--r--redhat/tdegames/tdegames-14.0.0.spec11
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec35
-rw-r--r--redhat/tdepim/tdepim-14.0.0.spec107
3 files changed, 110 insertions, 43 deletions
diff --git a/redhat/tdegames/tdegames-14.0.0.spec b/redhat/tdegames/tdegames-14.0.0.spec
index 92d02de1b..3f721ce66 100644
--- a/redhat/tdegames/tdegames-14.0.0.spec
+++ b/redhat/tdegames/tdegames-14.0.0.spec
@@ -194,7 +194,7 @@ done
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ export PATH="%{tde_bindir}:${PATH}"
%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 b7625f3bd..c27d6ce15 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -44,7 +44,7 @@ Name: trinity-%{tde_pkg}
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}
@@ -70,7 +70,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}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -246,7 +245,7 @@ TDE, including:
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
%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 @@ This package provides data on multimedia applications for kappfinder.
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ This package contains akode plugins for aRts.
%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 @@ This package contains audiofile plugins for aRts.
%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 @@ This is the arts (TDE Sound daemon) plugin.
%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 @@ multimedia engine though aRts.
%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 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%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 @@ and WAV playback
%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 bdd4c9c65..f538f2041 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
+%define tde_pkg tdepim
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
-
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
+# 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
+
# KDEPIM specific features
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -29,40 +50,57 @@ BuildRequires: gnokii-devel
#define with_kitchensync 1
-Name: trinity-tdepim
+Name: trinity-%{tde_pkg}
+Summary: Personal Information Management apps from the official Trinity release
Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License: GPL
Group: Applications/Productivity
+URL: http://www.trinitydesktop.org/
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-Summary: Personal Information Management apps from the official Trinity release
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Project
+#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
+BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: trinity-libcaldav-devel
BuildRequires: trinity-libcarddav-devel
BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++
+BuildRequires: fdupes
+BuildRequires: desktop-file-utils
+BuildRequires: make
+
BuildRequires: gpgme-devel
BuildRequires: libgpg-error-devel
BuildRequires: flex
BuildRequires: libical-devel
BuildRequires: boost-devel
BuildRequires: pcre-devel
-BuildRequires: glib2-devel
-BuildRequires: gcc-c++
-BuildRequires: make
BuildRequires: libidn-devel
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
# CURL support
%if 0%{?fedora} >= 15
BuildRequires: flex-static
@@ -73,6 +111,9 @@ BuildRequires: trinity-libcurl-devel
BuildRequires: curl-devel
%endif
+# GLIB2 support
+BuildRequires: glib2-devel
+
# SASL support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}sasl2-devel
@@ -2229,6 +2270,7 @@ fi
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
@@ -2268,6 +2310,29 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r korganizer Office Calendar
+%suse_update_desktop_file -r kalarm Utility TimeUtility X-TDE-Utilities-PIM
+%suse_update_desktop_file -r karm Utility TimeUtility X-TDE-Utilities-PIM
+%suse_update_desktop_file kaddressbook
+%suse_update_desktop_file -r knotes Utility DesktopUtility X-TDE-Utilities-Desktop
+%suse_update_desktop_file KMail
+%suse_update_desktop_file -r KOrn Utility Applet X-TDE-More
+%suse_update_desktop_file KNode
+%suse_update_desktop_file -r Kontact Office Core-Office
+%suse_update_desktop_file -r kpilot Utility PDA SyncUtility X-TDE-Utilities-Peripherals
+%suse_update_desktop_file -u -r kpalmdoc Utility PDA X-TDE-Utilities-File
+%suse_update_desktop_file -u ktnef Network Email
+%suse_update_desktop_file -r groupwarewizard Utility DesktopSettings X-TDE-Utilities-PIM
+%suse_update_desktop_file -r kandy Utility Telephony X-TDE-Utilities-Peripherals
+%suse_update_desktop_file -r akregator Network RSS-News
+%suse_update_desktop_file kitchensync Utility X-SuSE-SyncUtility
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}"
+
%clean
%__rm -rf %{?buildroot}