diff options
Diffstat (limited to 'redhat/applications/koffice')
| -rw-r--r-- | redhat/applications/koffice/koffice-14.0.0.spec | 381 | ||||
| -rw-r--r-- | redhat/applications/koffice/koffice-3.5.13.2.spec | 53 | ||||
| -rw-r--r-- | redhat/applications/koffice/trinity-koffice-rpmlintrc | 2 |
3 files changed, 197 insertions, 239 deletions
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 6803cf68a..ce0cec112 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -1,31 +1,39 @@ -# Default version for this component -%define tde_pkg koffice +# +# spec file for package koffice (version R14) +# +# 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 +%if "%{?tde_version}" == "" %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_confdir %{_sysconfdir}/trinity %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 @@ -37,34 +45,55 @@ # Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') +# Required for Mageia 2: removes the ldflag '--no-undefined' +%define _disable_ld_no_undefined 1 -Name: trinity-%{tde_pkg} -Summary: An integrated office suite -Version: 1.6.3 -Release: %{?!preversion:10}%{?preversion:9_%{preversion}}%{?dist}%{?_variant} -Group: Applications/Productivity -License: GPLv2+ +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.6.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: An integrated office suite +Group: Applications/Productivity +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -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 +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: trinity-koffice-rpmlintrc # 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 @@ -84,19 +113,34 @@ BuildRequires: OpenEXR-devel BuildRequires: libexif-devel BuildRequires: readline-devel +# LCMS support +%if 0%{?suse_version} || 0%{?rhel} >= 7 +BuildRequires: liblcms-devel +%else +BuildRequires: lcms-devel +%endif + +# LCMS2 support +%if 0%{?suse_version} +BuildRequires: liblcms2-devel +%endif + +# BZIP2 support %if 0%{?suse_version} BuildRequires: libbz2-devel -BuildRequires: liblcms-devel %else BuildRequires: bzip2-devel -BuildRequires: lcms-devel +%endif +# PAPER support BuildRequires: libpaper-devel -%endif # RUBY support %if 0%{?with_ruby} BuildRequires: ruby ruby-devel >= 1.8.1 +%if 0%{?fedora} >= 19 +BuildRequires: rubypick +%endif %endif # FREETYPE support @@ -135,17 +179,38 @@ BuildRequires: utempter-devel %if 0%{?rhel} == 4 BuildRequires: utempter %endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}utempter-devel +%endif +%if 0%{?fedora} || 0%{?rhel} >= 5 BuildRequires: libutempter-devel %endif +# POPPLER support +%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} +%if 0%{?suse_version} >= 1500 +BuildRequires: libpoppler-devel >= 0.12 +%else +BuildRequires: poppler-devel >= 0.12 +%endif +%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 +%endif + # POSTGRESQL support # Requires 'libpqxx', for kexi-driver-pgqsl %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 %define with_postgresql 1 BuildRequires: postgresql-devel BuildRequires: libpqxx-devel %endif +%endif Obsoletes: trinity-libpqxx # WPD support @@ -177,7 +242,7 @@ BuildRequires: Mesa-libGLU-devel # OPENJPEG %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}openjpeg-devel +#BuildRequires: %{_lib}openjpeg-devel %endif # LIBXI support @@ -194,6 +259,13 @@ BuildRequires: libXi6-devel BuildRequires: libXi-devel %endif +# SQLITE support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel +%endif + %description KOffice is an integrated office suite. @@ -203,23 +275,22 @@ KOffice is an integrated office suite. %package suite Summary: An integrated office suite Group: Applications/Productivity -Obsoletes: %{name} <= %{version}-%{release} -Obsoletes: %{name}-i18n < 4:%{version} -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-kword = %{version}-%{release} -Requires: %{name}-kspread = %{version}-%{release} -Requires: %{name}-kpresenter = %{version}-%{release} -Requires: %{name}-kivio = %{version}-%{release} -Requires: %{name}-karbon = %{version}-%{release} -Requires: %{name}-kugar = %{version}-%{release} -Requires: %{name}-kexi = %{version}-%{release} -Requires: %{name}-kexi-driver-mysql = %{version}-%{release} -%{?with_postgresql:Requires: %{name}-kexi-driver-pgsql = %{version}-%{release}} -Requires: %{name}-kchart = %{version}-%{release} -Requires: %{name}-kformula = %{version}-%{release} -Requires: %{name}-filters = %{version}-%{release} -Requires: %{name}-kplato = %{version}-%{release} -Requires: %{name}-chalk = %{version}-%{release} +Obsoletes: %{name} <= %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kword = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kspread = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kpresenter = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kivio = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-karbon = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kugar = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kexi-driver-mysql = %{?epoch:%{epoch}:}%{version}-%{release} +%{?with_postgresql:Requires: %{name}-kexi-driver-pgsql = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: %{name}-kchart = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kformula = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kplato = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-chalk = %{?epoch:%{epoch}:}%{version}-%{release} %description suite KOffice is an integrated office suite. @@ -232,31 +303,12 @@ KOffice is an integrated office suite. %package core Summary: Core support files for %{name} Group: Applications/Productivity -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: perl %description core %{summary}. -%posttrans core -gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : -update-desktop-database -q &> /dev/null ||: - -%post core -touch --no-create %{tde_datadir}/icons/crystalsvg &> /dev/null || : -touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || : -touch --no-create %{tde_datadir}/icons/locolor &> /dev/null || : - -%postun core -if [ $1 -eq 0 ]; then - gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : - update-desktop-database -q &> /dev/null ||: -fi - %files core %defattr(-,root,root,-) %doc AUTHORS COPYING README @@ -310,7 +362,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} @@ -327,7 +379,7 @@ fi Summary: Runtime libraries for %{name} Group: System Environment/Libraries Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-kdelibs +Requires: trinity-tdelibs License: LGPLv2+ %description libs @@ -357,18 +409,12 @@ License: LGPLv2+ %{tde_libdir}/libkrossmain.so.* %endif -%post libs -/sbin/ldconfig || : - -%postun libs -/sbin/ldconfig || : - ########## %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} License: LGPLv2+ %description devel @@ -388,20 +434,11 @@ License: LGPLv2+ %package kword Summary: A frame-based word processor capable of professional standard documents Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description kword %{summary}. -%post kword -/sbin/ldconfig || : - -%postun kword -/sbin/ldconfig || : - -%posttrans kword -update-desktop-database -q &> /dev/null ||: - %files kword %defattr(-,root,root,-) %lang(en) %{tde_tdedocdir}/HTML/en/kword/ @@ -422,7 +459,7 @@ update-desktop-database -q &> /dev/null ||: %package kspread Summary: A powerful spreadsheet application Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description kspread %{summary}. @@ -459,20 +496,11 @@ Requires: %{name}-core = %{version}-%{release} %package kpresenter Summary: A full-featured presentation program Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description kpresenter %{summary}. -%post kpresenter -/sbin/ldconfig || : - -%postun kpresenter -/sbin/ldconfig || : - -%posttrans kpresenter -update-desktop-database -q &> /dev/null ||: - %files kpresenter %defattr(-,root,root,-) %lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/ @@ -493,7 +521,7 @@ update-desktop-database -q &> /dev/null ||: %package kivio Summary: A flowcharting application Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: kivio < %{version}-%{release} %description kivio @@ -517,22 +545,17 @@ Obsoletes: kivio < %{version}-%{release} %package karbon Summary: A vector drawing application Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description karbon %{summary}. -%post karbon -/sbin/ldconfig || : - -%postun karbon -/sbin/ldconfig || : - %files karbon %defattr(-,root,root,-) %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.* @@ -548,20 +571,11 @@ Requires: %{name}-core = %{version}-%{release} %package kugar Summary: A tool for generating business quality reports Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description kugar %{summary}. -%post kugar -/sbin/ldconfig || : - -%postun kugar -/sbin/ldconfig || : - -%posttrans kugar -update-desktop-database -q &> /dev/null ||: - %files kugar %defattr(-,root,root,-) %lang(en) %{tde_tdedocdir}/HTML/en/kugar/ @@ -586,7 +600,7 @@ update-desktop-database -q &> /dev/null ||: %package kexi Summary: An integrated environment for managing data Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_postgresql} == 0 Obsoletes: %{name}-kexi-driver-pgsql @@ -596,15 +610,6 @@ Obsoletes: %{name}-kexi-driver-pgsql %{summary}. For additional database drivers take a look at %{name}-kexi-driver-* -%post kexi -/sbin/ldconfig || : - -%postun kexi -/sbin/ldconfig || : - -%posttrans kexi -update-desktop-database -q &> /dev/null ||: - %files kexi %defattr(-,root,root,-) %lang(en) %{tde_tdedocdir}/HTML/en/kexi/ @@ -620,13 +625,13 @@ update-desktop-database -q &> /dev/null ||: %{tde_tdelibdir}/kexi.* # moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs) %{tde_tdelibdir}/libkspreadkexiimport.* -%{tde_datadir}/config/kexirc -%{tde_datadir}/config/magic/kexi.magic +%{tde_confdir}/kexirc +%{tde_confdir}/magic/kexi.magic %{tde_datadir}/mimelnk/application/* %{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} @@ -634,13 +639,14 @@ update-desktop-database -q &> /dev/null ||: %{tde_tdelibdir}/krosskexiapp.* %{tde_tdelibdir}/krosskexidb.* %endif +%{tde_confdir}/magic/kexi.magic.mgc ########## %package kexi-driver-mysql Summary: Mysql-driver for kexi Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} +Requires: %{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release} %description kexi-driver-mysql %{summary}. @@ -659,7 +665,7 @@ Requires: %{name}-kexi = %{version}-%{release} %package kexi-driver-pgsql Summary: Postgresql driver for kexi Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} +Requires: %{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release} %description kexi-driver-pgsql %{summary}. @@ -678,20 +684,11 @@ Requires: %{name}-kexi = %{version}-%{release} %package kchart Summary: An integrated graph and chart drawing tool Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description kchart %{summary}. -%post kchart -/sbin/ldconfig || : - -%postun kchart -/sbin/ldconfig || : - -%posttrans kchart -update-desktop-database -q &> /dev/null ||: - %files kchart %defattr(-,root,root,-) %lang(en) %{tde_tdedocdir}/HTML/en/kchart/ @@ -708,7 +705,7 @@ update-desktop-database -q &> /dev/null ||: %package kformula Summary: A powerful formula editor Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?mgaversion} || 0%{?mdkversion} Requires: fonts-ttf-dejavu @@ -719,7 +716,6 @@ Requires: lyx-cmex10-fonts %endif %if 0%{?rhel} == 5 Requires: dejavu-lgc-fonts -Requires: lyx-cmex10-fonts %endif %if 0%{?suse_version} >= 1220 Requires: dejavu-fonts @@ -747,17 +743,11 @@ Requires: dejavu %package filters Summary: Import and Export Filters for KOffice Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description filters %{summary}. -%post filters -/sbin/ldconfig || : - -%postun filters -/sbin/ldconfig || : - %files filters %defattr(-,root,root,-) %{tde_libdir}/libkwordexportfilters.so.* @@ -817,7 +807,7 @@ Requires: %{name}-core = %{version}-%{release} %package kplato Summary: An integrated project management and planning tool Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description kplato %{summary}. @@ -838,9 +828,9 @@ Requires: %{name}-core = %{version}-%{release} %package chalk Summary: pixel-based image manipulation program for the TDE Office Suite [Trinity] Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-chalk-data = %{version}-%{release} -Requires: %{name}-filters +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-chalk-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release} %description chalk Chalk is a painting and image editing application for KOffice. Chalk contains @@ -848,15 +838,6 @@ both ease-of-use and fun features like guided painting. This package is part of the TDE Office Suite. -%post chalk -/sbin/ldconfig || : - -%postun chalk -/sbin/ldconfig || : - -%posttrans chalk -update-desktop-database -q &> /dev/null ||: - %files chalk %defattr(-,root,root,-) %{tde_bindir}/chalk @@ -1043,17 +1024,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 @@ -1063,7 +1042,7 @@ This package is part of the TDE Office Suite. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -1071,12 +1050,19 @@ This package is part of the TDE Office Suite. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +export kde_confdir="%{tde_confdir}" %if 0%{?suse_version} == 1220 RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])') export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" %endif +# FTBFS on RHEL 5 +%if 0%{?rhel} == 5 +%__sed -i "kexi/migration/keximigratetest.cpp" \ + -e "/TDEApplication/ s|\");|\", true, true, true);|" +%endif + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -1108,6 +1094,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/ @@ -1115,20 +1134,6 @@ rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/ rm -f %{buildroot}%{tde_libdir}/lib*.la # shouldn't these be in koffice-l10n? rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh -# -devel symlinks to nuke -rm -f %{buildroot}%{tde_libdir}/lib*common.so -rm -f %{buildroot}%{tde_libdir}/lib*filters.so -rm -f %{buildroot}%{tde_libdir}/lib*private.so -rm -f %{buildroot}%{tde_libdir}/libkarbon*.so -rm -f %{buildroot}%{tde_libdir}/libkchart*.so -rm -f %{buildroot}%{tde_libdir}/libkexi*.so -rm -f %{buildroot}%{tde_libdir}/libkisexiv2.so -rm -f %{buildroot}%{tde_libdir}/libkformdesigner.so -rm -f %{buildroot}%{tde_libdir}/libkplato*.so -rm -f %{buildroot}%{tde_libdir}/libkpresenter*.so -rm -f %{buildroot}%{tde_libdir}/libkword*.so -rm -f %{buildroot}%{tde_libdir}/libkross*.so -rm -f %{buildroot}%{tde_libdir}/libkugar*.so %clean @@ -1136,5 +1141,3 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-10 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec index 34dfb6606..b620d022d 100644 --- a/redhat/applications/koffice/koffice-3.5.13.2.spec +++ b/redhat/applications/koffice/koffice-3.5.13.2.spec @@ -5,11 +5,6 @@ # 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_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -41,7 +36,7 @@ Name: trinity-%{tde_pkg} Summary: An integrated office suite Version: 1.6.3 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist} Group: Applications/Productivity License: GPLv2+ @@ -55,10 +50,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: koffice-3.5.13.2-fix_kformula_ftbfs.patch -Patch2: koffice-3.5.13.2-fix_ruby2_detection.patch -Patch3: admin-fix-parallel-test.diff - # BuildRequires: world-devel ;) BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -328,7 +319,7 @@ fi Summary: Runtime libraries for %{name} Group: System Environment/Libraries Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-kdelibs +Requires: trinity-tdelibs License: LGPLv2+ %description libs @@ -1062,9 +1053,6 @@ This package is part of the TDE Office Suite. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs -%patch2 -p1 -b .ruby2 -%patch3 -p1 -b .automake113 # use LGC variant instead %__sed -i.dejavu-lgc \ @@ -1073,7 +1061,7 @@ This package is part of the TDE Office Suite. lib/kformula/{contextstyle,fontstyle,symboltable}.cc %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -1167,38 +1155,3 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-9 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-7 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-6 -- Initial release for TDE 3.5.13.1 - -* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5 -- Fix kformula dependancies (for RHEL6) -- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3] - Clean up lib paths in LDFLAGS - moved to LIBADD - For KWord and and KPresenter added linking kspell2 - For KSpread added linking kutils -- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307] - -* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4 -- Updates BuildRequires -- Build for Fedora 17 -- Fix compilation with GCC 4.7 [Bug #958] -- Fix compilation with Ruby 1.9 [Bug #735] -- Fix compilation with libpng [Bug #603] - -* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3 -- Fix GraphicksMagick 1.3 support [Bug #353] -- Various patches for kexi [Bug #777] - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2 -- Fix HTML directory location - -* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn' -- Removed 'krita', added 'chalk' diff --git a/redhat/applications/koffice/trinity-koffice-rpmlintrc b/redhat/applications/koffice/trinity-koffice-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/applications/koffice/trinity-koffice-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) |