RHEL/Fedora: updates kdelibs 3.5.13

7 files changed, 105 insertions, 41 deletions

diff --git a/redhat/applications/abakus/trinity-abakus-3.5.13.spec b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
index 616896d1e..c47b06adc 100644
--- a/redhat/applications/abakus/trinity-abakus-3.5.13.spec
+++ b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp abakus
 %define version 0.91
-%define release 2
+%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -45,7 +45,7 @@ AbaKus is a complex calculator, which provides
 many different kinds of calculations.
 Think of it as bc (the command-line calculator) with a nice GUI.
 It also gives information about mathematical variables and
-has the user-friendly menu options of a normal KDE application.
+has the user-friendly menu options of a normal TDE application.
 
 %prep
 %setup -q -n applications/%{kdecomp}
@@ -56,7 +56,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 export CXXFLAGS="-I%{_includedir}/tqt"
 
 ./configure
-	
+
 %__make %{?_smp_mflags}
 
 
@@ -84,11 +84,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %doc AUTHORS COPYING
 %{_bindir}/*
 %{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
 %{tde_docdir}/HTML/*/*/
 %{_datadir}/applnk/Utilities/abakus.desktop
 
 %Changelog
+* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-3
+- Fix postinstall
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-2
 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch b/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
index f444392af..16ed9beb9 100644
--- a/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
+++ b/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
@@ -31,9 +31,9 @@ diff -Nuar amarok.ORI/amarok/src/engine/akode/CMakeLists.txt amarok.P/amarok/src
 +install( FILES amarok_aKode-engine.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 +
 +
-+##### libamarok_akode-engine (module) ############
++##### libamarok_aKode-engine (module) ############
 +
-+tde_add_kpart( libamarok_akode-engine AUTOMOC
++tde_add_kpart( libamarok_aKode-engine AUTOMOC
 +  SOURCES
 +    akode-scope.cpp akode-engine.cpp
 +  LINK amarok-shared ${AKODE_LIBRARIES}
diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec
index be97d0cc4..1dfa40e1d 100644
--- a/redhat/applications/amarok/trinity-amarok.spec
+++ b/redhat/applications/amarok/trinity-amarok.spec
@@ -1,7 +1,7 @@
 # Basic package informations
 %define kdecomp amarok
 %define version 1.4.10
-%define release 4
+%define release 5
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -47,7 +47,11 @@ BuildRequires:  trinity-kdebase-devel
 BuildRequires:  taglib-devel 
 BuildRequires:  libifp-devel
 # Ipod
+%if 0%{?rhel} == 5
+BuildRequires:  trinity-libgpod-devel >= 0.4.2
+%else
 BuildRequires:  libgpod-devel >= 0.4.2
+%endif
 BuildRequires:	libmp4v2-devel
 # MTP players
 BuildRequires:  libmtp-devel
@@ -82,6 +86,7 @@ Requires:  xdg-utils
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
+%if "%{?_prefix}" == "%{_usr}"
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 
 Obsoletes: amarok-devel < %{version}-%{release}
@@ -93,10 +98,12 @@ Provides:  amarok-devel = %{version}-%{release}
 # engines, etc...
 # old, obsolete ones: arts, akode
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+%endif
+
 # xine-lib
 BuildRequires:  xine-lib-devel
-Provides: %{name}-engine-xine = %{version}-%{release}
 
+Provides: %{name}-engine-xine = %{version}-%{release}
 
 %description
 Amarok is a multimedia player with:
@@ -274,7 +281,7 @@ xdg-desktop-menu forceupdate 2> /dev/null || :
 %{tde_libdir}/libamarok_yauap-engine_plugin.*
 # AKODE
 %{_datadir}/services/amarok_aKode-engine.desktop
-%{tde_libdir}/libamarok_akode-engine.*
+%{tde_libdir}/libamarok_aKode-engine.*
 
 
 
@@ -290,6 +297,9 @@ xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %changelog
+* Mon Mar 19 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-5
+- Replaces BR "libgpod" with "trinity-libgpod" for EL5
+
 * Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-4
 - Enable 'akode' support
 - Removes 'libvisual-plugins' dependency (obsolete ?)
diff --git a/redhat/applications/basket/trinity-basket-3.5.13.spec b/redhat/applications/basket/trinity-basket-3.5.13.spec
index 866bf10db..49cbcf219 100644
--- a/redhat/applications/basket/trinity-basket-3.5.13.spec
+++ b/redhat/applications/basket/trinity-basket-3.5.13.spec
@@ -71,7 +71,8 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 %configure \
 	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+    --with-extra-includes=%{_includedir}/tqt \
+    --disable-static
 
 %__make %{?_smp_mflags}
 
diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec
index 04b6ef65c..bab8aa4ab 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine.spec
+++ b/redhat/applications/kaffeine/trinity-kaffeine.spec
@@ -1,12 +1,13 @@
 # Default version for this component
 %define kdecomp kaffeine
-%define version 0.8.6
-%define release 2
+%define version 0.8.8
+%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
 %define _docdir %{_prefix}/share/doc
+%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -17,17 +18,28 @@ BuildRequires: autoconf automake libtool m4
 
 
 Name:		trinity-%{kdecomp}
-Summary:	sudo frontend for Trinity
+Summary: Xine-based media player
 
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 
 License: GPLv2+
-Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
 
-Source0: kaffeine-3.5.13.tar.gz
+Source0:	kaffeine-3.5.13.tar.gz
+Source2:	kaffeine.1
+
+# [kaffeine] Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
+Source1:		508cb342-logo
+
+# [kaffeine] Fix nominal "tqt" typos and fix slow DVB start. This closes bug reports 729 and 899.
+Patch1:			1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff
+# [kaffeine] Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
+Patch2:			1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff
+# [kaffeine] Fix typos, branding, and inadvertent tqt changes.
+Patch3:			1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -79,14 +91,18 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -q -n applications/kaffeine
 
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
-  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f admin/Makefile.common
 
 %build
@@ -94,18 +110,18 @@ unset QTDIR || : ; source /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
-# easier than patching, and using 
-#  --with-extra-includes=%{_includedir}/cdda below -- Rex
-#CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
 
 %configure \
-  --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --disable-final \
+  --disable-dependency-tracking --enable-final \
+  --disable-rpath \
+  --with-xinerama \
   --with-gstreamer \
   --without-lame \
   --with-extra-includes=%{_includedir}/tqt \
+  --with-extra-libs=%{_prefix}/%{_lib} \
+  --enable-closure \
 %if 0%{?rhel} > 0 && 0%{?rhel} <= 5
   --without-dvb \
 %endif
@@ -143,6 +159,8 @@ fi
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
 
+%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/kaffeine/logo
+%__install -D -m 644 %{SOURCE2} %{?buildroot}%{_mandir}/man1/kaffeine.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -180,6 +198,7 @@ update-desktop-database >& /dev/null ||:
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{tde_docdir}/HTML/en/kaffeine
+%{_mandir}/*/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -193,6 +212,13 @@ update-desktop-database >& /dev/null ||:
 
 
 %changelog
+* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
+- Updates version to 0.8.8
+- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]
+- Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
+- Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
+- Add man page
+
 * Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2
 - Disable 'libxcb-devel' for RHEL 5 compilation
 - Fix HTML directory location
diff --git a/redhat/applications/kile/trinity-kile.spec b/redhat/applications/kile/trinity-kile.spec
index f3defbc8e..36c013774 100644
--- a/redhat/applications/kile/trinity-kile.spec
+++ b/redhat/applications/kile/trinity-kile.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kile
 %define version 2.0.2
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -402,7 +402,7 @@ This package contains the Chinese Simplified translations for Kile.
 
 
 %description
-Kile is a user-friendly LaTeX source editor and TeX shell for KDE.
+Kile is a user-friendly LaTeX source editor and TeX shell for TDE.
 
 The source editor is a multi-document editor designed for .tex and .bib
 files.  Menus, wizards and auto-completion are provided to assist with
@@ -421,11 +421,12 @@ Kile can support large projects consisting of several smaller files.
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
-  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %__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/config/ltmain.sh" "admin/ltmain.sh" || \
+%__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -434,8 +435,8 @@ export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --disable-rpath \
+  --with-extra-includes=%{_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
@@ -465,8 +466,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %defattr(-,root,root,-)
 %{_bindir}/kile
 %{_datadir}/applications/kde/kile.desktop
-%{_datadir}/apps/katepart/syntax/bibtex.xml
-%{_datadir}/apps/katepart/syntax/latex.xml
+%exclude %{_datadir}/apps/katepart/syntax/bibtex.xml
+%exclude %{_datadir}/apps/katepart/syntax/latex.xml
 %{_datadir}/apps/kconf_update
 %{_datadir}/apps/kile
 %{_datadir}/config.kcfg/kile.kcfg
@@ -622,5 +623,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Fri Apr 20 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2
+- Fix file conflict with trinity-kdelibs
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec
index 17a6329c4..5e8a87d0c 100644
--- a/redhat/applications/koffice/trinity-koffice.spec
+++ b/redhat/applications/koffice/trinity-koffice.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp koffice
 %define version 1.6.3
-%define release 2
+%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -15,6 +15,7 @@ BuildRequires: autoconf automake libtool m4
 %define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
 
+# Disable Kross support for RHEL <= 5 (python is too old)
 %if 0%{?fedora} > 0 || 0%{?rhel} >= 6
 %define with_kross 1
 %endif
@@ -38,12 +39,22 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 Source1:	chalk.xpm
 Source100:      koshell.png
 
-# [koffice] Disable GraphicksMagick version >= 1.2.0
+# [koffice] Disable GraphicksMagick version >= 1.2.0 [Bug #353]
 Patch0:		koffice-3.5.13-disable_graphicksmagick.patch
-# [filters/chalk/pdf] Fix poppler-qt detection
+# [filters/chalk/pdf] Fix poppler-qt detection [Bug #783]
 Patch1:		koffice-3.5.13-fix_poppler_detect.patch
-# [lib/kross/python/scripts/RestrictedPython/Utilities.py] Syntax error
+# [lib/kross/python/scripts/RestrictedPython/Utilities.py] Syntax error [Bug #679]
 Patch2:		koffice-3.5.13-kross_utilities_syntax.patch
+# [koffice/chalk] Fix GraphicksMagick 1.3 support [Bug #353]
+Patch3:		koffice-3.5.13-chalk_gmagick.patch
+# [koffice/kexi] Various patches for kexi, found on the web [Bug # 777]
+Patch5:		kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch
+Patch6:		kexi-hide_hourglass-1.1.3-2.patch
+Patch7:		kexi-fix-support-for-boolean-types-in-migration.patch
+Patch8:		kexi-mysql_migrate_long_text-1.1.3.patch
+Patch9:		kexi-fix-support-for-boolean-types.patch
+Patch10:	kexi-thoushand_objects_support-1.1.3-2.patch
+Patch11:	kexi-fp_expressions-1.1.3.patch
 
 # BuildRequires: world-devel ;)
 BuildRequires:  trinity-kdelibs-devel
@@ -80,10 +91,7 @@ BuildRequires:  libpaper-devel
 BuildRequires:  libXi-devel
 BuildRequires:	libutempter-devel
 BuildRequires:	poppler-qt-devel >= 0.1.2
-
-# GraphicsMagick version >= 1.2.0 is not compatible with Koffice 1.6
-BuildRequires: GraphicsMagick-devel >= 1.1.0
-BuildRequires: GraphicsMagick-devel < 1.2.0
+BuildRequires:	GraphicsMagick-devel >= 1.1.0
 
 # libwpd for FC15 and FC16 is too recent for Koffice ! (0.9.x)
 # So we built an alternate 0.8.x package !
@@ -277,9 +285,17 @@ This package is part of the KDE Office Suite.
 
 %prep
 %setup -q -n applications/%{kdecomp}
-%patch0 -p1
+#patch0 -p1
 #patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
+%patch11 -p0
 
 # use LGC variant instead
 sed -i.dejavu-lgc \
@@ -959,6 +975,10 @@ update-desktop-database -q &> /dev/null ||:
 
 
 %changelog
+* 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