RPM Packaging: update tdeaccessibility

4 files changed, 145 insertions, 51 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 6f40731f2..93fc99db5 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -563,7 +563,7 @@ endif
 
 rosegarden:	tdebase lilypond
 # Do NOT build on CentOS 5, CentOS 7
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),)
+ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,applications/rosegarden)
 endif
 
@@ -595,8 +595,8 @@ tdeio-umountwrapper:	tdebase
 	$(call buildpkg,applications/tdeio-umountwrapper)
 
 tdenetworkmanager:	tdebase
-# Do NOT build on CentOS
-ifeq ($(wildcard /etc/centos-release),)
+# Do NOT build on CentOS 5, CentOS 6
+ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
 	$(call buildpkg,applications/tdenetworkmanager)
 endif
 
@@ -604,10 +604,7 @@ tdepowersave:	tdebase
 	$(call buildpkg,applications/tdepowersave)
 
 tderadio:	tdebase
-# Do NOT build on CentOS 7
-ifeq ($(wildcard /boot/vmlinuz*.el7*),)
 	$(call buildpkg,applications/tderadio)
-endif
 
 tde-style-lipstik:	tdebase
 	$(call buildpkg,applications/tde-style-lipstik)
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 3cd80b609..8d73e2572 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -17,9 +17,17 @@ DEVEL="$2"
 
 # Some runtime packages are prefixed with 'trinity-', some are not.
 case "${PKGNAME}" in
-  "trinity-"*|"qt3"|"tqt3"|"tqtinterface"|"python-qt3"|"esound"|"avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"fileshareset"|"hk_classes") PREFIX="";;
+  # In case prefix is already there, don't add it again.
+  "trinity-"*) PREFIX="";;
+  # Most TDE dependencies have no prefix
+  "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcarddav"|"libcaldav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface") PREFIX="";;
+  # 3rd party dependencies
+  "esound"|"fileshareset"|"hk_classes"|"python-qt3") PREFIX="";;
+  # Extra build stuff
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
+  # Other
   "curl") PREFIX="trinity-lib";;
+  # Default case: add prefix
   *) PREFIX="trinity-";;
 esac
 
@@ -38,6 +46,9 @@ case "${PKGNAME}" in
   "esound") PKGRUNTIME="esound-libs";;
   "koffice") PKGRUNTIME="koffice-suite";;
   "libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";;
+  "libcaldav") PKGRUNTIME="${lib}caldav0";;
+  "libcarddav") PKGRUNTIME="${lib}carddav0";;
+  "tqscintilla") PKGRUNTIME="${lib}tqscintilla7";;
   "tqt3") PKGRUNTIME="${lib}tqt3-mt";;
   "tqtinterface") PKGRUNTIME="${lib}tqt4";;
   # Language package: install only French language package
@@ -56,7 +67,7 @@ if [ -n "${DEVEL}" ]; then
     # Applications do NOT have 'devel' package, except K3B.
     "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;;
     # Extras packages do NOT have 'devel' package, except Akode
-    "extras") if [ "${PKGNAME}" != "akode" ]; then exit 0; fi;;
+    "extras") if [ "${PKGNAME}" != "akode" ] && [ "${PKGNAME}" != "hk_classes" ]; then exit 0; fi;;
   esac
   
   # Some other packags NOT having development package
@@ -73,6 +84,9 @@ if [ -n "${DEVEL}" ]; then
     "esound") PKGDEVEL="esound-devel";;
     "pan") PKGDEVEL="uulib-devel";;
     "libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
+    "libcaldav") PKGDEVEL="${lib}caldav-devel";;
+    "libcarddav") PKGDEVEL="${lib}carddav-devel";;
+    "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
     "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers";;
     # Default case: development package has same name as runtime package, plus '-devel' suffix.
     *) PKGDEVEL="${PKGRUNTIME}-devel";;
diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
index cdacd64a6..de07d3ac9 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -1,49 +1,92 @@
-# 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 tdeaccessibility (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 tdeaccessibility
+%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
 
 
-Summary:		Trinity Desktop Environment - Accessibility
 Name:			trinity-tdeaccessibility
+Summary:		Trinity Desktop Environment - Accessibility
 Version:		%{tde_version}
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2
-Group:			User Interface/Desktops
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
+Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
 
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+%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)
 
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-akode-devel
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	desktop-file-utils
+BuildRequires:	fdupes
+
+# 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
+
+# AKODE support
+%if 0%{?with_akode}
+BuildRequires: trinity-akode-devel
+%{?with_mad:BuildRequires: trinity-akode-libmad}
+%endif
+
+# ALSA support
 BuildRequires:	alsa-lib-devel
 
 # X11 Libraries
@@ -63,27 +106,52 @@ BuildRequires:	%{_lib}xcb-devel
 
 # X11 stuff
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
 %if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xext-devel
 BuildRequires:	%{_lib}x11-devel
-BuildRequires:	%{_lib}xau-devel
 %else
-BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
 BuildRequires:	%{_lib}x11%{?mgaversion:_6}-devel
-BuildRequires:	%{_lib}xau%{?mgaversion:6}-devel
 %endif
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXi-devel
-BuildRequires:	libXext-devel
 BuildRequires:	libX11-devel
