summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/tde-i18n/tde-i18n-14.0.0.spec43
-rw-r--r--redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec1
-rw-r--r--redhat/tdeaddons/tdeaddons-14.0.0.spec1
-rw-r--r--redhat/tdeadmin/tdeadmin-14.0.0.spec3
-rw-r--r--redhat/tdeartwork/tdeartwork-14.0.0.spec36
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec73
-rw-r--r--redhat/tdebindings/tdebindings-14.0.0.spec21
-rw-r--r--redhat/tdegraphics/tdegraphics-14.0.0.spec29
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec88
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec6
-rw-r--r--redhat/tdenetwork/tdenetwork-14.0.0.spec15
-rw-r--r--redhat/tdepim/tdepim-14.0.0.spec10
-rw-r--r--redhat/tdesdk/tdesdk-14.0.0.spec13
-rw-r--r--redhat/tdeutils/tdeutils-14.0.0.spec1
-rw-r--r--redhat/tdevelop/tdevelop-14.0.0.spec12
-rw-r--r--redhat/tdewebdev/tdewebdev-14.0.0.spec2
16 files changed, 141 insertions, 213 deletions
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
index 6f368ba66..f0f612baa 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -25,7 +25,7 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-%{tde_pkg}
Summary: Internationalization support for Trinity
-Version: 14.0.0
+Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Vendor: Trinity Project
@@ -704,8 +704,6 @@ popd
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export TDEDIR=%{tde_prefix}
export kde_htmldir="%{tde_tdedocdir}/HTML"
@@ -789,12 +787,12 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
# See http://fedoraproject.org/wiki/Languages (???)
%__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png
-# Removes conflict with TDE4
+# Removes conflict with KDE4
%if "%{?tde_prefix}" == "/usr"
%__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop
%endif
-# remove obsolete TDE 3 application data translations
+# remove obsolete KDE 3 application data translations
%__rm -rf "%{buildroot}%{tde_datadir}/apps"
%clean
@@ -1246,37 +1244,4 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
-
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
-
-* 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)
-
-* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Removes 'kde-filesystem" dependancy
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Fix HTML directory location
-
-* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Re-adds missing files 'entry.desktop'
-- Updates zh_TW translation, thanks to Wei-Lun Chao
-
-* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add missing french translations for TDE 3.5.13
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Initial version (French language only)
-- Based on RHEL SPEC file 'kde-i18n'
+- Initial release for \ No newline at end of file
diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
index 245646319..1a404749d 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -455,7 +455,6 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release}
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec
index d9b6f29f3..be28b1a88 100644
--- a/redhat/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec
@@ -687,7 +687,6 @@ done
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
# Note about DB4:
diff --git a/redhat/tdeadmin/tdeadmin-14.0.0.spec b/redhat/tdeadmin/tdeadmin-14.0.0.spec
index a653ae691..bb624c058 100644
--- a/redhat/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/tdeadmin/tdeadmin-14.0.0.spec
@@ -385,7 +385,6 @@ touch /etc/lilo.conf
%build
unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
@@ -409,8 +408,6 @@ fi
--enable-rpath \
--enable-gcc-hidden-visibility \
\
- --with-extra-includes=%{tde_includedir}/tqt \
- \
--with-rpm \
--with-pam=kde \
--with-shadow \
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index bf3a6e77f..42e1205ce 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -35,8 +35,6 @@ Url: http://www.trinitydesktop.org/
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Patch1: tdeartwork-14.0.0-fix_update_screensaver_list.patch
-
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -187,9 +185,9 @@ This package is part of Trinity, and a component of the TDE artwork module.
%files style
%defattr(-,root,root,-)
%{tde_tdelibdir}/plugins/styles/
-%{tde_tdelibdir}/kstyle_phase_config.la
-%{tde_tdelibdir}/kstyle_phase_config.so
-%{tde_datadir}/apps/kstyle/
+%{tde_tdelibdir}/tdestyle_phase_config.la
+%{tde_tdelibdir}/tdestyle_phase_config.so
+%{tde_datadir}/apps/tdestyle/
##########
@@ -640,6 +638,18 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif
+%if 0%{?fedora} >= 19
+%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
+%endif
+
%endif
##########
@@ -652,7 +662,6 @@ This package is part of Trinity, and a component of the TDE artwork module.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .screenlist
# http://www.trinitydesktop.org/wiki/bin/view/Developers/HowToBuild
# NOTE: Before building tdeartwork, install any and all xhack screensavers that might be uses, then:
@@ -664,13 +673,6 @@ cd tdescreensaver/kxsconfig/
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
@@ -707,16 +709,16 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install -C build DESTDIR=%{buildroot}
-# Duplicate with trinity-kbabel (from tdesdk)
-%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png
-%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png
-
# Should not be here if xscreensaver is disabled
%if 0%{?with_xscreensaver} == 0
%__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage
%__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage-file
%endif
+# Duplicate with trinity-kbabel (from tdesdk)
+%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png
+%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png
+
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 89ba7a564..6a4cdcbaa 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -751,7 +751,7 @@ Some random features:
%{tde_tdeappdir}/kate.desktop
%{tde_datadir}/apps/kate/
%{tde_datadir}/apps/tdeconf_update/kate-2.4.upd
-%{_sysconfdir}/trinity/katerc
+%config(noreplace) %{_sysconfdir}/trinity/katerc
%{tde_datadir}/icons/hicolor/*/apps/kate.png
%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
%{tde_datadir}/servicetypes/kateplugin.desktop
@@ -970,8 +970,8 @@ plugdev group.
%{tde_tdelibdir}/tdefile_font.so
%{tde_tdelibdir}/tdeio_fonts.la
%{tde_tdelibdir}/tdeio_fonts.so
-%{tde_tdelibdir}/kstyle_keramik_config.la
-%{tde_tdelibdir}/kstyle_keramik_config.so
+%{tde_tdelibdir}/tdestyle_keramik_config.la
+%{tde_tdelibdir}/tdestyle_keramik_config.so
%{tde_tdelibdir}/libtdefontviewpart.la
%{tde_tdelibdir}/libtdefontviewpart.so
%{tde_tdelibdir}/libtdeshorturifilter.la
@@ -1156,7 +1156,6 @@ TDE applications, particularly those in the TDE base module.
%files bin
%defattr(-,root,root,-)
%{tde_bindir}/krootbacking
-#%{tde_bindir}/tdeinit_phase1
%if 0%{?with_tsak}
%attr(4511,root,root) %{tde_bindir}/tdmtsak
%{tde_bindir}/tsak
@@ -1165,7 +1164,7 @@ TDE applications, particularly those in the TDE base module.
%{tde_bindir}/kreadconfig
%{tde_bindir}/kwriteconfig
%{tde_bindir}/kstart
-%{_sysconfdir}/trinity/kxkb_groups
+%config(noreplace) %{_sysconfdir}/trinity/kxkb_groups
%{tde_bindir}/drkonqi
%{tde_bindir}/crashtest
%{tde_bindir}/kapplymousetheme
@@ -1229,8 +1228,8 @@ TDE applications, particularly those in the TDE base module.
%{tde_datadir}/services/kded/khotkeys.desktop
%{tde_datadir}/services/kxkb.desktop
%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/kcheckpass-trinity
-%{_sysconfdir}/pam.d/tdescreensaver-trinity
+%config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity
+%config(noreplace) %{_sysconfdir}/pam.d/tdescreensaver-trinity
%endif
%{tde_tdedocdir}/HTML/en/kdcop/
%{tde_tdedocdir}/HTML/en/kdebugdialog//
@@ -1286,7 +1285,7 @@ needed for a basic TDE desktop installation.
%files data
%defattr(-,root,root,-)
-%{_sysconfdir}/trinity/tdeshorturifilterrc
+%config(noreplace) %{_sysconfdir}/trinity/tdeshorturifilterrc
%{tde_datadir}/applnk/.hidden/battery.desktop
%{tde_datadir}/applnk/.hidden/bwarning.desktop
%{tde_datadir}/applnk/.hidden/cwarning.desktop
@@ -1543,10 +1542,10 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/wallpapers/*
# XDG directories information
-%{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
-%{_sysconfdir}/xdg/menus/tde-information.menu
-%{_sysconfdir}/xdg/menus/tde-screensavers.menu
-%{_sysconfdir}/xdg/menus/tde-settings.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu
%{tde_tdedocdir}/HTML/en/kcontrol/
%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
@@ -1880,8 +1879,8 @@ the TDE desktop.
%files -n trinity-kdesktop
%defattr(-,root,root,-)
-%{_sysconfdir}/trinity/kdesktop_custom_menu1
-%{_sysconfdir}/trinity/kdesktop_custom_menu2
+%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu1
+%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2
%{tde_bindir}/kcheckrunning
%{tde_bindir}/kxdglauncher
%{tde_bindir}/kdeeject
@@ -1997,11 +1996,12 @@ already. Most users won't need this.
%{tde_datadir}/apps/tdm/sessions/*.desktop
%{tde_datadir}/apps/tdm/themes/
%{tde_datadir}/config/tdm
-%{_sysconfdir}/trinity/tdm/
+%dir %{_sysconfdir}/trinity/tdm
+%config(noreplace) %{_sysconfdir}/trinity/tdm/*
%{tde_tdedocdir}/HTML/en/tdm/
%if 0%{?suse_version} == 0
-%{_sysconfdir}/pam.d/tdm-trinity
-%{_sysconfdir}/pam.d/tdm-trinity-np
+%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
+%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
%endif
%if 0%{?suse_version}
/usr/lib/X11/displaymanagers/tdm
@@ -2134,7 +2134,7 @@ Requires: %{name}-data = %{version}-%{release}
Requires: htdig
%description -n trinity-khelpcenter
-The TDE Help Center provides documentation on how to use the KDE desktop.
+The TDE Help Center provides documentation on how to use the TDE desktop.
The htdig package is needed to build a searchable archive of TDE
documentation.
@@ -2358,7 +2358,7 @@ web browser if the clipboard contains a URL.
%files -n trinity-klipper
%defattr(-,root,root,-)
%{tde_bindir}/klipper
-%{_sysconfdir}/trinity/klipperrc
+%config(noreplace) %{_sysconfdir}/trinity/klipperrc
%{tde_tdelibdir}/klipper.la
%{tde_tdelibdir}/klipper.so
%{tde_tdelibdir}/klipper_panelapplet.la
@@ -2399,7 +2399,7 @@ Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-kmenuedit
-The TDE menu editor allows you to make customisations to the KDE menu
+The TDE menu editor allows you to make customisations to the TDE menu
structure.
%files -n trinity-kmenuedit
@@ -2461,7 +2461,7 @@ ever launching another application.
%files -n trinity-konqueror
%defattr(-,root,root,-)
-%{_sysconfdir}/trinity/konqsidebartng.rc
+%config(noreplace) %{_sysconfdir}/trinity/konqsidebartng.rc
%{tde_bindir}/kbookmarkmerger
%{tde_bindir}/keditbookmarks
%{tde_bindir}/kfmclient
@@ -2567,11 +2567,13 @@ for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
/sbin/ldconfig || :
-update-alternatives --install \
- %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
- media_safelyremove.desktop_konqueror \
- %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
- 10 || :
+if [ $1 -eq 1 ]; then
+ update-alternatives --install \
+ %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
+ media_safelyremove.desktop_konqueror \
+ %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
+ 10 || :
+fi
%postun -n trinity-konqueror
update-desktop-database %{tde_appdir} 2> /dev/null || :
@@ -2786,7 +2788,7 @@ Requires: trinity-twin = %{version}-%{release}
%description -n trinity-ksmserver
This package contains the TDE session manager. It is responsible for
restoring your TDE session on login. It is also needed to properly
-start a TDE session. It registers KDE with X display managers, and
+start a TDE session. It registers TDE with X display managers, and
provides the 'starttde' command, for starting an X session with TDE
from the console.
@@ -3276,16 +3278,7 @@ Windows and Samba shares.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
- export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
- export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
# Samba 4.0 includes (Fedora 18)
if [ -d "/usr/include/samba-4.0" ]; then
@@ -3310,9 +3303,9 @@ cd build
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
- -DCONFIG_INSTALL_DIR="/etc/trinity" \
- -DSYSCONF_INSTALL_DIR="/etc/trinity" \
- -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCONFIG_INSTALL_DIR="%{_sysconfdir}/trinity" \
+ -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
\
-DWITH_SASL=ON \
-DWITH_LDAP=ON \
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index ce30f9601..13f02f0af 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -50,18 +50,14 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: tdebindings-14.0.0-ftbfs.patch
-
-# [kdebindings] Fix FTBFS in dcopjava/bindings
-Patch7: kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch
# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL5
-Patch18: kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch
+Patch5: kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch
BuildRequires: autoconf automake libtool m4
-BuildRequires: trinity-tqtinterface-devel >= %{version}
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: zlib-devel
@@ -955,7 +951,7 @@ Provides: trinity-kdebindings-devel = %{version}-%{release}
# Metapackage
Requires: trinity-libsmoketqt-devel = %{version}-%{release}
Requires: trinity-libdcop3-java-devel = %{version}-%{release}
-Requires: trinity-libsmokekde-devel = %{version}-%{release}
+Requires: trinity-libsmoketde-devel = %{version}-%{release}
Requires: trinity-libkjsembed-devel = %{version}-%{release}
Requires: trinity-libxparts-devel = %{version}-%{release}
Requires: trinity-libdcop-c-devel = %{version}-%{release}
@@ -977,16 +973,9 @@ Development files for the TDE bindings.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
-#patch7 -p1 -b .dcopjavaldflags
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-%patch18 -p1 -b .ruby
-%endif
-
-# Workarounds strange issue in MGA3
-%if 0%{?mgaversion} == 3 || 0%{?pclinuxos} >= 2013
-%__cp /usr/share/automake-1.13/test-driver admin/
+%patch5 -p1 -b .ruby
%endif
# Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so')
diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec
index ab1884dc5..d72420c0b 100644
--- a/redhat/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec
@@ -188,6 +188,7 @@ BuildRequires: lcms-devel
BuildRequires: libart_lgpl-devel
# kuickshow
+#define build_kuickshow 1
BuildRequires: fribidi-devel
# kamera
@@ -195,6 +196,11 @@ BuildRequires: fribidi-devel
%define build_kamera 1
%endif
+# kmrml
+#define build_kmrml 1
+#Requires: gift
+Obsoletes: trinity-kmrml
+
Obsoletes: trinity-kdegraphics < %{version}-%{release}
Provides: trinity-kdegraphics = %{version}-%{release}
Obsoletes: trinity-kdegraphics-libs < %{version}-%{release}
@@ -212,7 +218,7 @@ Requires: trinity-kfaxview = %{version}-%{release}
Requires: trinity-kgamma = %{version}-%{release}
Requires: trinity-kghostview = %{version}-%{release}
Requires: trinity-kiconedit = %{version}-%{release}
-Requires: trinity-kmrml = %{version}-%{release}
+%{?build_kmrml:Requires: trinity-kmrml = %{version}-%{release}}
Requires: trinity-kolourpaint = %{version}-%{release}
Requires: trinity-kooka = %{version}-%{release}
Requires: trinity-kpdf = %{version}-%{release}
@@ -244,6 +250,8 @@ Graphics applications for the Trinity Desktop Environment, including
* kview (image viewer for GIF, JPEG, TIFF, etc.)
%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog README
##########
@@ -441,7 +449,6 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
%files -n trinity-kfax
%defattr(-,root,root,-)
-%doc rpmdocs/kfax/
%{tde_bindir}/kfax
%{tde_tdeappdir}/kfax.desktop
%{tde_datadir}/apps/kfax/
@@ -619,6 +626,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
+%if 0%{?build_kmrml}
+
%package -n trinity-kmrml
Summary: A Konqueror plugin for searching pictures
Group: Applications/Graphics
@@ -658,6 +667,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
/sbin/ldconfig || :
+%endif
+
##########
%package -n trinity-kolourpaint
@@ -801,7 +812,6 @@ Homepage: http://www.kpovmodeler.org
%files -n trinity-kpovmodeler
%defattr(-,root,root,-)
-%doc rpmdocs/kpovmodeler/
%{tde_bindir}/kpovmodeler
%{tde_libdir}/libkpovmodeler.so.*
%{tde_tdelibdir}/libkpovmodelerpart.*
@@ -1184,7 +1194,9 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
%{tde_tdeincludedir}/libtext2path-0.1/Glyph.h
%{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h
%{tde_libdir}/libtdeinit_kview.la
+%if 0%{?build_kmrml}
%{tde_libdir}/libtdeinit_mrmlsearch.la
+%endif
%{tde_libdir}/libkghostviewlib.la
%{tde_libdir}/libkghostviewlib.so
%{tde_libdir}/libkimageviewer.la
@@ -1249,7 +1261,6 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
@@ -1285,6 +1296,7 @@ cd build
-DWITH_PDF=ON \
-DBUILD_ALL=ON \
-DBUILD_KUICKSHOW=OFF \
+ %{!?build_kmrml:-DBUILD_KMRML=OFF} \
%{!?build_kamera:-DBUILD_KAMERA=OFF} \
..
@@ -1296,15 +1308,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-# rpmdocs
-for dir in k* ; do
- for file in AUTHORS ChangeLog README TODO ; do
- if test -s "$dir/$file" ; then
- install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
- echo "%doc rpmdocs/$dir/" >> %{name}.lang
- fi
- done
-done
%clean
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 6079504d7..583784d91 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -20,36 +20,32 @@
%define _docdir %{tde_docdir}
-Name: trinity-tdelibs
-Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License: GPL
-Summary: TDE Libraries
-Group: Environment/Libraries
+Name: trinity-tdelibs
+Version: %{tde_version}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+License: GPL
+Summary: TDE Libraries
+Group: Environment/Libraries
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+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)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-# Enable Devkit Power support (older than upower)
-Patch3: tdelibs-14.0.0-devkitpower_support.patch
+Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
# Patches from Mandriva
Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch
Patch102: tdelibs-14.0.0-cups_by_default.patch
-Patch201: tdelibs-14.0.0-debug.patch
-
-Obsoletes: tdelibs < %{version}-%{release}
-Provides: tdelibs = %{version}-%{release}
-Obsoletes: trinity-kdelibs < %{version}-%{release}
-Provides: trinity-kdelibs = %{version}-%{release}
-Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release}
-Provides: trinity-kdelibs-apidocs = %{version}-%{release}
+Obsoletes: tdelibs < %{version}-%{release}
+Provides: tdelibs = %{version}-%{release}
+Obsoletes: trinity-kdelibs < %{version}-%{release}
+Provides: trinity-kdelibs = %{version}-%{release}
+Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release}
+Provides: trinity-kdelibs-apidocs = %{version}-%{release}
BuildRequires: cmake >= 2.8
@@ -111,7 +107,15 @@ BuildRequires: bzip2-devel
%endif
# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
BuildRequires: libudev-devel
+%endif
+
+# HAL support
+%if 0%{?rhel} == 5
+%define with_hal 1
+%endif
# UDISKS support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -130,11 +134,13 @@ BuildRequires: udisks2-devel
Requires: udisks2
%endif
-# UPOWER support
+# DEVICEKIT POWER support
%if 0%{?rhel} >= 6
%define with_devkitpower 1
Requires: DeviceKit-power
%endif
+
+# UPOWER support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
%define with_upower 1
Requires: upower
@@ -174,7 +180,7 @@ BuildRequires: jasper-devel
# AVAHI support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_avahi 1
-BuildRequires: trinity-avahi-tqt-devel >= %{tde_version}
+BuildRequires: trinity-avahi-tqt-devel >= 1:0.6.30
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
Requires: %{_lib}avahi-client3
@@ -245,9 +251,12 @@ BuildRequires: xz-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}nm-util-devel
%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?rhel} >= 6 || 0%{?fedora}
BuildRequires: NetworkManager-glib-devel
%endif
+%if 0%{?suse_version}
+BuildRequires: NetworkManager-devel
+%endif
%endif
# Certificates support
@@ -315,6 +324,7 @@ kimgio (image manipulation).
%{tde_bindir}/tdeio_uiserver
%{tde_bindir}/tdeioexec
%{tde_bindir}/tdeioslave
+%{tde_bindir}/tdeiso_info
%{tde_bindir}/tdelauncher
%if 0%{?with_elficon}
%{tde_bindir}/tdelfeditor
@@ -427,27 +437,15 @@ applications for TDE.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch3 -p1 -b .devkitpower
%patch101 -p1 -b .xdg_path
%patch102 -p1 -b .cups_by_default
-%patch201 -p1 -b .debug
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}"
-
-# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-if [ -d "/usr/X11R6" ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
-fi
-
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
@@ -480,15 +478,16 @@ cd build
-DWITH_CUPS=ON \
-DWITH_LUA=OFF \
-DWITH_TIFF=ON \
- %{?with_jasper:-DWITH_JASPER=ON} \
- %{?with_openexr:-DWITH_OPENEXR=ON} \
+ %{?!with_jasper:-DWITH_JASPER=OFF} \
+ %{?!with_openexr:-DWITH_OPENEXR=OFF} \
-DWITH_UTEMPTER=ON \
%{?!with_elficon:-DWITH_ELFICON=OFF} \
- %{?with_avahi:-DWITH_AVAHI=ON} \
+ %{?!with_avahi:-DWITH_AVAHI=OFF} \
%{?!with_pcre:-DWITH_PCRE=OFF} \
- -DWITH_GCC_VISIBILITY=ON \
%{?!with_inotify:-DWITH_INOTIFY=OFF} \
%{?!with_gamin:-DWITH_GAMIN=OFF} \
+ -DWITH_TDEHWLIB_DAEMONS=ON \
+ %{?with_hal:-DWITH_HAL=ON} \
%{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \
%{?!with_upower:-DWITH_UPOWER=OFF} \
%{?!with_udisks:-DWITH_UDISKS=OFF} \
@@ -498,8 +497,10 @@ cd build
-DWITH_SUDO_TDESU_BACKEND=OFF \
-DWITH_OLD_XDG_STD=OFF \
%{?!with_lzma:-DWITH_LZMA=OFF} \
+ -DWITH_LIBBFD=OFF \
+ -DWITH_KDE4_MENU_SUFFIX=OFF \
-DWITH_ASPELL=ON \
- %{?with_hspell:-DWITH_HSPELL=ON} \
+ %{?!with_hspell:-DWITH_HSPELL=OFF} \
..
%__make %{?_smp_mflags} || %__make
@@ -515,9 +516,6 @@ cd build
%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
%endif
-# Appends TDE version to '.pc' file
-echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc"
-
%clean
%__rm -rf "%{?buildroot}"
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index a4a159e65..0b86f89ff 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -1151,14 +1151,8 @@ noatun plugins.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \
--prefix=%{tde_prefix} \
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec
index d4a02d649..412a2e062 100644
--- a/redhat/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec
@@ -85,16 +85,21 @@ BuildRequires: sqlite-devel
BuildRequires: libgadu-devel
%endif
+# XTST support
+%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires: libXtst-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: libxtst-devel
+%endif
+
+# Other stuff
%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
BuildRequires: libXmu-devel
BuildRequires: libXScrnSaver-devel
-BuildRequires: libXtst-devel
BuildRequires: libXxf86vm-devel
%endif
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-BuildRequires: libxtst-devel
-%endif
# Wifi support
%if "%{?_with_wifi:1}" == "1"
@@ -1084,8 +1089,6 @@ update-desktop-database 2> /dev/null || :
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec
index 5d23b926a..ed7fde7da 100644
--- a/redhat/tdepim/tdepim-14.0.0.spec
+++ b/redhat/tdepim/tdepim-14.0.0.spec
@@ -582,7 +582,9 @@ Group: Environment/Libraries
Requires: libcaldav
Requires: libcarddav
-Obsoletes: tdepim-tderesources < %{version}-%{release}
+Obsoletes: tdepim-kresources < %{version}-%{release}
+Obsoletes: trinity-tdepim-kresources < %{version}-%{release}
+Provides: trinity-tdepim-kresources = %{version}-%{release}
%description tderesources
This package includes several plugins needed to interface with groupware
@@ -2195,12 +2197,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec
index 9ae49a82d..985459107 100644
--- a/redhat/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/tdesdk/tdesdk-14.0.0.spec
@@ -523,7 +523,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_tdelibdir}/plugins/styles/scheck.so
%{tde_tdelibdir}/plugins/styles/scheck.la
%{tde_datadir}/apps/tdeabc/formats/kdeaccountsplugin.desktop
-%{tde_datadir}/apps/kstyle/themes/scheck.themerc
+%{tde_datadir}/apps/tdestyle/themes/scheck.themerc
%{tde_datadir}/kdepalettes/
%{tde_libdir}/libkstartperf.so.*
@@ -1066,25 +1066,18 @@ Provides: trinity-kdesdk-devel = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
+
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LD_LIBRARY_PATH="%{tde_libdir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
%endif
-
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
@@ -1107,7 +1100,7 @@ cd build
%{!?build_kioslave:-DBUILD_KIOSLAVE=OFF} \
..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec
index 3065dee08..d436ae9d2 100644
--- a/redhat/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/tdeutils/tdeutils-14.0.0.spec
@@ -983,7 +983,6 @@ Development files for %{name}.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}"
# Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then
diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec
index 082227c11..749b11ba2 100644
--- a/redhat/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/tdevelop/tdevelop-14.0.0.spec
@@ -475,8 +475,8 @@ Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Obsoletes: trinity-tdevelop-devel < %{version}-%{release}
-Provides: trinity-tdevelop-devel = %{version}-%{release}
+Obsoletes: trinity-kdevelop-devel < %{version}-%{release}
+Provides: trinity-kdevelop-devel = %{version}-%{release}
%description devel
%{summary}.
@@ -498,12 +498,12 @@ Provides: trinity-tdevelop-devel = %{version}-%{release}
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-Requires: trinity-tdelibs
+Requires: trinity-tdelibs >= %{tde_version}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
-Obsoletes: trinity-tdevelop-libs < %{version}-%{release}
-Provides: trinity-tdevelop-libs = %{version}-%{release}
+Obsoletes: trinity-kdevelop-libs < %{version}-%{release}
+Provides: trinity-kdevelop-libs = %{version}-%{release}
%description libs
%{summary}.
@@ -574,8 +574,6 @@ Provides: trinity-tdevelop-libs = %{version}-%{release}
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}"
-export LD_LIBRARY_PATH="%{tde_libdir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec
index 8a674eebe..0e4446a39 100644
--- a/redhat/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec
@@ -468,7 +468,7 @@ Summary: Header files and documentation for %{name}
Obsoletes: trinity-kdewebdev-devel < %{version}-%{release}
Provides: trinity-kdewebdev-devel = %{version}-%{release}
-Requires: trinity-tdelibs-devel
+Requires: trinity-tdelibs-devel >= %{tde_version}
Requires: %{name} = %{version}-%{release}
Requires: trinity-kommander-devel = %{version}-%{release}