summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec3
-rw-r--r--redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec7
-rw-r--r--redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec2
-rw-r--r--redhat/applications/koffice/trinity-koffice-3.5.13-sru.spec6
-rw-r--r--redhat/applications/koffice/trinity-koffice-3.5.13.spec23
-rw-r--r--redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec158
-rw-r--r--redhat/applications/kpowersave/trinity-kpowersave-3.5.13.spec (renamed from redhat/applications/kpowersave/trinity-kpowersave.spec)0
-rw-r--r--redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec1
-rwxr-xr-xredhat/dependencies/arts/trinity-arts-3.5.13.spec3
-rw-r--r--redhat/extras/kdebluetooth/kdebluetooth-trinity.patch48
-rw-r--r--redhat/extras/kdebluetooth/trinity-kdebluetooth.spec21
-rw-r--r--redhat/kde-i18n/kde-i18n-zh_TW-3.5.10.patch.gzbin0 -> 1335843 bytes
-rw-r--r--redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec158
-rw-r--r--redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec18
-rw-r--r--redhat/kdebase/kdebase-3.5.13-fix_tooltip_lock.patch29
-rw-r--r--redhat/kdebase/trinity-kdebase-3.5.13.spec34
-rw-r--r--redhat/kdebindings/trinity-kdebindings-3.5.13.spec3
-rw-r--r--redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec2
-rw-r--r--redhat/kdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch20
-rw-r--r--redhat/kdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch53
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.13.spec29
-rw-r--r--redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch24
-rw-r--r--redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec26
-rw-r--r--redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch10
-rw-r--r--redhat/kdepim/trinity-kdepim-3.5.13.spec7
-rw-r--r--redhat/kdevelop/trinity-kdevelop-3.5.13.spec6
-rw-r--r--redhat/libraries/libksquirrel/trinity-libksquirrel.spec9
27 files changed, 564 insertions, 136 deletions
diff --git a/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec
index efad8aef6..01b03b014 100644
--- a/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec
+++ b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec
@@ -68,7 +68,8 @@ unset QTDIR; . /etc/profile.d/qt.sh
%patch1 -p1
%__cp -f "/usr/share/aclocal/libtool.m4" .
-%__cp -f "/usr/share/libtool/config/ltmain.sh" .
+%__cp -f "/usr/share/libtool/config/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
+
autoreconf -fiv
diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
index df4218b5d..b560c7647 100644
--- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
+++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
@@ -48,8 +48,9 @@ Patch1: bp001-9b57232f.diff
Patch2: bp002-d654b107.diff
BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
%description
@@ -130,7 +131,7 @@ done
%{tde_tdedocdir}/HTML/*/*
%{tde_datadir}/services/*.desktop
%{tde_datadir}/applnk/Development/*.desktop
-%{tde_datadir}/applnk/.hidden/*.desktop
+%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
%{tde_mandir}/man*/*
%{tde_tdelibdir}/*.so
diff --git a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
index 9e01de404..dfe995a5f 100644
--- a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
+++ b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
@@ -118,7 +118,9 @@ This package contains development files needed for KMyMoney plugins.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%if 0%{?mgaversion} || 0%{?mdkversion}
%patch5 -p1 -b .qtpluginsdir
+%endif
%__install -m644 %{SOURCE1} kmymoney2/widgets/
diff --git a/redhat/applications/koffice/trinity-koffice-3.5.13-sru.spec b/redhat/applications/koffice/trinity-koffice-3.5.13-sru.spec
index f7ed27a99..7de29d6dc 100644
--- a/redhat/applications/koffice/trinity-koffice-3.5.13-sru.spec
+++ b/redhat/applications/koffice/trinity-koffice-3.5.13-sru.spec
@@ -102,12 +102,6 @@ BuildRequires: libpaper-devel
BuildRequires: libutempter-devel
BuildRequires: GraphicsMagick-devel >= 1.1.0
-#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-#BuildRequires: poppler-qt-devel >= 0.1.2
-#%else
-#BuildRequires: trinity-poppler-qt3-devel >= 0.1.2
-#%endif
-
BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel
# These libraries are either too old or too recent on distributions !
diff --git a/redhat/applications/koffice/trinity-koffice-3.5.13.spec b/redhat/applications/koffice/trinity-koffice-3.5.13.spec
index 996f785d1..255c5560f 100644
--- a/redhat/applications/koffice/trinity-koffice-3.5.13.spec
+++ b/redhat/applications/koffice/trinity-koffice-3.5.13.spec
@@ -23,7 +23,7 @@
%define _docdir %{tde_docdir}
# Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6
+%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion}
%define with_kross 1
%endif
@@ -38,7 +38,7 @@
Name: trinity-%{kdecomp}
-Summary: An integrated office suite
+Summary: An integrated office suite
Version: 1.6.3
Release: 5%{?dist}%{?_variant}
@@ -117,30 +117,23 @@ BuildRequires: libpaper-devel
BuildRequires: libutempter-devel
BuildRequires: GraphicsMagick-devel >= 1.1.0
-#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-#BuildRequires: poppler-qt-devel >= 0.1.2
-#%else
-#BuildRequires: trinity-poppler-qt3-devel >= 0.1.2
-#%endif
-
BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel
# These libraries are either too old or too recent on distributions !
# We always provide our versions with TDE...
BuildRequires: trinity-libwpd-devel
+BuildRequires: trinity-libpqxx-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}mesagl1-devel
BuildRequires: %{_lib}mesaglu1-devel
BuildRequires: %{_lib}xi-devel
BuildRequires: wv2-devel
-BuildRequires: libpqxx-devel
%else
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libXi-devel
BuildRequires: trinity-wv2-devel
-BuildRequires: trinity-libpqxx-devel
%endif
%description
@@ -272,12 +265,18 @@ Requires: %{name}-core = %{version}-%{release}
Summary: A powerful formula editor
Group: Applications/Productivity
Requires: %{name}-core = %{version}-%{release}
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires: fonts-ttf-dejavu
+%else
Requires: lyx-cmex10-fonts
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
Requires: dejavu-lgc-sans-fonts
%else
Requires: dejavu-lgc-fonts
%endif
+%endif
+
%description kformula
%{summary}.
@@ -380,7 +379,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--with-pic --enable-shared --disable-static \
--with-extra-libs=%{tde_libdir} \
--enable-final \
- --with-extra-includes=%{tde_includedir}/tqt \
+ --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/arts \
--enable-closure \
--disable-kexi-macros \
--with-pqxx-includes=%{tde_includedir} \
@@ -422,10 +421,12 @@ desktop-file-install \
## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
## until http://bugzilla.redhat.com/245190 is fixed
+%if 0%{?rhel} || 0%{?fedora}
for desktop_file in %{buildroot}%{tde_datadir}/applnk/.hidden/*.desktop ; do
grep "^NoDisplay=" ${desktop_file} || \
echo "NoDisplay=True" >> ${desktop_file}
done
+%endif
## unpackaged files
# fonts
diff --git a/redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec b/redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec
new file mode 100644
index 000000000..c160aa2ea
--- /dev/null
+++ b/redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec
@@ -0,0 +1,158 @@
+# Default version for this component
+%define kdecomp kpowersave
+
+# 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 3.5.13 specific building variables
+%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}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name: trinity-%{kdecomp}
+Version: 0.7.3
+Release: 3%{?dist}%{?_variant}
+Summary: HAL based power management applet for Trinityfiles or directories.
+
+License: GPLv2+
+Group: Applications/Utilities
+
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{kdecomp}-3.5.13.tar.gz
+
+# [kpowersave] Switch to v3.5.13-sru branch
+Patch0: kpowersave-3.5.13-sru-20120818.patch
+
+BuildRequires: dbus-tqt-devel
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+KPowersave is a TDE systray applet which allows to control the power
+management settings and policies of your computer.
+It relies on HAL to do the heavy lifting.
+
+Current feature list:
+ * support for ACPI, APM and PMU
+ * trigger suspend to disk/ram and standby
+ * switch cpu frequency policy (between: performance, dynamic and powersave)
+ * applet icon with information about AC state, battery fill and battery
+ (warning) states
+ * applet tooltip with information about battery fill and remaining battery
+ time/percentage
+ * autosuspend (to suspend the machine if the user has been inactive for a
+ defined time)
+ * a global configurable blacklist with programs which prevent autosuspend
+ (e.g. videoplayer and cd burning tools)
+ * trigger lock screen and select the lock method
+ * KNotify support
+ * online help
+ * localisations for many languages
+
+KPowersave supports schemes with following configurable specific
+settings for:
+ * screensaver
+ * DPMS
+ * autosuspend
+ * scheme specific blacklist for autosuspend
+ * notification settings
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+update-desktop-database %{tde_appdir} > /dev/null
+/sbin/ldconfig
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%postun
+update-desktop-database %{tde_appdir} > /dev/null
+/sbin/ldconfig
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{tde_bindir}/kpowersave
+%{tde_libdir}/libkdeinit_kpowersave.la
+%{tde_libdir}/libkdeinit_kpowersave.so
+%{tde_tdelibdir}/kpowersave.la
+%{tde_tdelibdir}/kpowersave.so
+%{tde_tdeappdir}/kpowersave.desktop
+%{tde_datadir}/apps/kpowersave/eventsrc
+%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/autostart/kpowersave-autostart.desktop
+%{tde_datadir}/config/kpowersaverc
+
+%Changelog
+* Sat Aug 18 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
+- Rebuilt for tdelibs-3.5.13-11
+- Switch to v3.5.13-sru branch
+
+* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
+- Add missing /sbin/ldconfig
+- Add missing doc file
+
+* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/trinity-kpowersave.spec b/redhat/applications/kpowersave/trinity-kpowersave-3.5.13.spec
index b496d3af6..b496d3af6 100644
--- a/redhat/applications/kpowersave/trinity-kpowersave.spec
+++ b/redhat/applications/kpowersave/trinity-kpowersave-3.5.13.spec
diff --git a/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec b/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec
index 9ef78c80a..053e24ad0 100644
--- a/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec
+++ b/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec
@@ -66,6 +66,7 @@ BuildRequires: fontconfig-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jack-devel
%else
+BuildRequires: lirc-devel
BuildRequires: jack-audio-connection-kit-devel
%endif
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index e497cafb2..a4c3fd276 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -33,6 +33,8 @@ Patch0: arts-3.5.13-enable_oss.patch
# TDE 3.5.13: Re-enable lost JACK support
Patch1: arts-3.5.13-enable_jack.patch
+Patch2: arts-3.5.13-add_pulseaudio_support.patch
+
BuildRequires: tqtinterface-devel
BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel
@@ -87,6 +89,7 @@ Development files for %{name}
%setup -q -n dependencies/arts
%patch0 -p1
%patch1 -p1
+%patch2 -p1 -b .pulse
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
diff --git a/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch
index e62d343a8..81a073d71 100644
--- a/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch
+++ b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch
@@ -1,7 +1,11 @@
-diff -Nuar kdebluetooth.ORI/admin/acinclude.m4.in kdebluetooth.P/admin/acinclude.m4.in
---- kdebluetooth.ORI/admin/acinclude.m4.in 2012-02-12 14:10:33.093808915 +0100
-+++ kdebluetooth.P/admin/acinclude.m4.in 2012-02-12 14:13:57.437558226 +0100
-@@ -483,10 +483,10 @@
+--- a/admin/acinclude.m4.in.trinity 2007-09-05 18:30:55.000000000 +0200
++++ a/admin/acinclude.m4.in 2012-08-19 12:48:49.872571920 +0200
+@@ -479,14 +479,14 @@
+ if test "$kde_qtver" = "2"; then
+ kde_moduledir='\${libdir}/kde2'
+ else
+- kde_moduledir='\${libdir}/kde3'
++ kde_moduledir='\${libdir}/trinity'
fi
fi
if test -z "$kde_styledir"; then
@@ -14,6 +18,42 @@ diff -Nuar kdebluetooth.ORI/admin/acinclude.m4.in kdebluetooth.P/admin/acinclude
fi
if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde'
+@@ -546,7 +546,7 @@
+
+ AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
+ [
+- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
++ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
+ test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+ if test -n "$KDEDIRS"; then
+ kde_save_IFS=$IFS
+@@ -612,7 +612,7 @@
+ KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
+
+ if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
+- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
++ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
+ test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+ AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
+ if test "$KDE_XSL_STYLESHEET" = "NO"; then
+@@ -1793,7 +1793,7 @@
+
+ if test -z "$1"; then
+
+-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
++kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
+ test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+ kde_incdirs="$ac_kde_includes $kde_incdirs"
+ AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
+@@ -1805,7 +1805,7 @@
+ So, check this please and use another prefix!])
+ fi
+
+-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
++kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+ test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+ kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
+ AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1813,7 +1813,7 @@
kde_widgetdir=NO
diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
index a3c4e04c3..454eff149 100644
--- a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
+++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
@@ -58,7 +58,9 @@ BuildRequires: obexftp-devel
%endif
Requires: %{name}-libs = %{version}-%{release}
-Requires: trinity-kdesu
+
+# kdesu binary
+Requires: trinity-tdebase-bin
@@ -134,8 +136,8 @@ export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir}/dbus-1.0"
--disable-debug \
--disable-dependency-tracking \
--enable-final \
- --enable-closure \
- --with-extra-includes=%{tde_includedir}/tqt:
+ --enable-closure \
+ --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
@@ -168,6 +170,15 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/*.a
rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/kde3/*.a
+%find_lang kdebluetooth
+
+# Unwanted files
+%__rm -f %{buildroot}%{tde_tdelibdir}/kcm_btpaired.a
+%__rm -f %{buildroot}%{tde_tdelibdir}/kio_bluetooth.a
+%__rm -f %{buildroot}%{tde_tdelibdir}/kio_obex.a
+%__rm -f %{buildroot}%{tde_tdelibdir}/kio_sdp.a
+%__rm -f %{buildroot}%{tde_datadir}/applnk/Settings/Network/Bluetooth/.directory
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -184,7 +195,7 @@ touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
-%files
+%files -f kdebluetooth.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README
%{tde_bindir}/kblue*
@@ -224,7 +235,7 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
%files devel
%defattr(-,root,root,-)
-%{tde_includedir}/*
+%{tde_tdeincludedir}/*
%{tde_libdir}/*.so
diff --git a/redhat/kde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz b/redhat/kde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz
new file mode 100644
index 000000000..3787c6d9a
--- /dev/null
+++ b/redhat/kde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz
Binary files differ
diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
index baabed60d..635e08f94 100644
--- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
@@ -19,10 +19,10 @@ BuildRequires: autoconf automake libtool m4
%endif
-Name: trinity-kde-i18n
+Name: trinity-i18n
Summary: Internationalization support for Trinity
Version: 3.5.13
-Release: 6%{?dist}%{?_variant}
+Release: 7%{?dist}%{?_variant}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
@@ -53,18 +53,18 @@ Patch1: trinity-kde-i18n-fr-openterminalhere.patch
Patch2: kde-i18n-3.5.13-add_french_translations.patch
# TDE 3.5.13: Updated translations for zh_TW, thanks to Wei-Lun Chao !
-Patch3: kde-i18n-3.5.13-add_zh_TW_translations.patch
+Patch3: kde-i18n-zh_TW-3.5.10.patch.gz
BuildRequires: findutils
BuildRequires: gettext
BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-tdelibs-devel
%description
%{summary}.
%package Afrikaans
-Summary: Afrikaans(af) language support for KDE3
+Summary: Afrikaans(af) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-af = %{version}-%{release}
#Requires: kde-filesystem
@@ -72,7 +72,7 @@ Provides: %{name}-af = %{version}-%{release}
%{summary}.
%package Arabic
-Summary: Arabic(ar) language support for KDE3
+Summary: Arabic(ar) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-ar = %{version}-%{release}
#Requires: kde-filesystem
@@ -80,7 +80,7 @@ Provides: %{name}-ar = %{version}-%{release}
%{summary}.
%package Azerbaijani
-Summary: Azerbaijani(az) language support for KDE3
+Summary: Azerbaijani(az) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-az = %{version}-%{release}
#Requires: kde-filesystem
@@ -88,7 +88,7 @@ Provides: %{name}-az = %{version}-%{release}
%{summary}.
%package Belarusian
-Summary: Belarusian(be) language support for KDE3
+Summary: Belarusian(be) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-be = %{version}-%{release}
#Requires: kde-filesystem
@@ -96,7 +96,7 @@ Provides: %{name}-be = %{version}-%{release}
%{summary}.
%package Bulgarian
-Summary: Bulgarian(bg) language support for KDE3
+Summary: Bulgarian(bg) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-bg = %{version}-%{release}
#Requires: kde-filesystem
@@ -104,7 +104,7 @@ Provides: %{name}-bg = %{version}-%{release}
%{summary}.
%package Bengali
-Summary: Bengali(bn) language support for KDE3
+Summary: Bengali(bn) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-bn = %{version}-%{release}
#Requires: kde-filesystem
@@ -112,7 +112,7 @@ Provides: %{name}-bn = %{version}-%{release}
%{summary}.
%package Tibetan
-Summary: Tibetan(bo) language support for KDE3
+Summary: Tibetan(bo) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-bo = %{version}-%{release}
#Requires: kde-filesystem
@@ -120,7 +120,7 @@ Provides: %{name}-bo = %{version}-%{release}
%{summary}.
%package Breton
-Summary: Breton(br) language support for KDE3
+Summary: Breton(br) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-br = %{version}-%{release}
#Requires: kde-filesystem
@@ -128,7 +128,7 @@ Provides: %{name}-br = %{version}-%{release}
%{summary}.
%package Bosnian
-Summary: Bosnian(bs) language support for KDE3
+Summary: Bosnian(bs) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-bs = %{version}-%{release}
#Requires: kde-filesystem
@@ -136,7 +136,7 @@ Provides: %{name}-bs = %{version}-%{release}
%{summary}.
%package Catalan
-Summary: Catalan(ca) language support for KDE3
+Summary: Catalan(ca) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-ca = %{version}-%{release}
#Requires: kde-filesystem
@@ -144,7 +144,7 @@ Provides: %{name}-ca = %{version}-%{release}
%{summary}.
%package Czech
-Summary: Czech(cs) language support for KDE3
+Summary: Czech(cs) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-cs = %{version}-%{release}
#Requires: kde-filesystem
@@ -152,14 +152,14 @@ Provides: %{name}-cs = %{version}-%{release}
%{summary}.
%package Cymraeg
-Summary: Cymraeg language support for KDE3
+Summary: Cymraeg language support for TDE
Group: User Interface/Desktops
#Requires: kde-filesystem
%description Cymraeg
%{summary}.
%package Welsh
-Summary: Welsh(cy) language support for KDE3
+Summary: Welsh(cy) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-cy = %{version}-%{release}
#Requires: kde-filesystem
@@ -167,7 +167,7 @@ Provides: %{name}-cy = %{version}-%{release}
%{summary}.
%package Danish
-Summary: Danish(da) language support for KDE3
+Summary: Danish(da) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-da = %{version}-%{release}
#Requires: kde-filesystem
@@ -175,7 +175,7 @@ Provides: %{name}-da = %{version}-%{release}
%{summary}.
%package German
-Summary: German(de) language support for KDE3
+Summary: German(de) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-de = %{version}-%{release}
#Requires: kde-filesystem
@@ -183,7 +183,7 @@ Provides: %{name}-de = %{version}-%{release}
%{summary}.
%package Greek
-Summary: Greek(el) language support for KDE3
+Summary: Greek(el) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-el = %{version}-%{release}
#Requires: kde-filesystem
@@ -191,7 +191,7 @@ Provides: %{name}-el = %{version}-%{release}
%{summary}.
%package British
-Summary: British(en_GB) English support for KDE3
+Summary: British(en_GB) English support for TDE
Group: User Interface/Desktops
Provides: %{name}-en_GB = %{version}-%{release}
#Requires: kde-filesystem
@@ -199,7 +199,7 @@ Provides: %{name}-en_GB = %{version}-%{release}
%{summary}.
%package Esperanto
-Summary: Esperanto(eo) support for KDE3
+Summary: Esperanto(eo) support for TDE
Group: User Interface/Desktops
Provides: %{name}-eo = %{version}-%{release}
#Requires: kde-filesystem
@@ -207,7 +207,7 @@ Provides: %{name}-eo = %{version}-%{release}
%{summary}.
%package Spanish
-Summary: Spanish(es) language support for KDE3
+Summary: Spanish(es) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-es = %{version}-%{release}
#Requires: kde-filesystem
@@ -215,7 +215,7 @@ Provides: %{name}-es = %{version}-%{release}
%{summary}.
%package Estonian
-Summary: Estonian(et) language support for KDE3
+Summary: Estonian(et) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-et = %{version}-%{release}
#Requires: kde-filesystem
@@ -223,7 +223,7 @@ Provides: %{name}-et = %{version}-%{release}
%{summary}.
%package Basque
-Summary: Basque(eu) language support for KDE3
+Summary: Basque(eu) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-eu = %{version}-%{release}
#Requires: kde-filesystem
@@ -231,7 +231,7 @@ Provides: %{name}-eu = %{version}-%{release}
%{summary}.
%package Farsi
-Summary: Farsi(fa) language support for KDE3
+Summary: Farsi(fa) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-fa = %{version}-%{release}
#Requires: kde-filesystem
@@ -239,7 +239,7 @@ Provides: %{name}-fa = %{version}-%{release}
%{summary}.
%package Finnish
-Summary: Finnish(fi) language support for KDE3
+Summary: Finnish(fi) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-fi = %{version}-%{release}
#Requires: kde-filesystem
@@ -247,7 +247,7 @@ Provides: %{name}-fi = %{version}-%{release}
%{summary}.
%package Faroese
-Summary: Faroese(fo) language support for KDE3
+Summary: Faroese(fo) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-fo = %{version}-%{release}
#Requires: kde-filesystem
@@ -255,7 +255,7 @@ Provides: %{name}-fo = %{version}-%{release}
%{summary}.
%package French
-Summary: French(fr) language support for KDE3
+Summary: French(fr) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-fr = %{version}-%{release}
#Requires: kde-filesystem
@@ -263,7 +263,7 @@ Provides: %{name}-fr = %{version}-%{release}
%{summary}.
%package Frisian
-Summary: Frisian(fy) language support for KDE3
+Summary: Frisian(fy) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-fy = %{version}-%{release}
#Requires: kde-filesystem
@@ -271,7 +271,7 @@ Provides: %{name}-fy = %{version}-%{release}
%{summary}.
%package Irish
-Summary: Irish(ga) language support for KDE3
+Summary: Irish(ga) language support for TDE
Group: User Interface/Desktops
Obsoletes: kde-i18n-Gaeilge < %{version}
Provides: %{name}-ga = %{version}-%{release}
@@ -280,7 +280,7 @@ Provides: %{name}-ga = %{version}-%{release}
%{summary}.
%package Galician
-Summary: Galician(gl) language support for KDE3
+Summary: Galician(gl) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-gl = %{version}-%{release}
#Requires: kde-filesystem
@@ -288,7 +288,7 @@ Provides: %{name}-gl = %{version}-%{release}
%{summary}.
%package Hebrew
-Summary: Hebrew(he) language support for KDE3
+Summary: Hebrew(he) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-he = %{version}-%{release}
#Requires: kde-filesystem
@@ -296,7 +296,7 @@ Provides: %{name}-he = %{version}-%{release}
%{summary}.
%package Hindi
-Summary: Hindi(hi) language support for KDE3
+Summary: Hindi(hi) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-hi = %{version}-%{release}
#Requires: kde-filesystem
@@ -304,7 +304,7 @@ Provides: %{name}-hi = %{version}-%{release}
%{summary}.
%package Croatian
-Summary: Croatian(hr) language support for KDE3
+Summary: Croatian(hr) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-hr = %{version}-%{release}
#Requires: kde-filesystem
@@ -312,7 +312,7 @@ Provides: %{name}-hr = %{version}-%{release}
%{summary}.
%package Hungarian
-Summary: Hungarian(hu) language support for KDE3
+Summary: Hungarian(hu) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-hu = %{version}-%{release}
#Requires: kde-filesystem
@@ -320,7 +320,7 @@ Provides: %{name}-hu = %{version}-%{release}
%{summary}.
%package Indonesian
-Summary: Indonesian(id) language support for KDE3
+Summary: Indonesian(id) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-id = %{version}-%{release}
#Requires: kde-filesystem
@@ -328,7 +328,7 @@ Provides: %{name}-id = %{version}-%{release}
%{summary}.
%package Icelandic
-Summary: Icelandic(is) language support for KDE3
+Summary: Icelandic(is) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-is = %{version}-%{release}
#Requires: kde-filesystem
@@ -336,7 +336,7 @@ Provides: %{name}-is = %{version}-%{release}
%{summary}.
%package Italian
-Summary: Italian(it) language support for KDE3
+Summary: Italian(it) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-it = %{version}-%{release}
#Requires: kde-filesystem
@@ -344,7 +344,7 @@ Provides: %{name}-it = %{version}-%{release}
%{summary}.
%package Japanese
-Summary: Japanese(ja) language support for KDE3
+Summary: Japanese(ja) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-ja = %{version}-%{release}
#Requires: kde-filesystem
@@ -352,7 +352,7 @@ Provides: %{name}-ja = %{version}-%{release}
%{summary}.
%package Korean
-Summary: Korean(ko) language support for KDE3
+Summary: Korean(ko) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-ko = %{version}-%{release}
#Requires: kde-filesystem
@@ -360,7 +360,7 @@ Provides: %{name}-ko = %{version}-%{release}
%{summary}.
%package Kurdish
-Summary: Kurdish(ku) language support for KDE3
+Summary: Kurdish(ku) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-ku = %{version}-%{release}
#Requires: kde-filesystem
@@ -368,7 +368,7 @@ Provides: %{name}-ku = %{version}-%{release}
%{summary}.
%package Lao
-Summary: Lao(lo) language support for KDE3
+Summary: Lao(lo) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-lo = %{version}-%{release}
#Requires: kde-filesystem
@@ -376,7 +376,7 @@ Provides: %{name}-lo = %{version}-%{release}
%{summary}.
%package Lithuanian
-Summary: Lithuanian(lt) language support for KDE3
+Summary: Lithuanian(lt) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-lt = %{version}-%{release}
#Requires: kde-filesystem
@@ -384,7 +384,7 @@ Provides: %{name}-lt = %{version}-%{release}
%{summary}.
%package Latvian
-Summary: Latvian(lv) language support for KDE3
+Summary: Latvian(lv) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-lv = %{version}-%{release}
#Requires: kde-filesystem
@@ -392,7 +392,7 @@ Provides: %{name}-lv = %{version}-%{release}
%{summary}.
%package Maori
-Summary: Maori(mi) language support for KDE3
+Summary: Maori(mi) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-mi = %{version}-%{release}
#Requires: kde-filesystem
@@ -400,7 +400,7 @@ Provides: %{name}-mi = %{version}-%{release}
%{summary}.
%package Macedonian
-Summary: Macedonian(mk) language support for KDE3
+Summary: Macedonian(mk) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-mk = %{version}-%{release}
#Requires: kde-filesystem
@@ -408,7 +408,7 @@ Provides: %{name}-mk = %{version}-%{release}
%{summary}.
%package Maltese
-Summary: Maltese(mt) language support for KDE3
+Summary: Maltese(mt) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-mt = %{version}-%{release}
#Requires: kde-filesystem
@@ -416,7 +416,7 @@ Provides: %{name}-mt = %{version}-%{release}
%{summary}.
%package Dutch
-Summary: Dutch(nl) language support for KDE3
+Summary: Dutch(nl) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-nl = %{version}-%{release}
#Requires: kde-filesystem
@@ -424,7 +424,7 @@ Provides: %{name}-nl = %{version}-%{release}
%{summary}.
%package Norwegian
-Summary: Norwegian(no) (Bokmaal) language support for KDE3
+Summary: Norwegian(no) (Bokmaal) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-no = %{version}-%{release}
#Requires: kde-filesystem
@@ -432,7 +432,7 @@ Provides: %{name}-no = %{version}-%{release}
%{summary}.
%package Norwegian-Nynorsk
-Summary: Norwegian(nn) (Nynorsk) language support for KDE3
+Summary: Norwegian(nn) (Nynorsk) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-nn = %{version}-%{release}
#Requires: kde-filesystem
@@ -440,7 +440,7 @@ Provides: %{name}-nn = %{version}-%{release}
%{summary}.
%package Occitan
-Summary: Occitan(oc) language support for KDE3
+Summary: Occitan(oc) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-oc = %{version}-%{release}
#Requires: kde-filesystem
@@ -448,7 +448,7 @@ Provides: %{name}-oc = %{version}-%{release}
%{summary}.
%package Polish
-Summary: Polish(pl) language support for KDE3
+Summary: Polish(pl) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-pl = %{version}-%{release}
#Requires: kde-filesystem
@@ -456,7 +456,7 @@ Provides: %{name}-pl = %{version}-%{release}
%{summary}.
%package Portuguese
-Summary: Portuguese(pt) language support for KDE3
+Summary: Portuguese(pt) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-pt = %{version}-%{release}
#Requires: kde-filesystem
@@ -464,7 +464,7 @@ Provides: %{name}-pt = %{version}-%{release}
%{summary}.
%package Punjabi
-Summary: Punjabi(pa) language support for KDE3
+Summary: Punjabi(pa) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-pa = %{version}-%{release}
#Requires: kde-filesystem
@@ -472,7 +472,7 @@ Provides: %{name}-pa = %{version}-%{release}
%{summary}.
%package Brazil
-Summary: Brazil(pt_BR) Portuguese language support for KDE3
+Summary: Brazil(pt_BR) Portuguese language support for TDE
Group: User Interface/Desktops
Provides: %{name}-pt_BR = %{version}-%{release}
#Requires: kde-filesystem
@@ -480,7 +480,7 @@ Provides: %{name}-pt_BR = %{version}-%{release}
%{summary}.
%package Romanian
-Summary: Romanian(ro) language support for KDE3
+Summary: Romanian(ro) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-ro = %{version}-%{release}
#Requires: kde-filesystem
@@ -488,7 +488,7 @@ Provides: %{name}-ro = %{version}-%{release}
%{summary}.
%package Russian
-Summary: Russian(ru) language support for KDE3
+Summary: Russian(ru) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-ru = %{version}-%{release}
#Requires: kde-filesystem
@@ -496,7 +496,7 @@ Provides: %{name}-ru = %{version}-%{release}
%{summary}.
%package Slovak
-Summary: Slovak(sk) language support for KDE3
+Summary: Slovak(sk) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-sk = %{version}-%{release}
#Requires: kde-filesystem
@@ -504,7 +504,7 @@ Provides: %{name}-sk = %{version}-%{release}
%{summary}.
%package Slovenian
-Summary: Slovenian(sl) language support for KDE3
+Summary: Slovenian(sl) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-sl = %{version}-%{release}
#Requires: kde-filesystem
@@ -512,7 +512,7 @@ Provides: %{name}-sl = %{version}-%{release}
%{summary}.
%package Serbian
-Summary: Serbian(sr) language support for KDE3
+Summary: Serbian(sr) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-sr = %{version}-%{release}
#Requires: kde-filesystem
@@ -520,7 +520,7 @@ Provides: %{name}-sr = %{version}-%{release}
%{summary}.
%package Swedish
-Summary: Swedish(sv) language support for KDE3
+Summary: Swedish(sv) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-sv = %{version}-%{release}
#Requires: kde-filesystem
@@ -528,7 +528,7 @@ Provides: %{name}-sv = %{version}-%{release}
%{summary}.
%package Tamil
-Summary: Tamil(ta) language support for KDE3
+Summary: Tamil(ta) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-ta = %{version}-%{release}
#Requires: kde-filesystem
@@ -536,7 +536,7 @@ Provides: %{name}-ta = %{version}-%{release}
%{summary}.
%package Tajik
-Summary: Tajik(tg) language support for KDE3
+Summary: Tajik(tg) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-tg = %{version}-%{release}
#Requires: kde-filesystem
@@ -544,7 +544,7 @@ Provides: %{name}-tg = %{version}-%{release}
%{summary}.
%package Thai
-Summary: Thai(th) language support for KDE3
+Summary: Thai(th) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-th = %{version}-%{release}
#Requires: kde-filesystem
@@ -552,7 +552,7 @@ Provides: %{name}-th = %{version}-%{release}
%{summary}.
%package Turkish
-Summary: Turkish(tr) language support for KDE3
+Summary: Turkish(tr) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-tr = %{version}-%{release}
#Requires: kde-filesystem
@@ -560,7 +560,7 @@ Provides: %{name}-tr = %{version}-%{release}
%{summary}.
%package Ukrainian
-Summary: Ukrainian(uk) language support for KDE3
+Summary: Ukrainian(uk) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-uk = %{version}-%{release}
#Requires: kde-filesystem
@@ -568,7 +568,7 @@ Provides: %{name}-uk = %{version}-%{release}
%{summary}.
%package Venda
-Summary: Venda(ven) language support for KDE3
+Summary: Venda(ven) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-ven = %{version}-%{release}
#Requires: kde-filesystem
@@ -576,7 +576,7 @@ Provides: %{name}-ven = %{version}-%{release}
%{summary}.
%package Vietnamese
-Summary: Vietnamese(vi) language support for KDE3
+Summary: Vietnamese(vi) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-vi = %{version}-%{release}
#Requires: kde-filesystem
@@ -584,7 +584,7 @@ Provides: %{name}-vi = %{version}-%{release}
%{summary}.
%package Walloon
-Summary: Walloon(wa) language support for KDE3
+Summary: Walloon(wa) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-wa = %{version}-%{release}
#Requires: kde-filesystem
@@ -592,7 +592,7 @@ Provides: %{name}-wa = %{version}-%{release}
%{summary}.
%package Xhosa
-Summary: Xhosa(xh) (a Bantu language) support for KDE3
+Summary: Xhosa(xh) (a Bantu language) support for TDE
Group: User Interface/Desktops
Provides: %{name}-xh = %{version}-%{release}
#Requires: kde-filesystem
@@ -600,7 +600,7 @@ Provides: %{name}-xh = %{version}-%{release}
%{summary}.
%package Chinese
-Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3
+Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-zh_CN = %{version}-%{release}
#Requires: kde-filesystem
@@ -608,10 +608,11 @@ Provides: %{name}-zh_CN = %{version}-%{release}
%{summary}.
%package Chinese-Big5
-Summary: Chinese(zh_TW) (Big5) language support for KDE3
+Summary: Chinese(zh_TW) (Big5) language support for TDE
Group: User Interface/Desktops
Provides: %{name}-tz_TW = %{version}-%{release}
-#Requires: kde-filesystem
+Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
%description Chinese-Big5
%{summary}.
@@ -626,9 +627,14 @@ for l in %{KDE_LANGS}; do
done
done
+# Patches for French translations
+%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
%patch0
%patch1
%patch2 -p0
+%endif
+
+# Patches for Chinese (zh_TW) translations
%patch3 -p0
@@ -1157,6 +1163,10 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%endif
%changelog
+* Wed Aug 15 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
+- Renames to 'trinity-i18n'
+- Updates 'zh_TW' translations
+
* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
- Updates French translations (mostly Kickoff Menu related)
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
index 36d377062..1437f680d 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
@@ -20,7 +20,7 @@
Name: trinity-tdeaddons
Summary: Trinity Desktop Environment - Plugins
Version: 3.5.13
-Release: 5%{?dist}%{?_variant}
+Release: 6%{?dist}%{?_variant}
License: GPLv2
Group: User Interface/Desktops
@@ -41,7 +41,12 @@ Source0: kdeaddons-%{version}.tar.gz
Source1: metabar-fedora.tar.bz2
Source2: metabarrc
+# [tdeaddons] Updates from v3.5.13-sru branch
+Patch0: kdeaddons-3.5.13-sru-20120809.patch
+
BuildRequires: autoconf automake libtool m4
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdebase-devel
BuildRequires: trinity-tdegames-devel
BuildRequires: trinity-tdemultimedia-devel
@@ -363,7 +368,7 @@ Requires: python-exif
%description -n trinity-konq-plugins
This package contains a variety of useful plugins for Konqueror, the
-file manager, web browser and document viewer for KDE. Many of these
+file manager, web browser and document viewer for TDE. Many of these
plugins will appear in Konqueror's Tools menu.
Highlights for web browsing include web page translation, web page archiving,
@@ -644,6 +649,7 @@ done
%prep
%setup -q -a 1 -n kdeaddons
+%patch0 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -659,7 +665,7 @@ done
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+#export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
@@ -673,7 +679,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-closure \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
- --with-extra-includes=%{tde_includedir}/tqt:%{_usr}/include/db4 \
+ --with-extra-includes=%{tde_includedir}/tqt:%{_includedir}/db4:%{tde_includedir}/arts:%{tde_includedir} \
--without-xmms \
--with-sdl \
--with-berkeley-db
@@ -721,6 +727,10 @@ install -m644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/
%changelog
+* Thu Aug 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
+- Updates from v3.5.13-sru branch
+- Rebuilt for tdebase-3.5.13-27
+
* Fri Jun 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Split in several packages
diff --git a/redhat/kdebase/kdebase-3.5.13-fix_tooltip_lock.patch b/redhat/kdebase/kdebase-3.5.13-fix_tooltip_lock.patch
new file mode 100644
index 000000000..6fc4d2e5e
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-fix_tooltip_lock.patch
@@ -0,0 +1,29 @@
+--- kdebase/kdesktop/lock/lockprocess.cc.tooltips 2012-08-10 15:16:14.047229047 +0200
++++ kdebase/kdesktop/lock/lockprocess.cc 2012-08-10 15:41:08.433645385 +0200
+@@ -960,6 +960,26 @@
+
+ setGeometry(0, 0, mRootWidth, mRootHeight);
+
++ // Hack to close all tooltips on screen
++ Window rootWindow = RootWindow(x11Display(), x11Screen());
++ Window parent;
++ Window* children = NULL;
++ Window* child = NULL;
++ unsigned int noOfChildren = 0;
++ XWindowAttributes childAttr;
++ Window childTransient;
++
++ if(XQueryTree(x11Display(), rootWindow, &rootWindow, &parent, &children, &noOfChildren) && noOfChildren>0 ) {
++ for (unsigned int i=0; i<noOfChildren; i++) {
++ if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
++ if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
++ XUnmapWindow(x11Display(), children[i]);
++ }
++ }
++ }
++ }
++
++
+ kdDebug(1204) << "Saver window Id: " << winId() << endl;
+ }
+
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index 9ab4c4985..cdeb5a17c 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -24,7 +24,7 @@
Name: trinity-tdebase
Version: 3.5.13
-Release: 26%{?release}%{?dist}%{?_variant}
+Release: 27%{?release}%{?dist}%{?_variant}
License: GPL
Summary: Trinity Base Programs
Group: User Interface/Desktops
@@ -170,6 +170,10 @@ Patch60: kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
Patch61: kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch
## [tdebase] Add xscreensaver support to CMake [Bug #659] [Commit #80deb529]
Patch62: kdebase-3.5.13-add_xscreensaver_support.patch
+## [tdebase] Dirty patch to close tooltips when screensaver engages
+Patch63: kdebase-3.5.13-fix_tooltip_lock.patch
+## [tdebase] Upgrade to v3.5.13-sru branch
+Patch100: kdebase-3.5.13-upgrade_to_sru_20120806.patch
### FEDORA / RHEL distribution-specific settings ###
@@ -265,7 +269,8 @@ BuildRequires: dbus-tqt-devel
BuildRequires: lm_sensors-devel
BuildRequires: libfontenc-devel
BuildRequires: hal-devel
-BuildRequires: audiofile-devel alsa-lib-devel
+BuildRequires: audiofile-devel
+BuildRequires: alsa-lib-devel
BuildRequires: libraw1394-devel
BuildRequires: openldap-devel
BuildRequires: libvorbis-devel
@@ -278,7 +283,11 @@ BuildRequires: nas-devel
BuildRequires: pcre-devel
BuildRequires: avahi-tqt-devel
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
+# TSAK support requires libudev-devel
+# On RHEL5, udev is built statically, so TSAK cannot build
+# On RHEL6, libudev-devel exists but is too old. No TSAK neither.
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_tsak 1
BuildRequires: libudev-devel
%endif
@@ -980,8 +989,10 @@ TDE applications, particularly those in the TDE base module.
%defattr(-,root,root,-)
%{tde_bindir}/krootbacking
#%{tde_bindir}/tdeinit_phase1
+%if 0%{?with_tsak}
%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
%{tde_bindir}/tsak
+%endif
%{tde_bindir}/kdebugdialog
%{tde_bindir}/kreadconfig
%{tde_bindir}/kwriteconfig
@@ -1379,7 +1390,7 @@ for f in crystalsvg ; do
done
%if 0%{?mdkversion}
-# Mandriva-specific: we have to choose a background for current distribution variant
+# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
# First, we read the "product" key in /etc/product.id
eval $(tr "," ";" </etc/product.id) 2>/dev/null
# Then, we create a symbolic link to the corresponding background
@@ -2931,10 +2942,8 @@ Konqueror libraries.
%patch30 -p1
%patch31 -p1
%patch32 -p1
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
%patch33 -p1
%patch34 -p1
-%endif
%patch35 -p1
%patch36 -p1
%patch37 -p1
@@ -2963,6 +2972,8 @@ Konqueror libraries.
%patch60 -p1
%patch61 -p1
%patch62 -p1
+%patch63 -p1 -b .tooltips
+%patch100 -p1
# Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != ""
@@ -3024,7 +3035,7 @@ cd build
-DWITH_XCOMPOSITE=ON \
-DWITH_XCURSOR=ON \
-DWITH_XFIXES=ON \
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion}
-DWITH_XRANDR=ON \
%else
-DWITH_XRANDR=OFF \
@@ -3046,6 +3057,9 @@ cd build
-DKDM_PAM_SERVICE="kdm-trinity" \
-DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
-DWITH_XSCREENSAVER=ON \
+%if 0%{?with_tsak} == 0
+ -DBUILD_TSAK=OFF \
+%endif
..
%__make %{?_smp_mflags}
@@ -3134,6 +3148,12 @@ EOF
%changelog
+* Sun Aug 19 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-27
+- Merge with v3.5.13-sru branch, but still using v3.5.13 tdelibs
+- See: http://git.trinitydesktop.org/cgit/tdebase/log/?h=origin/v3.5.13-sru
+- Removes the "tqapp" => "app" renaming from SRU, to keep applications compatibility
+- This is the final update for v3.5.13 . Next release should be 3.5.13.1 .
+
* Sat Jul 14 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-26
- Add xscreensaver support to CMake [Bug #659] [Commit #80deb529]
- Enables 'shadow' support
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index f9b53ff25..2637b79eb 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
@@ -107,7 +107,10 @@ BuildRequires: java-1.6.0-openjdk-devel
%define _with_java --with-java=%{java_home}
## Perl
+# There is no 'perl-devel' package on RHEL5
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: perl-devel
+%endif
%define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
index 58493cf25..2fb1459e1 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
@@ -804,6 +804,7 @@ This package contains development files for Trinity's scanner library.
%package libpoppler-tqt
Summary: TQt support for Poppler
Group: Environment/Libraries
+Provides: poppler-tqt = %{version}-%{release}
%description libpoppler-tqt
TQt support library for Poppler.
@@ -819,6 +820,7 @@ This library is used by the Trinity graphics file plugins for PDF support.
Summary: Development files for TQt support for Poppler
Group: Development/Libraries
Requires: %{name}-libpoppler-tqt
+Provides: poppler-tqt-devel = %{version}-%{release}
%description libpoppler-tqt-devel
Development files of TQt support library for Poppler.
diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch
new file mode 100644
index 000000000..6b0b93760
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch
@@ -0,0 +1,20 @@
+--- kdelibs/kdecore/CMakeLists.txt.ORI 2012-08-09 21:10:26.125863261 +0200
++++ kdelibs/kdecore/CMakeLists.txt 2012-08-09 21:12:08.928750681 +0200
+@@ -73,7 +73,8 @@
+
+ ##### other data ################################
+
+-tde_install_empty_directory( ${LOCALE_INSTALL_DIR}/all_languages )
++install( FILES all_languages.desktop
++ DESTINATION ${LOCALE_INSTALL_DIR} RENAME all_languages )
+
+ install( FILES 40.colors Web.colors Royal.colors Rainbow.colors
+ DESTINATION ${CONFIG_INSTALL_DIR}/colors )
+@@ -87,7 +88,6 @@
+ install( FILES eventsrc
+ DESTINATION ${DATA_INSTALL_DIR}/knotify )
+
+-
+ ##### libkdecore ################################
+
+ set( target kdecore )
diff --git a/redhat/kdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch b/redhat/kdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch
new file mode 100644
index 000000000..6a5a8c9d4
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch
@@ -0,0 +1,53 @@
+commit e9f29cfb2a76657f150ec585fa6775f372d7e460
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date: 1343238048 -0500
+
+ Prevent XDG autostart files from starting multiple times
+ This resolves Bug 1096
+
+diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
+index 4880039..c7feb17 100644
+--- a/kinit/autostart.cpp
++++ b/kinit/autostart.cpp
+@@ -214,6 +214,32 @@ AutoStart::loadAutoStartList()
+ }
+ m_startList->append(item);
+ }
++
++ // Check for duplicate entries and remove if found
++ TQPtrListIterator<AutoStartItem> it1(*m_startList);
++ TQPtrListIterator<AutoStartItem> it2(*m_startList);
++ AutoStartItem *item1;
++ AutoStartItem *item2;
++ while ((item1 = it1.current()) != 0) {
++ bool dupfound1 = false;
++ it2.toFirst();
++ while ((item2 = it2.current()) != 0) {
++ bool dupfound2 = false;
++ if (item2 != item1) {
++ if (item1->service == item2->service) {
++ m_startList->removeRef(item2);
++ dupfound1 = true;
++ dupfound2 = true;
++ }
++ }
++ if (!dupfound2) {
++ ++it2;
++ }
++ }
++ if (!dupfound1) {
++ ++it1;
++ }
++ }
+ }
+
+ TQString
+@@ -241,7 +267,7 @@ AutoStart::startService()
+ }
+ m_started.remove(m_started.begin());
+ }
+-
++
+ // Check for items that don't depend on anything
+ AutoStartItem *item;
+ for(item = m_startList->first();
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 3fdabccf1..2e9004514 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -18,7 +18,7 @@
Name: trinity-tdelibs
Version: 3.5.13
-Release: 11%{?dist}%{?_variant}
+Release: 12%{?dist}%{?_variant}
License: GPL
Summary: TDE Libraries
Group: Environment/Libraries
@@ -89,12 +89,20 @@ Patch32: kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
Patch33: kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
## [tdelibs] Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770]
Patch34: kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
+## [tdelibs] Fix language switch inside application [Bug #1074]
+Patch35: kdelibs-3.5.13-fix_all_languages_installation.patch
+## [tdelibs] Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb]
+Patch36: kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch
BuildRequires: cmake >= 2.8
BuildRequires: libtool
BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
-BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
+BuildRequires: krb5-devel
+BuildRequires: libxslt-devel
+BuildRequires: cups-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: pcre-devel
BuildRequires: libutempter-devel
BuildRequires: bzip2-devel
BuildRequires: openssl-devel
@@ -250,6 +258,12 @@ kimgio (image manipulation).
# New in TDE 3.5.13
%{tde_bindir}/kdetcompmgr
+%pre
+# Bug 1074
+if [ -d %{tde_datadir}/locale/all_languages ]; then
+ rm -rf %{tde_datadir}/locale/all_languages
+fi
+
%post
/sbin/ldconfig || :
@@ -319,10 +333,14 @@ applications for TDE.
%patch28 -p1
%patch29 -p1
%patch30 -p1
-%patch31 -p1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+%patch31 -p1 -b .kled
+%endif
%patch32 -p1
%patch33 -p1
%patch34 -p1
+%patch35 -p1
+%patch36 -p1
%build
@@ -398,6 +416,11 @@ EOF
%changelog
+* Sat Aug 18 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-12
+- Fix language switch inside application [Bug #1074]
+- Removes patch 'Add ability to set KLed off color [Commit #513ffc6e]'
+- Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb]
+
* Sun Jul 22 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-11
- Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
- Add ability to set KLed off color [Commit #513ffc6e]
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
index 7b22862d3..93a4796a4 100644
--- a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
@@ -1,10 +1,24 @@
-commit 2cc2e3a2f6d1afd47cc076b89215ac41a0d41a92
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date: 1336512887 -0500
+commit 7da06e558a75c035ea881347e9da69ef9ee57927
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date: 1343199702 -0500
- Fix kmix not autostarting in the user's session.
- This resolves bug report 503.
+ Fix kmix autostart
+ This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix
+
+diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp
+index d1df895..10e7b6a 100644
+--- a/kmix/KMixApp.cpp
++++ b/kmix/KMixApp.cpp
+@@ -28,6 +28,8 @@
+ KMixApp::KMixApp()
+ : KUniqueApplication(), m_kmix( 0 )
+ {
++ // We handle autostart via standard autostart-enabled .desktop file instead of the session manager
++ disableSessionManagement();
+ }
+
+
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index 5051363..d2da702 100644
--- a/kmix/Makefile.am
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index 1e5374f59..388a81727 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -27,13 +27,13 @@
%define _with_xine --with-xine
#%endif
-Name: trinity-tdemultimedia
-Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
-Version: 3.5.13
-Release: 8%{?dist}%{?_variant}
+Name: trinity-tdemultimedia
+Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
+Version: 3.5.13
+Release: 9%{?dist}%{?_variant}
-License: GPLv2
-Group: Applications/Multimedia
+License: GPLv2
+Group: Applications/Multimedia
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
@@ -58,6 +58,9 @@ Patch10: kdemultimedia-3.5.13-fix_mmx_detection.patch
Patch21: kdemultimedia-3.5.13-remove_more_applications.patch
# [tdemultimedia] Fix linear alphabet string errors [Commit #fd6afacf]
Patch22: kdemultimedia-3.5.13-fix_linear_alphabet.patch
+# [tdemultimedia] Fix kmix autostart. This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix. [Commit #7da06e55]
+Patch23: kdemultimedia-3.5.13-fix_kmix_autostart.patch
+
Obsoletes: trinity-kdemultimedia < %{version}-%{release}
Provides: trinity-kdemultimedia = %{version}-%{release}
@@ -72,7 +75,7 @@ Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release}
BuildRequires: cmake >= 2.8
BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-tdelibs-devel
BuildRequires: qt3-devel >= 3.3.8.d
BuildRequires: zlib-devel
@@ -86,6 +89,7 @@ BuildRequires: automake libtool
%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
%{?_with_taglib:BuildRequires: taglib-devel}
BuildRequires: cdparanoia
+BuildRequires: trinity-akode-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}gstreamer0.10-devel
@@ -617,6 +621,7 @@ This package includes TDE's dockable sound mixer applet.
%{tde_tdeappdir}/kmix.desktop
%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
%{tde_datadir}/apps/kmix/
+%{tde_datadir}/autostart/kmix.desktop
%{tde_datadir}/autostart/restore_kmix_volumes.desktop
%{tde_datadir}/icons/hicolor/*/apps/kmix.png
%{tde_datadir}/services/kmixctrl_restore.desktop
@@ -1071,11 +1076,12 @@ noatun plugins.
%patch10 -p1
%patch21 -p1 -b .moreapplications
%patch22 -p1
+%patch23 -p1 -b .kmixautostart
# 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 \
+%__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
@@ -1159,6 +1165,10 @@ fi
%changelog
+* Sat Aug 18 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9
+- Rebuild for tdelibs-3.5.13-12
+- Fix kmix autostart. This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix. [Commit #7da06e55]
+
* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
- Split in several packages
- Enables Xine support on RHEL/CentOS
diff --git a/redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch b/redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..76cea4732
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch
@@ -0,0 +1,10 @@
+--- kdepim/kalarm/CMakeLists.txt.ORI 2012-08-09 19:49:53.033689156 +0200
++++ kdepim/kalarm/CMakeLists.txt 2012-08-09 19:50:00.301644331 +0200
+@@ -33,6 +33,7 @@
+ ${CMAKE_SOURCE_DIR}/certmanager/lib
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
++ ${TDE_INCLUDE_DIR}/../arts
+ )
+
+ link_directories(
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 5cb8ec509..8a9c6d6a6 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -69,6 +69,8 @@ Patch11: kdepim-3.5.13-fix_kalarm_icon_reference.patch
Patch12: kdepim-3.5.13-disable_fsync_in_cached_imap.patch
# [tdepim] Fix include directory location
Patch13: kdepim-3.5.13-fix_include_directory.patch
+# [tdepim] Missing LDFLAGS cause FTBFS on MGA2/MDV2011
+Patch14: kdepim-3.5.13-missing_ldflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -2092,11 +2094,12 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1 -b .addquotes
+#patch9 -p1 -b .addquotes
%patch10 -p1 -b .segv
%patch11 -p1
%patch12 -p1
%patch13 -p1 -b .incdir
+%patch14 -p1 -b .ldflags
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -2144,7 +2147,7 @@ cd build
-DBUILD_ALL=ON \
..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make VERBOSE=1
%install
export PATH="%{_bindir}:${PATH}"
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
index 95df4fa44..7927ed5b1 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
@@ -67,7 +67,7 @@ BuildRequires: trinity-arts-devel >= 3.5.13
BuildRequires: trinity-tdelibs-devel >= 3.5.13
#BuildRequires: qt3-devel-docs >= 3.3.8.d
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}db5.1-devel
+#BuildRequires: %{_lib}db5.1-devel
%else
BuildRequires: db4-devel
%endif
@@ -194,7 +194,7 @@ Provides: trinity-kdevelop-libs = %{version}-%{release}
%prep
%setup -q -n kdevelop -a1
%patch1 -p0 -b .config
-%patch2 -p1
+#patch2 -p1
%patch3 -p1 -b .gcc47
%patch4 -p1
@@ -250,7 +250,7 @@ cd build
..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} VERBOSE=1
# c references
cd ..
diff --git a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
index 78695b135..815c83075 100644
--- a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
@@ -51,9 +51,12 @@ BuildRequires: gettext
BuildRequires: gettext-devel
BuildRequires: transfig
BuildRequires: djvulibre
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_xmedcon 1
BuildRequires: xmedcon
BuildRequires: xmedcon-devel
BuildRequires: librsvg
+%endif
BuildRequires: libwmf-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -151,8 +154,10 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0
%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0.8.0
+%if 0%{?with_xmedcon}
%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0
%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0.8.0
+%endif
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0
@@ -281,8 +286,10 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_libdir}/ksquirrel-libs/libkls_cut.so
%{tde_libdir}/ksquirrel-libs/libkls_dds.la
%{tde_libdir}/ksquirrel-libs/libkls_dds.so
+%if 0%{?with_xmedcon}
%{tde_libdir}/ksquirrel-libs/libkls_dicom.la
%{tde_libdir}/ksquirrel-libs/libkls_dicom.so
+%endif
%{tde_libdir}/ksquirrel-libs/libkls_djvu.la
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so
%{tde_libdir}/ksquirrel-libs/libkls_eps.la
@@ -392,7 +399,9 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%{tde_bindir}/ksquirrel-libs-camera2ppm
%{tde_bindir}/ksquirrel-libs-dcraw
+%if 0%{?with_xmedcon}
%{tde_bindir}/ksquirrel-libs-dicom2png
+%endif
%{tde_bindir}/ksquirrel-libs-fig2ppm
%{tde_bindir}/ksquirrel-libs-iff2ppm
%{tde_bindir}/ksquirrel-libs-leaf2ppm