-BuildRequires:	libXau-devel
 %endif
 %if 0%{?rhel} == 4 || 0%{?suse_version} == 1140
 BuildRequires:	xorg-x11-devel
 %endif
 
+# XI support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xi-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXi-devel
+%endif
+
+# XEXT support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xext-devel
+%else
+BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXext-devel
+%endif
+
+
+# XAU support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xau-devel
+%else
+BuildRequires:	%{_lib}xau%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXau-devel
+%endif
+
 Obsoletes:		trinity-kdeaccessibility < %{version}-%{release}
 Provides:		trinity-kdeaccessibility = %{version}-%{release}
 Obsoletes:		trinity-kdeaccessibility-libs < %{version}-%{release}
@@ -111,7 +179,7 @@ Included with this package are:
 
 %package -n trinity-tde-icons-mono
 Summary:	A monochromatic icons theme for TDE
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 Obsoletes:	trinity-kde-icons-mono < %{version}-%{release}
 Provides:	trinity-kde-icons-mono = %{version}-%{release}
@@ -130,7 +198,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 
 %package -n trinity-kbstate
 Summary:	a keyboard status applet for TDE
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-kbstate
 A panel applet that displays the keyboard status.
@@ -148,7 +216,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 
 %package -n trinity-kmag
 Summary:	A screen magnifier for TDE
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-kmag
 TDE's screen magnifier tool.
@@ -187,7 +255,7 @@ done
 
 %package -n trinity-kmousetool
 Summary:	TDE mouse manipulation tool for the disabled
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-kmousetool
 KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
@@ -220,7 +288,7 @@ done
 
 %package -n trinity-kmouth
 Summary:	A type-and-say KDE frontend for speech synthesizers
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-kmouth
 KDE's type-and-say frontend for speech synthesizers.
@@ -259,7 +327,7 @@ done
 
 %package -n trinity-ksayit
 Summary:	A frontend for the TDE Text-to-Speech system
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-ksayit
 Text-to-speech front-end to kttsd.
@@ -302,7 +370,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kttsd
 Summary:	A Text-to-Speech system for TDE
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-kttsd
 The KDE Text-to-Speech system is a plugin based service that allows any KDE
@@ -323,8 +391,10 @@ Homepage: http://accessibility.kde.org/developer/kttsd
 %{tde_tdelibdir}/kcm_kttsd.so
 %{tde_tdelibdir}/tdetexteditor_kttsd.la
 %{tde_tdelibdir}/tdetexteditor_kttsd.so
+%if 0%{?with_akode}
 %{tde_tdelibdir}/libkttsd_akodeplugin.la
 %{tde_tdelibdir}/libkttsd_akodeplugin.so
+%endif
 %{tde_tdelibdir}/libkttsd_alsaplugin.la
 %{tde_tdelibdir}/libkttsd_alsaplugin.so
 %{tde_tdelibdir}/libkttsd_artsplugin.la
@@ -357,7 +427,9 @@ Homepage: http://accessibility.kde.org/developer/kttsd
 %{tde_datadir}/icons/hicolor/16x16/actions/male.png
 %{tde_datadir}/services/tdetexteditor_kttsd.desktop
 %{tde_datadir}/services/kttsd.desktop
+%if 0%{?with_akode}
 %{tde_datadir}/services/kttsd_akodeplugin.desktop
+%endif
 %{tde_datadir}/services/kttsd_alsaplugin.desktop
 %{tde_datadir}/services/kttsd_artsplugin.desktop
 %{tde_datadir}/services/kttsd_commandplugin.desktop
@@ -372,8 +444,6 @@ Homepage: http://accessibility.kde.org/developer/kttsd
 %{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
 %{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
 %{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
-#%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
-#%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz
 %{tde_tdedocdir}/HTML/en/kttsd/
 
 %post -n trinity-kttsd
@@ -396,7 +466,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kttsd-contrib-plugins
 Summary:	the TDE Text-to-Speech system
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 Requires:	trinity-kttsd = %{version}-%{release}
 
 %description -n trinity-kttsd-contrib-plugins
@@ -422,7 +492,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 
 %package devel
 Summary:	Development files for %{name}
-Group:		Development/Libraries
+Group:		Development/Libraries/X11
 Requires:	%{name} = %{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{version}
 
@@ -447,7 +517,7 @@ Provides:		trinity-kdeaccessibility-devel = %{version}-%{release}
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -483,7 +553,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
   --disable-gcc-hidden-visibility \
   \
   --enable-ksayit-audio-plugins \
-  --with-akode
+  %{?with_akode:--with-akode} %{?!with_akode:--without-akode}
   
 %__make %{?_smp_mflags}
 
@@ -497,6 +567,19 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
 %__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kmag         Utility Accessibility
+%suse_update_desktop_file    kmousetool   Utility Accessibility
+%suse_update_desktop_file    kmouth       Utility Accessibility
+%suse_update_desktop_file    kttsmgr      Utility Accessibility
+%suse_update_desktop_file    ksayit       Utility Accessibility
+%suse_update_desktop_file    kcmkttsd     Utility Accessibility
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 38a4f4bda..3208499b0 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -71,7 +71,7 @@ Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
 Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
 
 
-BuildRequires:	trinity-arts-devel >= 2:1.5.10
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}