RPM packaging: update knutclient, koffice, koffice-i18n, konversation, kopete-otr

1 files changed, 107 insertions, 38 deletions

diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 52e0369da..8b4fd5955 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -1,31 +1,36 @@
-# Default version for this component
-%define tde_pkg koffice
+#
+# spec file for package koffice (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/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# 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
-
-# TDE specific building variables
+%define tde_pkg koffice
+%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_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%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}
-
 # Disable Kross support for RHEL <= 5 (python is too old)
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_kross 1
@@ -38,33 +43,50 @@
 %global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
 
 
-Name:			trinity-%{tde_pkg}
-Summary:		An integrated office suite
-Version:		1.6.3
-Release:		%{?!preversion:10}%{?preversion:9_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.6.3
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	An integrated office suite
+Group:		Applications/Productivity
+URL:		http://www.trinitydesktop.org/
 
-Group:			Applications/Productivity
-License:		GPLv2+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <[email protected]>
-URL:			http://www.trinitydesktop.org/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 # BuildRequires: world-devel ;)
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-
 BuildRequires:	trinity-tdegraphics-devel >= %{tde_version}
 BuildRequires:	trinity-libpoppler-tqt-devel >= %{tde_version}
-BuildRequires:	automake libtool
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+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
+
 BuildRequires:	fontconfig-devel
 BuildRequires:	libart_lgpl-devel
 BuildRequires:	libtiff-devel
@@ -87,6 +109,7 @@ BuildRequires:	readline-devel
 %if 0%{?suse_version}
 BuildRequires:	libbz2-devel
 BuildRequires:	liblcms-devel
+BuildRequires:	liblcms2-devel
 %else
 BuildRequires:	bzip2-devel
 BuildRequires:	lcms-devel
@@ -139,6 +162,20 @@ BuildRequires:	utempter
 BuildRequires:	libutempter-devel
 %endif
 
+# POPPLER support
+%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+BuildRequires: poppler-devel >= 0.12
+#BuildRequires:	poppler-qt-devel >= 0.12
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}poppler-devel
+%endif
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
+BuildRequires:	trinity-poppler-devel >= 0.12
+BuildRequires:	trinity-poppler-qt3-devel >= 0.12
+%endif
+
 # POSTGRESQL support
 #  Requires 'libpqxx', for kexi-driver-pgqsl
 %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
@@ -310,7 +347,7 @@ fi
 %{tde_datadir}/servicetypes/kwmailmerge.desktop
 %{tde_datadir}/servicetypes/widgetfactory.desktop
 %{tde_tdeappdir}/*koffice.desktop
-%{tde_datadir}/applnk/Office/KThesaurus.desktop
+%{tde_tdeappdir}/KThesaurus.desktop
 %{tde_tdeappdir}/*koshell.desktop
 %{tde_datadir}/apps/kofficewidgets/
 %if 0%{?with_kross}
@@ -533,6 +570,7 @@ Requires:		%{name}-core = %{version}-%{release}
 %lang(en) %{tde_tdedocdir}/HTML/en/karbon/
 %{tde_bindir}/karbon
 %{tde_libdir}/libtdeinit_karbon.so
+%exclude %{tde_tdelibdir}/libkarbonepsimport.*
 %{tde_tdelibdir}/*karbon*.*
 %{tde_tdelibdir}/libwmfexport.*
 %{tde_tdelibdir}/libwmfimport.*
@@ -626,7 +664,7 @@ update-desktop-database -q &> /dev/null ||:
 %{tde_datadir}/servicetypes/kexi*.desktop
 %{tde_datadir}/services/kexi/
 %{tde_datadir}/apps/kexi/
-%{tde_datadir}/services/kformdesigner/*
+%{tde_datadir}/services/kformdesigner/
 %{tde_tdeappdir}/*kexi.desktop
 %{tde_datadir}/services/kexidb_sqlite*driver.desktop
 %if 0%{?with_kross}
@@ -1043,17 +1081,15 @@ This package is part of the TDE Office Suite.
 %defattr(-,root,root,-)
 %{tde_tdeappdir}/chalk.desktop
 %{tde_datadir}/applnk/.hidden/chalk_*.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop
 %{tde_datadir}/apps/chalk/
 %{tde_datadir}/apps/chalkplugins/
 %lang(en) %{tde_tdedocdir}/HTML/en/chalk/
-%{tde_datadir}/icons/hicolor/*/apps/chalk.png
 %{tde_datadir}/services/chalk*.desktop
 %{tde_datadir}/servicetypes/chalk*.desktop
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -1108,6 +1144,39 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
+#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do
+#  mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/;
+#done
+
+# Fix desktop icon location
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kudesigner    Office FlowChart
+%suse_update_desktop_file kivio		Office FlowChart
+%suse_update_desktop_file kchart	Office FlowChart
+%suse_update_desktop_file kexi		Office Database
+%suse_update_desktop_file -r chalk	Graphics RasterGraphics
+%suse_update_desktop_file -r karbon     Graphics VectorGraphics
+%suse_update_desktop_file kpresenter	Office Presentation
+%suse_update_desktop_file kspread	Office Spreadsheet
+%suse_update_desktop_file -u KThesaurus Office
+%suse_update_desktop_file -r kformula   Science Math
+%suse_update_desktop_file kword		Office WordProcessor
+%suse_update_desktop_file koshell    Office Core-Office
+%suse_update_desktop_file kplato        Office ProjectManagement
+%endif
+
+# Apps that should stay in TDE
+for i in kivio kplato; do
+  echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
+done
+
+# Links duplicate files
+%fdupes %{buildroot}
+
 ## unpackaged files
 # fonts
 rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/
@@ -1136,5 +1205,5 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 1.6.3-10
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:1.6.3-1
 - Initial release for TDE 14.0.0