summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/abakus/abakus-14.0.0.spec4
-rw-r--r--redhat/applications/adept/adept-14.0.0.spec19
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec11
-rw-r--r--redhat/applications/basket/basket-14.0.0.spec4
-rw-r--r--redhat/applications/bibletime/bibletime-14.0.0.spec4
-rw-r--r--redhat/applications/bibletime/bibletime-14.0.1.spec185
-rw-r--r--redhat/applications/digikam/digikam-14.0.0.spec4
-rw-r--r--redhat/applications/dolphin/dolphin-14.0.0.spec4
-rw-r--r--redhat/applications/filelight/filelight-14.0.0.spec4
-rw-r--r--redhat/applications/fusion-icon/fusion-icon-14.0.0.spec2
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec8
-rw-r--r--redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec4
-rw-r--r--redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec4
-rw-r--r--redhat/applications/gwenview/gwenview-14.0.0.spec4
-rw-r--r--redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec4
-rw-r--r--redhat/applications/k3b/k3b-14.0.0.spec4
-rw-r--r--redhat/applications/k9copy/k9copy-14.0.0.spec4
-rw-r--r--redhat/applications/k9copy/k9copy-14.0.1.spec177
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec19
-rw-r--r--redhat/applications/kaffeine/kaffeine-14.0.0.spec10
-rw-r--r--redhat/applications/kasablanca/kasablanca-14.0.0.spec6
-rw-r--r--redhat/applications/katapult/katapult-14.0.0.spec4
-rw-r--r--redhat/applications/kbarcode/kbarcode-14.0.0.spec8
-rw-r--r--redhat/applications/kbfx/kbfx-14.0.0.spec4
-rw-r--r--redhat/applications/kbibtex/kbibtex-14.0.0.spec4
-rw-r--r--redhat/applications/kbiff/kbiff-14.0.0.spec4
-rw-r--r--redhat/applications/kbookreader/kbookreader-14.0.0.spec4
-rw-r--r--redhat/applications/kchmviewer/kchmviewer-14.0.0.spec4
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-14.0.0.spec4
-rw-r--r--redhat/applications/kcmldap/kcmldap-14.0.0.spec12
-rw-r--r--redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec6
-rw-r--r--redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec6
-rw-r--r--redhat/applications/kcpuload/kcpuload-14.0.0.spec4
-rw-r--r--redhat/applications/kdbg/kdbg-14.0.0.spec4
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec4
-rw-r--r--redhat/applications/kdiff3/kdiff3-14.0.0.spec4
-rw-r--r--redhat/applications/kdirstat/kdirstat-14.0.0.spec4
-rw-r--r--redhat/applications/keep/keep-14.0.0.spec4
-rw-r--r--redhat/applications/kerberostray/kerberostray-14.0.0.spec4
-rw-r--r--redhat/applications/kerry/kerry-14.0.0.spec19
-rw-r--r--redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec6
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec4
-rw-r--r--redhat/applications/kile/kile-14.0.0.spec4
-rw-r--r--redhat/applications/kima/kima-14.0.0.spec4
-rw-r--r--redhat/applications/kiosktool/kiosktool-14.0.0.spec4
-rw-r--r--redhat/applications/kkbswitch/kkbswitch-14.0.0.spec4
-rw-r--r--redhat/applications/klcddimmer/klcddimmer-14.0.0.spec4
-rw-r--r--redhat/applications/kmplayer/kmplayer-14.0.0.spec12
-rw-r--r--redhat/applications/kmplayer/kmplayer-14.0.1.spec323
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec4
-rw-r--r--redhat/applications/kmymoney/kmymoney-14.0.0.spec12
-rw-r--r--redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch11
-rw-r--r--redhat/applications/knemo/knemo-14.0.0.spec4
-rw-r--r--redhat/applications/knetload/knetload-14.0.0.spec4
-rw-r--r--redhat/applications/knetstats/knetstats-14.0.0.spec4
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec4
-rw-r--r--redhat/applications/knights/knights-14.0.0.spec4
-rw-r--r--redhat/applications/knmap/knmap-14.0.0.spec4
-rw-r--r--redhat/applications/knowit/knowit-14.0.0.spec4
-rw-r--r--redhat/applications/knutclient/knutclient-14.0.0.spec4
-rw-r--r--redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec4
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec73
-rw-r--r--redhat/applications/konversation/konversation-14.0.0.spec4
-rw-r--r--redhat/applications/kopete-otr/kopete-otr-14.0.0.spec4
-rw-r--r--redhat/applications/kpicosim/kpicosim-14.0.0.spec4
-rw-r--r--redhat/applications/kpilot/kpilot-14.0.0.spec4
-rw-r--r--redhat/applications/kpowersave/kpowersave-14.0.0.spec4
-rw-r--r--redhat/applications/krecipes/krecipes-14.0.0.spec4
-rw-r--r--redhat/applications/krename/krename-14.0.0.spec4
-rw-r--r--redhat/applications/krusader/krusader-14.0.0.spec4
-rw-r--r--redhat/applications/kscope/kscope-14.0.0.spec4
-rw-r--r--redhat/applications/ksensors/ksensors-14.0.0.spec4
-rw-r--r--redhat/applications/kshowmail/kshowmail-14.0.0.spec4
-rw-r--r--redhat/applications/kshutdown/kshutdown-14.0.0.spec4
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec4
-rw-r--r--redhat/applications/ksquirrel/ksquirrel-14.0.0.spec4
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-14.0.0.spec4
-rw-r--r--redhat/applications/ksystemlog/ksystemlog-14.0.0.spec4
-rw-r--r--redhat/applications/ktechlab/ktechlab-14.0.0.spec4
-rw-r--r--redhat/applications/ktorrent/ktorrent-14.0.0.spec6
-rw-r--r--redhat/applications/ktorrent/ktorrent-14.0.1.spec226
-rw-r--r--redhat/applications/kuickshow/kuickshow-14.0.0.spec4
-rw-r--r--redhat/applications/kvirc/kvirc-14.0.0.spec10
-rw-r--r--redhat/applications/kvkbd/kvkbd-14.0.0.spec4
-rw-r--r--redhat/applications/kvpnc/kvpnc-14.0.0.spec6
-rw-r--r--redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec4
-rw-r--r--redhat/applications/piklab/piklab-14.0.0.spec4
-rw-r--r--redhat/applications/potracegui/potracegui-14.0.0.spec4
-rw-r--r--redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec4
-rw-r--r--redhat/applications/rosegarden/rosegarden-14.0.0.spec8
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-14.0.0.patch380
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-14.0.0.spec8
-rw-r--r--redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc1
-rw-r--r--redhat/applications/smb4k/smb4k-14.0.0.spec4
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-14.0.0.spec4
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-14.0.0.spec20
-rw-r--r--redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec4
-rw-r--r--redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec4
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec14
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec192
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec4
-rw-r--r--redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec4
-rw-r--r--redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec4
-rw-r--r--redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec4
-rw-r--r--redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec4
-rw-r--r--redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec4
-rw-r--r--redhat/applications/tdepowersave/tdepowersave-14.0.0.spec4
-rw-r--r--redhat/applications/tderadio/tderadio-14.0.0.spec4
-rw-r--r--redhat/applications/tdesudo/tdesudo-14.0.0.spec4
-rw-r--r--redhat/applications/tdesvn/tdesvn-14.0.0.spec24
-rw-r--r--redhat/applications/tdmtheme/tdmtheme-14.0.0.spec4
-rw-r--r--redhat/applications/tellico/tellico-14.0.0.spec8
-rw-r--r--redhat/applications/tork/tork-14.0.0.spec4
-rw-r--r--redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec4
-rw-r--r--redhat/applications/wlassistant/wlassistant-14.0.0.spec6
-rw-r--r--redhat/applications/wlassistant/wlassistant-14.0.1.spec206
-rw-r--r--redhat/applications/yakuake/yakuake-14.0.0.spec4
117 files changed, 2175 insertions, 193 deletions
diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec
index 0fe11e656..fbdac11c1 100644
--- a/redhat/applications/abakus/abakus-14.0.0.spec
+++ b/redhat/applications/abakus/abakus-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package abakus (version R14.0.0)
+# spec file for package abakus (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg abakus
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec
index 713713681..cc380dc3f 100644
--- a/redhat/applications/adept/adept-14.0.0.spec
+++ b/redhat/applications/adept/adept-14.0.0.spec
@@ -1,6 +1,25 @@
+#
+# spec file for package adept (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
# Default version for this component
%define tde_pkg adept
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index ae7735a4e..3d88d4962 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package amarok (version R14.0.0)
+# spec file for package amarok (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg amarok
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -419,6 +421,13 @@ use any of xmms' visualisation plugins with Amarok.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+# Fix some Ruby stuff
+if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" &>/dev/null; then
+ %__sed -i "amarok/src/mediadevice/daap/ConfigureChecks.cmake" \
+ -e "s|Config::|RbConfig::|g" \
+ -e "s|Config\.|RbConfig\.|g"
+fi
+
%build
unset QTDIR QTINC QTLIB
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index 2005d20e4..27b19a8b5 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package basket (version R14.0.0)
+# spec file for package basket (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg basket
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index f9059d690..27e75ffdd 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package bibletime (version R14.0.0)
+# spec file for package bibletime (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg bibletime
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/bibletime/bibletime-14.0.1.spec b/redhat/applications/bibletime/bibletime-14.0.1.spec
new file mode 100644
index 000000000..b864094e4
--- /dev/null
+++ b/redhat/applications/bibletime/bibletime-14.0.1.spec
@@ -0,0 +1,185 @@
+#
+# spec file for package bibletime (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.1
+%endif
+%define tde_pkg bibletime
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 1.6.6.0
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: A bible study tool for Trinity
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# BOOST support
+BuildRequires: boost-devel
+
+# Requires: clucene
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires: clucene-core-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}clucene-devel
+%endif
+
+# Requires: sword
+BuildRequires: sword-devel
+Requires: sword
+
+%description
+BibleTime is a free and easy to use bible study tool for UNIX systems.
+It requires a working TDE environment and the SWORD library.
+BibleTime provides easy handling of digitized texts (Bibles, commentaries
+and lexicons) and powerful features to work with these texts (search in
+texts, write own notes, save, print etc.).
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+%configure \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
+
+# Not SMP safe !
+%__make -C bibletime/frontend
+
+# SMP safe !
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
+%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
+%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
+
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+update-desktop-database %{tde_datadir}/applications -q &> /dev/null
+
+
+%postun
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+update-desktop-database %{tde_datadir}/applications -q &> /dev/null
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/bibletime
+%{tde_tdeincludedir}/bibletimeinterface.h
+%{tde_datadir}/applications/bibletime.desktop
+%{tde_datadir}/apps/bibletime/
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_tdedocdir}/HTML/en/bibletime/
+
+
+%changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.6.6.0-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index a0525d9eb..2f322b303 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package digikam (version R14.0.0)
+# spec file for package digikam (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg digikam
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/dolphin/dolphin-14.0.0.spec b/redhat/applications/dolphin/dolphin-14.0.0.spec
index 9541d138b..765bb1cca 100644
--- a/redhat/applications/dolphin/dolphin-14.0.0.spec
+++ b/redhat/applications/dolphin/dolphin-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package dolphin (version R14.0.0)
+# spec file for package dolphin (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg dolphin
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight-14.0.0.spec
index 57849c0a7..31c9b6a01 100644
--- a/redhat/applications/filelight/filelight-14.0.0.spec
+++ b/redhat/applications/filelight/filelight-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package filelight (version R14.0.0)
+# spec file for package filelight (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg filelight
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
index afb74de02..9f96d93a0 100644
--- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
+++ b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
@@ -1,6 +1,8 @@
# Default version for this component
%define tde_pkg fusion-icon
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%if "%{?python2_sitelib}" == ""
%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
index 7d730c45f..cfb763a30 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package gtk-qt-engine (version R14.0.0)
+# spec file for package gtk-qt-engine (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg gtk-qt-engine
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
@@ -73,8 +75,12 @@ BuildRequires: libtool
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
BuildRequires: gtk2-devel
%else
+%if 0%{?mgaversion} >= 5
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk+2.0-devel
%endif
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
index 82e77bb38..4acb11b0e 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
+++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package gtk3-tqt-engine (version R14.0.0)
+# spec file for package gtk3-tqt-engine (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg gtk3-tqt-engine
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
index 79d52d08f..63642ddee 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
+++ b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package gwenview-i18n (version R14.0.0)
+# spec file for package gwenview-i18n (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg gwenview-i18n
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview-14.0.0.spec
index 7f8ba3995..125a8330b 100644
--- a/redhat/applications/gwenview/gwenview-14.0.0.spec
+++ b/redhat/applications/gwenview/gwenview-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package gwenview (version R14.0.0)
+# spec file for package gwenview (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg gwenview
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
index e9b4ef1f0..6ed144917 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
+++ b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package k3b-i18n (version R14.0.0)
+# spec file for package k3b-i18n (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg k3b-i18n
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index de2f9c9b9..bb38a178b 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package k3b (version R14.0.0)
+# spec file for package k3b (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg k3b
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec
index 03427e728..3ffdded5c 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0.spec
+++ b/redhat/applications/k9copy/k9copy-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package k9copy (version R14.0.0)
+# spec file for package k9copy (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg k9copy
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/k9copy/k9copy-14.0.1.spec b/redhat/applications/k9copy/k9copy-14.0.1.spec
new file mode 100644
index 000000000..6f4fd1dc2
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-14.0.1.spec
@@ -0,0 +1,177 @@
+#
+# spec file for package k9copy (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+%define tde_pkg k9copy
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 1.2.3
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: DVD backup tool for Trinity
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires: desktop-file-utils
+BuildRequires: trinity-k3b-devel
+
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# Warning: the target distribution must have ffmpeg !
+BuildRequires: ffmpeg-devel
+Requires: ffmpeg
+
+
+%description
+k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
+to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
+This is the Trinity version.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+# Removes internal dvdread headers
+%__rm -rf dvdread
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+# FFMPEG ...
+if [ -d /usr/include/ffmpeg ]; then
+ export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
+fi
+
+# NOTICE: --enable-final causes FTBFS !
+%configure \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --disable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility \
+ \
+ --enable-k3bdevices
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} &> /dev/null
+
+%postun
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} &> /dev/null
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/k9copy
+%{tde_tdeappdir}/k9copy.desktop
+%{tde_datadir}/apps/k9copy/
+%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
+%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
+%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
+
+
+%changelog
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.2.3-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
index 767dd726b..048d59ec2 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
@@ -1,6 +1,25 @@
+#
+# spec file for package kaffeine-mozilla (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
# Default version for this component
%define tde_pkg kaffeine-mozilla
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index ffbac2fc2..857e998ee 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kaffeine (version R14.0.0)
+# spec file for package kaffeine (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kaffeine
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
@@ -184,7 +186,7 @@ BuildRequires: kernel-headers
BuildRequires: glibc-kernheaders
%endif
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
%description
Kaffeine is a xine-based media player for TDE. It plays back CDs,
@@ -229,7 +231,7 @@ update-desktop-database >& /dev/null ||:
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-tdelibs-devel
%description devel
@@ -254,7 +256,7 @@ Summary: %{name} runtime libraries
Group: System Environment/Libraries
# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libs
%{summary}.
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
index 3564c02e3..9a16c058b 100644
--- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec
+++ b/redhat/applications/kasablanca/kasablanca-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kasablanca (version R14.0.0)
+# spec file for package kasablanca (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kasablanca
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
@@ -54,7 +56,7 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: %{tde_pkg}-%{tde_version}.patch
+Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
diff --git a/redhat/applications/katapult/katapult-14.0.0.spec b/redhat/applications/katapult/katapult-14.0.0.spec
index 684ab8505..45ed9866b 100644
--- a/redhat/applications/katapult/katapult-14.0.0.spec
+++ b/redhat/applications/katapult/katapult-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package katapult (version R14.0.0)
+# spec file for package katapult (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg katapult
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
index 27b7866d0..9d5d4dc53 100644
--- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec
+++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kbarcode (version R14.0.0)
+# spec file for package kbarcode (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kbarcode
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
@@ -79,7 +81,7 @@ BuildRequires: brp-check-trinity
# PCRE support
BuildRequires: pcre-devel
-Requires: %{name}-tdefile-plugin = %{version}-%{release}
+Requires: %{name}-tdefile-plugin = %{?epoch:%{epoch}:}%{version}-%{release}
%description
@@ -134,7 +136,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
%package tdefile-plugin
Summary: tdefile-plugin for %{name}
Group: Applications/Utilities
-#Requires: %{name} = %{version}-%{release}
+#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description tdefile-plugin
%{summary}.
diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec
index ccb85e7ff..eff30b63e 100644
--- a/redhat/applications/kbfx/kbfx-14.0.0.spec
+++ b/redhat/applications/kbfx/kbfx-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kbfx (version R14.0.0)
+# spec file for package kbfx (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kbfx
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kbibtex/kbibtex-14.0.0.spec b/redhat/applications/kbibtex/kbibtex-14.0.0.spec
index 8701fc5d7..e5f62dd00 100644
--- a/redhat/applications/kbibtex/kbibtex-14.0.0.spec
+++ b/redhat/applications/kbibtex/kbibtex-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kbibtex (version R14.0.0)
+# spec file for package kbibtex (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kbibtex
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec
index 39cf717f6..6e424d7bd 100644
--- a/redhat/applications/kbiff/kbiff-14.0.0.spec
+++ b/redhat/applications/kbiff/kbiff-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kbiff (version R14.0.0)
+# spec file for package kbiff (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kbiff
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kbookreader/kbookreader-14.0.0.spec b/redhat/applications/kbookreader/kbookreader-14.0.0.spec
index 820d59246..2f6e749bd 100644
--- a/redhat/applications/kbookreader/kbookreader-14.0.0.spec
+++ b/redhat/applications/kbookreader/kbookreader-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kbookreader (version R14.0.0)
+# spec file for package kbookreader (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kbookreader
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
index c6fb31f50..e66ea3bc4 100644
--- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
+++ b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kchmviewer (version R14.0.0)
+# spec file for package kchmviewer (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kchmviewer
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
index e54ee3dcd..0fdd5c9d9 100644
--- a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
+++ b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kcmautostart (version R14.0.0)
+# spec file for package kcmautostart (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kcmautostart
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec
index 1d03c657e..659763134 100644
--- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec
+++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kcmldap (version R14.0.0)
+# spec file for package kcmldap (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kcmldap
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
@@ -62,8 +64,8 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-libtdeldap-devel >= 0.5
-Requires: trinity-tde-ldap-cert-updater = %{version}-%{release}
-Requires: trinity-kcontrol-ldap-bonding = %{version}-%{release}
+Requires: trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
@@ -98,7 +100,7 @@ This is a meta-package that installs all kcmldap related packages.
%package -n trinity-kcontrol-ldap-bonding
Summary: Kerberos control module for the TDE control center
Group: Applications/Utilities
-Requires: trinity-tde-ldap-cert-updater = %{version}-%{release}
+Requires: trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n trinity-kcontrol-ldap-bonding
This is a TDE control center module to manage TDE connections to Kerberos realms.
@@ -125,7 +127,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
%package -n trinity-tde-ldap-cert-updater
Summary: Service to keep LDAP certificates up-to-date
Group: Applications/Utilities
-Requires: trinity-kcontrol-ldap-bonding = %{version}-%{release}
+Requires: trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n trinity-tde-ldap-cert-updater
This is a small daemon which keeps the LDAP root certificate up to date with the LDAP server
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
index 04b054a8c..db2fb485f 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
+++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kcmldapcontroller (version R14.0.0)
+# spec file for package kcmldapcontroller (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kcmldapcontroller
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -83,7 +85,7 @@ BuildRequires: openldap-devel
BuildRequires: openldap2-devel
%endif
-Requires: trinity-kcontrol-ldap-controller = %{version}-%{release}
+Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release}
%description
This is a meta-package that installs all kcmldap related packages.
diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec
index f1d2d475e..b6e8f23a9 100644
--- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec
+++ b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kcmldapmanager (version R14.0.0)
+# spec file for package kcmldapmanager (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kcmldapmanager
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -83,7 +85,7 @@ BuildRequires: openldap-devel
BuildRequires: openldap2-devel
%endif
-Requires: trinity-kcontrol-ldap-manager = %{version}-%{release}
+Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release}
%description
This is a meta-package that installs all kcmldap related packages.
diff --git a/redhat/applications/kcpuload/kcpuload-14.0.0.spec b/redhat/applications/kcpuload/kcpuload-14.0.0.spec
index f3fe6aa61..004fb1245 100644
--- a/redhat/applications/kcpuload/kcpuload-14.0.0.spec
+++ b/redhat/applications/kcpuload/kcpuload-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kcpuload (version R14.0.0)
+# spec file for package kcpuload (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kcpuload
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg-14.0.0.spec
index 72ad450b5..a02e0e722 100644
--- a/redhat/applications/kdbg/kdbg-14.0.0.spec
+++ b/redhat/applications/kdbg/kdbg-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kdbg (version R14.0.0)
+# spec file for package kdbg (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kdbg
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
index c06a0da41..78183f840 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kdbusnotification (version R14.0.0)
+# spec file for package kdbusnotification (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kdbusnotification
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3-14.0.0.spec
index 59a05531e..635846618 100644
--- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec
+++ b/redhat/applications/kdiff3/kdiff3-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kdiff3 (version R14.0.0)
+# spec file for package kdiff3 (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kdiff3
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kdirstat/kdirstat-14.0.0.spec b/redhat/applications/kdirstat/kdirstat-14.0.0.spec
index e6da2c616..6ce0f694f 100644
--- a/redhat/applications/kdirstat/kdirstat-14.0.0.spec
+++ b/redhat/applications/kdirstat/kdirstat-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kdirstat (version R14.0.0)
+# spec file for package kdirstat (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kdirstat
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/keep/keep-14.0.0.spec b/redhat/applications/keep/keep-14.0.0.spec
index d45c66412..a92c3baa1 100644
--- a/redhat/applications/keep/keep-14.0.0.spec
+++ b/redhat/applications/keep/keep-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package keep (version R14.0.0)
+# spec file for package keep (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg keep
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray-14.0.0.spec
index adb301755..289cbc9fa 100644
--- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec
+++ b/redhat/applications/kerberostray/kerberostray-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kerberostray (version R14.0.0)
+# spec file for package kerberostray (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kerberostray
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kerry/kerry-14.0.0.spec b/redhat/applications/kerry/kerry-14.0.0.spec
index 16e3c36f9..dd93efea6 100644
--- a/redhat/applications/kerry/kerry-14.0.0.spec
+++ b/redhat/applications/kerry/kerry-14.0.0.spec
@@ -1,6 +1,25 @@
+#
+# spec file for package kerry (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
# Default version for this component
%define tde_pkg kerry
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
index 9dfd32a49..b6f228243 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
+++ b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kftprgrabber (version R14.0.0)
+# spec file for package kftprgrabber (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kftpgrabber
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -53,7 +55,7 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: %{tde_pkg}-%{tde_version}.patch
+Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
index 268f7c7b5..011667c34 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kgtk-qt3 (version R14.0.0)
+# spec file for package kgtk-qt3 (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kgtk-qt3
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile-14.0.0.spec
index 3755acd1e..b7763b129 100644
--- a/redhat/applications/kile/kile-14.0.0.spec
+++ b/redhat/applications/kile/kile-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kile (version R14.0.0)
+# spec file for package kile (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kile
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kima/kima-14.0.0.spec b/redhat/applications/kima/kima-14.0.0.spec
index 89a4b2a6d..e1516f424 100644
--- a/redhat/applications/kima/kima-14.0.0.spec
+++ b/redhat/applications/kima/kima-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kima (version R14.0.0)
+# spec file for package kima (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kima
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kiosktool/kiosktool-14.0.0.spec b/redhat/applications/kiosktool/kiosktool-14.0.0.spec
index 6c3e865f8..585cfa0f8 100644
--- a/redhat/applications/kiosktool/kiosktool-14.0.0.spec
+++ b/redhat/applications/kiosktool/kiosktool-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kiosktool (version R14.0.0)
+# spec file for package kiosktool (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kiosktool
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec b/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec
index 3fcd8af90..2628b2f53 100644
--- a/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec
+++ b/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kkbswitch (version R14.0.0)
+# spec file for package kkbswitch (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kkbswitch
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
index 5a321aba0..d13b32723 100644
--- a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
+++ b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package klcddimmer (version R14.0.0)
+# spec file for package klcddimmer (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg klcddimmer
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
index c958753b0..7c0a38708 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kmplayer (version R14.0.0)
+# spec file for package kmplayer (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kmplayer
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -54,7 +56,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: %{tde_pkg}-%{tde_version}.patch
+Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -145,7 +147,7 @@ BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-glib-devel
%endif
-Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
%description
@@ -224,7 +226,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%package konq-plugins
Group: Applications/Multimedia
-Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-konqueror >= %{tde_version}
Summary: KMPlayer plugin for KHTML/Konqueror [Trinity]
@@ -246,7 +248,7 @@ browser plugins.
%package doc
Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Summary: Handbook for KMPlayer [Trinity]
%description doc
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.1.spec b/redhat/applications/kmplayer/kmplayer-14.0.1.spec
new file mode 100644
index 000000000..bbe8f3145
--- /dev/null
+++ b/redhat/applications/kmplayer/kmplayer-14.0.1.spec
@@ -0,0 +1,323 @@
+#
+# spec file for package kmplayer (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+%define tde_pkg kmplayer
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.10.0c
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Summary: Media player for Trinity
+Group: Applications/Multimedia
+URL: http://www.trinitydesktop.org/
+#URL: http://kmplayer.kde.org
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# DBUS support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
+%endif
+
+# GSTREAMER support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires: libgstreamer0.10-devel
+%else
+BuildRequires: %{_lib}gstreamer0.10-devel
+%endif
+BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires: gstreamer-devel
+#BuildRequires: gstreamer-plugins-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-plugins-base-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: gstreamer-0_10-devel
+BuildRequires: gstreamer-0_10-plugins-base-devel
+%endif
+
+# XINE support
+%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_xine 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires: %{_lib}xine-devel
+%else
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
+%endif
+%endif
+
+# X11 stuff
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: libxt-devel
+BuildRequires: libxv-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXv-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires: xorg-x11-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires: xorg-x11-libXv-devel
+%endif
+
+# GTK2 stuff
+BuildRequires: gtk2-devel
+
+# DBUS stuff
+%if 0%{?suse_version}
+BuildRequires: dbus-1-glib-devel
+%else
+BuildRequires: dbus-glib-devel
+%endif
+
+Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+A basic audio/video viewer application for Trinity.
+
+KMPlayer can:
+* play DVD (DVDNav only with the Xine player)
+* play VCD
+* let the backend players play from a pipe (read from stdin)
+* play from a TV device (experimental)
+* show backend player's console output
+* launch ffserver (only 0.4.8 works) when viewing from a v4l device
+* DCOP KMediaPlayer interface support
+* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
+ shortcut configure window
+* Lots of configurable shortcuts. Highly recommended for the VDR keys
+ (if you have VDR) and volume increase/decrease
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
+%{tde_bindir}/kmplayer
+%{tde_bindir}/knpplayer
+%{tde_bindir}/kxvplayer
+%{tde_libdir}/libtdeinit_kmplayer.la
+%{tde_libdir}/libtdeinit_kmplayer.so
+%{tde_tdelibdir}/kmplayer.la
+%{tde_tdelibdir}/kmplayer.so
+%{tde_tdeappdir}/kmplayer.desktop
+%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
+%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
+%exclude %{tde_datadir}/apps/kmplayer/noise.gif
+%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo
+%{tde_datadir}/apps/kmplayer/
+
+##########
+
+%package base
+Group: Applications/Multimedia
+Summary: Base files for KMPlayer [Trinity]
+
+%description base
+Core files needed for KMPlayer.
+
+%post base
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun base
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%files base
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmplayercommon.la
+%{tde_libdir}/libkmplayercommon.so
+%{tde_bindir}/kgstplayer
+%{tde_bindir}/kxineplayer
+%{tde_datadir}/config/kmplayerrc
+%{tde_datadir}/apps/kmplayer/bookmarks.xml
+%{tde_datadir}/apps/kmplayer/noise.gif
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
+%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
+%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
+
+##########
+
+%package konq-plugins
+Group: Applications/Multimedia
+Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konqueror >= %{tde_version}
+Summary: KMPlayer plugin for KHTML/Konqueror [Trinity]
+
+%description konq-plugins
+This plugin enables audio/video playback inside konqueror, using Xine (with
+*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
+tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
+browser plugins.
+
+%files konq-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/libkmplayerpart.la
+%{tde_tdelibdir}/libkmplayerpart.so
+%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
+%{tde_datadir}/apps/kmplayer/pluginsinfo
+%{tde_datadir}/services/kmplayer_part.desktop
+
+##########
+
+%package doc
+Group: Applications/Multimedia
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary: Handbook for KMPlayer [Trinity]
+
+%description doc
+Documention for KMPlayer, a basic audio/video viewer application for TDE.
+
+%files doc
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/*/kmplayer
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+%configure \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ --libdir=%{tde_libdir} \
+ --mandir=%{tde_mandir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+# Removes unwanted files
+%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.10.0c-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
index ddb5d72a0..1d9679ef3 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kmyfirewall (version R14.0.0)
+# spec file for package kmyfirewall (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kmyfirewall
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index b529c8547..c1b92a345 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kmymoney (version R14.0.0)
+# spec file for package kmymoney (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kmymoney
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -54,6 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kmymoneytitlelabel.png
+Patch0: kmymoney-14.0.1-ftbfs.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -100,7 +103,7 @@ BuildRequires: openjade-devel
BuildRequires: libtqt3-mt-sqlite3
Requires: libtqt3-mt-sqlite3
-Requires: %{name}-common == %{version}-%{release}
+Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
%description
@@ -142,7 +145,7 @@ done
%package common
Summary: KMyMoney architecture independent files
Group: Applications/Utilities
-Requires: %{name} == %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description common
This package contains architecture independent files needed for KMyMoney to
@@ -175,7 +178,7 @@ have '%{name}' package installed, you will hardly find this package useful.
%package devel
Summary: KMyMoney development files
Group: Development/Libraries
-Requires: %{name} == %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
This package contains development files needed for KMyMoney plugins.
@@ -200,6 +203,7 @@ This package contains development files needed for KMyMoney plugins.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
%__install -m644 %{SOURCE1} kmymoney2/widgets/
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch b/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch
new file mode 100644
index 000000000..e1a0bc572
--- /dev/null
+++ b/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch
@@ -0,0 +1,11 @@
+--- trinity-kmymoney-14.0.1~pre4+bb123ba2/kmymoney2/mymoney/Makefile.am.orig 2015-06-28 12:58:53.565869007 +0200
++++ trinity-kmymoney-14.0.1~pre4+bb123ba2/kmymoney2/mymoney/Makefile.am 2015-06-28 12:59:16.595869143 +0200
+@@ -33,7 +33,7 @@
+ libkmm_mymoney_la_METASOURCES = AUTO
+
+ libkmm_mymoney_la_SOURCES = mymoneymoney.cpp mymoneyfinancialcalculator.cpp mymoneytransactionfilter.cpp mymoneyobject.cpp mymoneykeyvaluecontainer.cpp mymoneyobserver.cpp mymoneysubject.cpp mymoneysplit.cpp mymoneyinstitution.cpp mymoneyexception.cpp mymoneyinvesttransaction.cpp mymoneyutils.cpp mymoneysecurity.cpp mymoneytransaction.cpp mymoneyscheduled.cpp mymoneypayee.cpp mymoneyfile.cpp mymoneycategory.cpp mymoneyaccount.cpp mymoneyreport.cpp mymoneystatement.cpp mymoneyprice.cpp mymoneybudget.cpp mymoneyobjectcontainer.cpp mymoneyforecast.cpp
+-libkmm_mymoney_la_LDFLAGS = $(all_libraries) -version-info $(LIBVERSION)
++libkmm_mymoney_la_LDFLAGS = $(all_libraries) -version-info $(LIBVERSION) $(LIB_QT) $(LIB_TDECORE)
+
+ SUBDIRS = storage
+
diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec
index fb4970ed2..1f104eaf7 100644
--- a/redhat/applications/knemo/knemo-14.0.0.spec
+++ b/redhat/applications/knemo/knemo-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package knemo (version R14.0.0)
+# spec file for package knemo (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg knemo
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/knetload/knetload-14.0.0.spec b/redhat/applications/knetload/knetload-14.0.0.spec
index 95a3f1522..8a63f76ec 100644
--- a/redhat/applications/knetload/knetload-14.0.0.spec
+++ b/redhat/applications/knetload/knetload-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package knetload (version R14.0.0)
+# spec file for package knetload (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg knetload
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/knetstats/knetstats-14.0.0.spec b/redhat/applications/knetstats/knetstats-14.0.0.spec
index e7d1498a9..180664256 100644
--- a/redhat/applications/knetstats/knetstats-14.0.0.spec
+++ b/redhat/applications/knetstats/knetstats-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package knetstats (version R14.0.0)
+# spec file for package knetstats (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg knetstats
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
index 12ea8e41c..05b9c8ee1 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package knetworkmanager8 (version R14.0.0)
+# spec file for package knetworkmanager8 (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg knetworkmanager
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/knights/knights-14.0.0.spec b/redhat/applications/knights/knights-14.0.0.spec
index ebe2fdc9a..56e74f3e3 100644
--- a/redhat/applications/knights/knights-14.0.0.spec
+++ b/redhat/applications/knights/knights-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package knights (version R14.0.0)
+# spec file for package knights (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg knights
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/knmap/knmap-14.0.0.spec b/redhat/applications/knmap/knmap-14.0.0.spec
index 8886333a2..5e72247f8 100644
--- a/redhat/applications/knmap/knmap-14.0.0.spec
+++ b/redhat/applications/knmap/knmap-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package knmap (version R14.0.0)
+# spec file for package knmap (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg knmap
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/knowit/knowit-14.0.0.spec b/redhat/applications/knowit/knowit-14.0.0.spec
index 124527ee4..bf5bf113c 100644
--- a/redhat/applications/knowit/knowit-14.0.0.spec
+++ b/redhat/applications/knowit/knowit-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package knowit (version R14.0.0)
+# spec file for package knowit (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg knowit
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/knutclient/knutclient-14.0.0.spec b/redhat/applications/knutclient/knutclient-14.0.0.spec
index c11bf6267..5e86bdec1 100644
--- a/redhat/applications/knutclient/knutclient-14.0.0.spec
+++ b/redhat/applications/knutclient/knutclient-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package knutclient (version R14.0.0)
+# spec file for package knutclient (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg knutclient
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
index c4d8f4896..6def257e3 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
+++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package koffice-i18n (version R14.0.0)
+# spec file for package koffice-i18n (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg koffice-i18n
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index cb5e1e954..8dcbe7f83 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package koffice (version R14.0.0)
+# spec file for package koffice (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg koffice
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -243,23 +245,22 @@ KOffice is an integrated office suite.
%package suite
Summary: An integrated office suite
Group: Applications/Productivity
-Obsoletes: %{name} <= %{version}-%{release}
-Obsoletes: %{name}-i18n < 4:%{version}
-Requires: %{name}-core = %{version}-%{release}
-Requires: %{name}-kword = %{version}-%{release}
-Requires: %{name}-kspread = %{version}-%{release}
-Requires: %{name}-kpresenter = %{version}-%{release}
-Requires: %{name}-kivio = %{version}-%{release}
-Requires: %{name}-karbon = %{version}-%{release}
-Requires: %{name}-kugar = %{version}-%{release}
-Requires: %{name}-kexi = %{version}-%{release}
-Requires: %{name}-kexi-driver-mysql = %{version}-%{release}
-%{?with_postgresql:Requires: %{name}-kexi-driver-pgsql = %{version}-%{release}}
-Requires: %{name}-kchart = %{version}-%{release}
-Requires: %{name}-kformula = %{version}-%{release}
-Requires: %{name}-filters = %{version}-%{release}
-Requires: %{name}-kplato = %{version}-%{release}
-Requires: %{name}-chalk = %{version}-%{release}
+Obsoletes: %{name} <= %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kword = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kspread = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kpresenter = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kivio = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-karbon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kugar = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kexi-driver-mysql = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_postgresql:Requires: %{name}-kexi-driver-pgsql = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: %{name}-kchart = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kformula = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kplato = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-chalk = %{?epoch:%{epoch}:}%{version}-%{release}
%description suite
KOffice is an integrated office suite.
@@ -272,7 +273,7 @@ KOffice is an integrated office suite.
%package core
Summary: Core support files for %{name}
Group: Applications/Productivity
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: perl
%description core
@@ -408,7 +409,7 @@ License: LGPLv2+
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
License: LGPLv2+
%description devel
@@ -428,7 +429,7 @@ License: LGPLv2+
%package kword
Summary: A frame-based word processor capable of professional standard documents
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%description kword
%{summary}.
@@ -462,7 +463,7 @@ update-desktop-database -q &> /dev/null ||:
%package kspread
Summary: A powerful spreadsheet application
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%description kspread
%{summary}.
@@ -499,7 +500,7 @@ Requires: %{name}-core = %{version}-%{release}
%package kpresenter
Summary: A full-featured presentation program
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%description kpresenter
%{summary}.
@@ -533,7 +534,7 @@ update-desktop-database -q &> /dev/null ||:
%package kivio
Summary: A flowcharting application
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: kivio < %{version}-%{release}
%description kivio
@@ -557,7 +558,7 @@ Obsoletes: kivio < %{version}-%{release}
%package karbon
Summary: A vector drawing application
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%description karbon
%{summary}.
@@ -589,7 +590,7 @@ Requires: %{name}-core = %{version}-%{release}
%package kugar
Summary: A tool for generating business quality reports
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%description kugar
%{summary}.
@@ -627,7 +628,7 @@ update-desktop-database -q &> /dev/null ||:
%package kexi
Summary: An integrated environment for managing data
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?with_postgresql} == 0
Obsoletes: %{name}-kexi-driver-pgsql
@@ -681,7 +682,7 @@ update-desktop-database -q &> /dev/null ||:
%package kexi-driver-mysql
Summary: Mysql-driver for kexi
Group: Applications/Productivity
-Requires: %{name}-kexi = %{version}-%{release}
+Requires: %{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
%description kexi-driver-mysql
%{summary}.
@@ -700,7 +701,7 @@ Requires: %{name}-kexi = %{version}-%{release}
%package kexi-driver-pgsql
Summary: Postgresql driver for kexi
Group: Applications/Productivity
-Requires: %{name}-kexi = %{version}-%{release}
+Requires: %{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
%description kexi-driver-pgsql
%{summary}.
@@ -719,7 +720,7 @@ Requires: %{name}-kexi = %{version}-%{release}
%package kchart
Summary: An integrated graph and chart drawing tool
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%description kchart
%{summary}.
@@ -749,7 +750,7 @@ update-desktop-database -q &> /dev/null ||:
%package kformula
Summary: A powerful formula editor
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?mgaversion} || 0%{?mdkversion}
Requires: fonts-ttf-dejavu
@@ -788,7 +789,7 @@ Requires: dejavu
%package filters
Summary: Import and Export Filters for KOffice
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%description filters
%{summary}.
@@ -858,7 +859,7 @@ Requires: %{name}-core = %{version}-%{release}
%package kplato
Summary: An integrated project management and planning tool
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%description kplato
%{summary}.
@@ -879,9 +880,9 @@ Requires: %{name}-core = %{version}-%{release}
%package chalk
Summary: pixel-based image manipulation program for the TDE Office Suite [Trinity]
Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
-Requires: %{name}-chalk-data = %{version}-%{release}
-Requires: %{name}-filters
+Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-chalk-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release}
%description chalk
Chalk is a painting and image editing application for KOffice. Chalk contains
diff --git a/redhat/applications/konversation/konversation-14.0.0.spec b/redhat/applications/konversation/konversation-14.0.0.spec
index ce36a3b30..d92e56f92 100644
--- a/redhat/applications/konversation/konversation-14.0.0.spec
+++ b/redhat/applications/konversation/konversation-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package konversation (version R14.0.0)
+# spec file for package konversation (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg konversation
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
index b3fec2dfd..d7bc13318 100644
--- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kopete-otr (version R14.0.0)
+# spec file for package kopete-otr (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kopete-otr
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kpicosim/kpicosim-14.0.0.spec b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
index ee3310dca..5fc79faf0 100644
--- a/redhat/applications/kpicosim/kpicosim-14.0.0.spec
+++ b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kpicosim (version R14.0.0)
+# spec file for package kpicosim (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kpicosim
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index b36931281..1ab6d8790 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kpilot (version R14.0.0)
+# spec file for package kpilot (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kpilot
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kpowersave/kpowersave-14.0.0.spec b/redhat/applications/kpowersave/kpowersave-14.0.0.spec
index ceabb46cb..a9bde95f2 100644
--- a/redhat/applications/kpowersave/kpowersave-14.0.0.spec
+++ b/redhat/applications/kpowersave/kpowersave-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kpowersave (version R14.0.0)
+# spec file for package kpowersave (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kpowersave
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes-14.0.0.spec
index 35197c331..6fe829181 100644
--- a/redhat/applications/krecipes/krecipes-14.0.0.spec
+++ b/redhat/applications/krecipes/krecipes-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package krecipes (version R14.0.0)
+# spec file for package krecipes (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg krecipes
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/krename/krename-14.0.0.spec b/redhat/applications/krename/krename-14.0.0.spec
index 50ec0f733..922377b4a 100644
--- a/redhat/applications/krename/krename-14.0.0.spec
+++ b/redhat/applications/krename/krename-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package krename (version R14.0.0)
+# spec file for package krename (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg krename
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader-14.0.0.spec
index 0882e5163..3c5d95197 100644
--- a/redhat/applications/krusader/krusader-14.0.0.spec
+++ b/redhat/applications/krusader/krusader-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package krusader (version R14.0.0)
+# spec file for package krusader (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg krusader
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kscope/kscope-14.0.0.spec b/redhat/applications/kscope/kscope-14.0.0.spec
index 1dbe68c8f..dbf097247 100644
--- a/redhat/applications/kscope/kscope-14.0.0.spec
+++ b/redhat/applications/kscope/kscope-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kscope (version R14.0.0)
+# spec file for package kscope (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kscope
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec
index 61f1a164d..c2b3c6a9c 100644
--- a/redhat/applications/ksensors/ksensors-14.0.0.spec
+++ b/redhat/applications/ksensors/ksensors-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package ksensors (version R14.0.0)
+# spec file for package ksensors (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg ksensors
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
index 24baaccab..41c97984d 100644
--- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec
+++ b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kshowmail (version R14.0.0)
+# spec file for package kshowmail (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kshowmail
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kshutdown/kshutdown-14.0.0.spec b/redhat/applications/kshutdown/kshutdown-14.0.0.spec
index 1a7c60f76..b35d8b6f7 100644
--- a/redhat/applications/kshutdown/kshutdown-14.0.0.spec
+++ b/redhat/applications/kshutdown/kshutdown-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kshutdown (version R14.0.0)
+# spec file for package kshutdown (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kshutdown
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec
index ded26ca36..22a1d6fe8 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec
+++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package ksplash-engine-moodin (version R14.0.0)
+# spec file for package ksplash-engine-moodin (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg ksplash-engine-moodin
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
index 051c98789..0570f8c2e 100644
--- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
+++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package ksquirrel (version R14.0.0)
+# spec file for package ksquirrel (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg ksquirrel
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index 8a8ab4481..8d5033d26 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kstreamripper (version R14.0.0)
+# spec file for package kstreamripper (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kstreamripper
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
index d7dfcb6d4..d86d19ffc 100644
--- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
+++ b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package ksystemlog (version R14.0.0)
+# spec file for package ksystemlog (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg ksystemlog
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/ktechlab/ktechlab-14.0.0.spec b/redhat/applications/ktechlab/ktechlab-14.0.0.spec
index d0fd4e253..463145cd0 100644
--- a/redhat/applications/ktechlab/ktechlab-14.0.0.spec
+++ b/redhat/applications/ktechlab/ktechlab-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package ktechlab (version R14.0.0)
+# spec file for package ktechlab (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg ktechlab
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent-14.0.0.spec
index 5ef701013..c25023666 100644
--- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec
+++ b/redhat/applications/ktorrent/ktorrent-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package ktorrent (version R14.0.0)
+# spec file for package ktorrent (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg ktorrent
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -54,7 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: %{tde_pkg}-%{tde_version}.patch
+Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
diff --git a/redhat/applications/ktorrent/ktorrent-14.0.1.spec b/redhat/applications/ktorrent/ktorrent-14.0.1.spec
new file mode 100644
index 000000000..c7adf8c90
--- /dev/null
+++ b/redhat/applications/ktorrent/ktorrent-14.0.1.spec
@@ -0,0 +1,226 @@
+#
+# spec file for package ktorrent (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+%define tde_pkg ktorrent
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 2.2.8
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: BitTorrent client for Trinity
+Group: Applications/Utilities
+URL: http://ktorrent.org
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# GMP support
+BuildRequires: gmp-devel
+
+# AVAHI support
+# Disabled on RHEL4 and RHEL5
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%define with_avahi 1
+BuildRequires: trinity-avahi-tqt-devel
+Requires: trinity-avahi-tqt
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}avahi-client-devel
+Requires: %{_lib}avahi-client3
+%else
+BuildRequires: avahi-devel
+Requires: avahi
+%endif
+%endif
+
+
+%description
+KTorrent is a BitTorrent program for Trinity. Its features include speed capping
+(both down and up), integrated searching, UDP tracker support, preview of
+certain file types (video and audio) and integration into the TDE Panel
+enabling background downloading.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+ --prefix="%{tde_prefix}" \
+ --exec-prefix="%{tde_prefix}" \
+ --bindir="%{tde_bindir}" \
+ --datadir="%{tde_datadir}" \
+ --libdir="%{tde_libdir}" \
+ --mandir="%{tde_mandir}" \
+ --includedir="%{tde_tdeincludedir}" \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility \
+ \
+ %{?!with_avahi:--without-avahi}
+
+
+# Not SMP safe !
+%__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf "%{buildroot}"
+%__make install DESTDIR="%{buildroot}"
+
+%find_lang %{tde_pkg}
+
+# Unwanted files
+%__rm -f "%{?buildroot}%{tde_libdir}/libktorrent.so"
+
+
+%clean
+%__rm -rf "%{buildroot}"
+
+
+%post
+update-desktop-database %{tde_tdeappdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+update-desktop-database %{tde_tdeappdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/ktcachecheck
+%{tde_bindir}/ktorrent
+%{tde_bindir}/ktshell
+%{tde_bindir}/kttorinfo
+%{tde_bindir}/ktupnptest
+%{tde_libdir}/libktorrent-%{version}.so
+%{tde_libdir}/libktorrent.la
+%{tde_tdelibdir}/ktinfowidgetplugin.la
+%{tde_tdelibdir}/ktinfowidgetplugin.so
+%{tde_tdelibdir}/ktipfilterplugin.la
+%{tde_tdelibdir}/ktipfilterplugin.so
+%{tde_tdelibdir}/ktlogviewerplugin.la
+%{tde_tdelibdir}/ktlogviewerplugin.so
+%{tde_tdelibdir}/ktpartfileimportplugin.la
+%{tde_tdelibdir}/ktpartfileimportplugin.so
+%{tde_tdelibdir}/ktrssfeedplugin.la
+%{tde_tdelibdir}/ktrssfeedplugin.so
+%{tde_tdelibdir}/ktscanfolderplugin.la
+%{tde_tdelibdir}/ktscanfolderplugin.so
+%{tde_tdelibdir}/ktschedulerplugin.la
+%{tde_tdelibdir}/ktschedulerplugin.so
+%{tde_tdelibdir}/ktsearchplugin.la
+%{tde_tdelibdir}/ktsearchplugin.so
+%{tde_tdelibdir}/ktstatsplugin.la
+%{tde_tdelibdir}/ktstatsplugin.so
+%{tde_tdelibdir}/ktupnpplugin.la
+%{tde_tdelibdir}/ktupnpplugin.so
+%{tde_tdelibdir}/ktwebinterfaceplugin.la
+%{tde_tdelibdir}/ktwebinterfaceplugin.so
+%{tde_tdeappdir}/ktorrent.desktop
+%{tde_datadir}/apps/ktorrent/
+%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.svgz
+%{tde_datadir}/services/*.desktop
+%{tde_datadir}/servicetypes/ktorrentplugin.desktop
+%{tde_tdedocdir}/HTML/en/ktorrent/
+
+%if 0%{?with_avahi}
+%{tde_tdelibdir}/ktzeroconfplugin.la
+%{tde_tdelibdir}/ktzeroconfplugin.so
+%endif
+
+
+%changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.2.8-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
index c0eb06fdd..8f14bd3f5 100644
--- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec
+++ b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kuickshow (version R14.0.0)
+# spec file for package kuickshow (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kuickshow
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec
index 96dd26c95..121b644c0 100644
--- a/redhat/applications/kvirc/kvirc-14.0.0.spec
+++ b/redhat/applications/kvirc/kvirc-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kvirc (version R14.0.0)
+# spec file for package kvirc (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kvirc
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -74,7 +76,7 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-Requires: %{name}-data = %{version}-%{release}
+Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
%description
@@ -90,7 +92,7 @@ you need to install the kvirc-dev package.
%package data
Group: Applications/Utilities
Summary: Data files for KVIrc
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description data
This package contains the architecture-independent data needed by KVIrc in
@@ -106,7 +108,7 @@ with the Trinity Desktop Environment version 3.
%package devel
Group: Development/Libraries
Summary: Development files for KVIrc
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
This package contains KVIrc libraries and include files you need if you
diff --git a/redhat/applications/kvkbd/kvkbd-14.0.0.spec b/redhat/applications/kvkbd/kvkbd-14.0.0.spec
index 18f04f15c..5e42de260 100644
--- a/redhat/applications/kvkbd/kvkbd-14.0.0.spec
+++ b/redhat/applications/kvkbd/kvkbd-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kvkbd (version R14.0.0)
+# spec file for package kvkbd (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kvkbd
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.spec b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
index 36db0e610..e3340ca78 100644
--- a/redhat/applications/kvpnc/kvpnc-14.0.0.spec
+++ b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kvpnc (version R14.0.0)
+# spec file for package kvpnc (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg kvpnc
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -54,7 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: %{tde_pkg}-%{tde_version}.patch
+Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
index 549241657..45af4a3d2 100644
--- a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
+++ b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package mplayerthumbs (version R14.0.0)
+# spec file for package mplayerthumbs (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg mplayerthumbs
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec
index e044df23c..32e37bea0 100644
--- a/redhat/applications/piklab/piklab-14.0.0.spec
+++ b/redhat/applications/piklab/piklab-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package piklab (version R14.0.0)
+# spec file for package piklab (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg piklab
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/potracegui/potracegui-14.0.0.spec b/redhat/applications/potracegui/potracegui-14.0.0.spec
index d8eb6380b..b7e115923 100644
--- a/redhat/applications/potracegui/potracegui-14.0.0.spec
+++ b/redhat/applications/potracegui/potracegui-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package potracegui (version R14.0.0)
+# spec file for package potracegui (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg potracegui
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec
index f48020df4..f5647b8e1 100644
--- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec
+++ b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package qt4-tqt-theme-engine (version R14.0.0)
+# spec file for package qt4-tqt-theme-engine (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg qt4-tqt-theme-engine
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
index 6e81f99b9..962454c8b 100644
--- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec
+++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package rosegarden (version R14.0.0)
+# spec file for package rosegarden (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg rosegarden
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -125,7 +127,7 @@ Requires: libsndfile-utils
%endif
-Requires: %{name}-data == %{version}-%{release}
+Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
%description
@@ -136,7 +138,7 @@ lilypond and Csound files export, etc.
%package data
Group: Applications/Multimedia
-Requires: %{name} == %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Summary: music editor and MIDI/audio sequencer data files [Trinity]
%description data
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.patch b/redhat/applications/smartcardauth/smartcardauth-14.0.0.patch
new file mode 100644
index 000000000..f6a7a2595
--- /dev/null
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.patch
@@ -0,0 +1,380 @@
+diff --git a/src/ckpass.c b/src/ckpass.c
+index 1da83c6..f3a14d0 100644
+--- a/src/ckpass.c
++++ b/src/ckpass.c
+@@ -8,6 +8,8 @@
+ ** or PAM.
+ */
+
++extern x_malloc(size_t size, const char *file, int line);
++
+ /* Used for unused parameters to silence gcc warnings. */
+ #define UNUSED __attribute__((__unused__))
+
+@@ -46,7 +48,7 @@
+ number information for debugging error messages without the user having to
+ pass those in every time. */
+ #define xcalloc(n, size) x_calloc((n), (size), __FILE__, __LINE__)
+-#define xmalloc(size) x_malloc((size), __FILE__, __LINE__)
++#define smartcardauth_xmalloc(size) x_malloc((size), __FILE__, __LINE__)
+ #define xrealloc(p, size) x_realloc((p), (size), __FILE__, __LINE__)
+ #define xstrdup(p) x_strdup((p), __FILE__, __LINE__)
+ #define xstrndup(p, size) x_strndup((p), (size), __FILE__, __LINE__)
+@@ -71,7 +73,7 @@ struct auth_info {
+ ** This function allocates an array of struct pam_response to return to the
+ ** PAM libraries that's never freed. For this program, this isn't much of an
+ ** issue, since it will likely only be called once and then the program will
+-** exit. This function uses malloc and strdup instead of xmalloc and xstrdup
++** exit. This function uses malloc and strdup instead of smartcardauth_xmalloc and xstrdup
+ ** intentionally so that the PAM conversation will be closed cleanly if we
+ ** run out of memory rather than simply terminated.
+ **
+@@ -82,8 +84,9 @@ static int pass_conv(int num_msg, const struct pam_message **msgm UNUSED, struct
+ int i;
+
+ *response = malloc(num_msg * sizeof(struct pam_response));
+- if (*response == NULL)
++ if (*response == NULL) {
+ return PAM_CONV_ERR;
++ }
+ for (i = 0; i < num_msg; i++) {
+ (*response)[i].resp = strdup((char *)appdata_ptr);
+ (*response)[i].resp_retcode = 0;
+@@ -115,17 +118,21 @@ static bool auth_pam(const char *username, char *password)
+ conv.conv = pass_conv;
+ conv.appdata_ptr = password;
+ status = pam_start("nnrpd", username, &conv, &pamh);
+- if (status != PAM_SUCCESS)
++ if (status != PAM_SUCCESS) {
+ die("pam_start failed: %s", pam_strerror(pamh, status));
++ }
+ status = pam_authenticate(pamh, PAM_SILENT);
+- if (status != PAM_SUCCESS)
++ if (status != PAM_SUCCESS) {
+ die("pam_authenticate failed: %s", pam_strerror(pamh, status));
++ }
+ status = pam_acct_mgmt(pamh, PAM_SILENT);
+- if (status != PAM_SUCCESS)
++ if (status != PAM_SUCCESS) {
+ die("pam_acct_mgmt failed: %s", pam_strerror(pamh, status));
++ }
+ status = pam_end(pamh, status);
+- if (status != PAM_SUCCESS)
++ if (status != PAM_SUCCESS) {
+ die("pam_end failed: %s", pam_strerror(pamh, status));
++ }
+
+ /* If we get to here, the user successfully authenticated. */
+ return true;
+@@ -153,8 +160,9 @@ password_dbm(char *name, const char *file)
+ char *password;
+
+ database = dbm_open(file, O_RDONLY, 0600);
+- if (database == NULL)
++ if (database == NULL) {
+ return NULL;
++ }
+ key.dptr = name;
+ key.dsize = strlen(name);
+ value = dbm_fetch(database, key);
+@@ -162,7 +170,7 @@ password_dbm(char *name, const char *file)
+ dbm_close(database);
+ return NULL;
+ }
+- password = xmalloc(value.dsize + 1);
++ password = smartcardauth_xmalloc(value.dsize + 1);
+ strlcpy(password, value.dptr, value.dsize + 1);
+ dbm_close(database);
+ return password;
+@@ -188,8 +196,10 @@ password_shadow(const char *user)
+ struct spwd *spwd;
+
+ spwd = getspnam(user);
+- if (spwd != NULL)
+- return xstrdup(spwd->sp_pwdp);
++ if (spwd != NULL) {
++ char* ret = xstrdup(spwd->sp_pwdp);
++ return ret;
++ }
+ return NULL;
+ }
+ #endif /* HAVE_GETSPNAM */
+@@ -206,8 +216,10 @@ password_system(const char *username)
+ struct passwd *pwd;
+
+ pwd = getpwnam(username);
+- if (pwd != NULL)
+- return xstrdup(pwd->pw_passwd);
++ if (pwd != NULL) {
++ char* ret = xstrdup(pwd->pw_passwd);
++ return ret;
++ }
+ return NULL;
+ }
+
+@@ -225,12 +237,15 @@ group_system(const char *username)
+ struct group *gr;
+
+ pwd = getpwnam(username);
+- if (pwd == NULL)
++ if (pwd == NULL) {
+ return NULL;
++ }
+ gr = getgrgid(pwd->pw_gid);
+- if (gr == NULL)
++ if (gr == NULL) {
+ return NULL;
+- return xstrdup(gr->gr_name);
++ }
++ char* ret = xstrdup(gr->gr_name);
++ return ret;
+ }
+
+
+@@ -242,12 +257,13 @@ output_user(const char *username, bool wantgroup)
+ {
+ if (wantgroup) {
+ char *group = group_system(username);
+- if (group == NULL)
++ if (group == NULL) {
+ die("group info for user %s not available", username);
++ }
+ printf("User:%s@%s\n", username, group);
+- }
+- else
++ } else {
+ printf("User:%s\n", username);
++ }
+ }
+
+
+@@ -264,7 +280,7 @@ check_password(const char* username, const char* password)
+ bool wantgroup = false;
+ struct auth_info *authinfo = NULL;
+
+- authinfo = xmalloc(sizeof(struct auth_info));
++ authinfo = smartcardauth_xmalloc(sizeof(struct auth_info));
+ authinfo->username = username;
+ authinfo->password = password;
+
+@@ -273,12 +289,14 @@ check_password(const char* username, const char* password)
+ return 0;
+ }
+ password = password_system(authinfo->username);
+- if (password == NULL)
++ if (password == NULL) {
+ return 1;
+- if (strcmp(password, crypt(authinfo->password, password)) != 0)
++ }
++ if (strcmp(password, crypt(authinfo->password, password)) != 0) {
+ return 1;
++ }
+
+ /* The password matched. */
+ output_user(authinfo->username, wantgroup);
+ return 0;
+-}
+\ No newline at end of file
++}
+diff --git a/src/ckpasswd.c b/src/ckpasswd.c
+index 9dbdbcf..a0faa15 100644
+--- a/src/ckpasswd.c
++++ b/src/ckpasswd.c
+@@ -83,8 +83,9 @@ static int pass_conv(int num_msg, const struct pam_message **msgm UNUSED, struct
+ int i;
+
+ *response = malloc(num_msg * sizeof(struct pam_response));
+- if (*response == NULL)
++ if (*response == NULL) {
+ return PAM_CONV_ERR;
++ }
+ for (i = 0; i < num_msg; i++) {
+ (*response)[i].resp = strdup((char *)appdata_ptr);
+ (*response)[i].resp_retcode = 0;
+@@ -116,17 +117,21 @@ static bool auth_pam(const char *username, char *password)
+ conv.conv = pass_conv;
+ conv.appdata_ptr = password;
+ status = pam_start("nnrpd", username, &conv, &pamh);
+- if (status != PAM_SUCCESS)
++ if (status != PAM_SUCCESS) {
+ die("pam_start failed: %s", pam_strerror(pamh, status));
++ }
+ status = pam_authenticate(pamh, PAM_SILENT);
+- if (status != PAM_SUCCESS)
++ if (status != PAM_SUCCESS) {
+ die("pam_authenticate failed: %s", pam_strerror(pamh, status));
++ }
+ status = pam_acct_mgmt(pamh, PAM_SILENT);
+- if (status != PAM_SUCCESS)
++ if (status != PAM_SUCCESS) {
+ die("pam_acct_mgmt failed: %s", pam_strerror(pamh, status));
++ }
+ status = pam_end(pamh, status);
+- if (status != PAM_SUCCESS)
++ if (status != PAM_SUCCESS) {
+ die("pam_end failed: %s", pam_strerror(pamh, status));
++ }
+
+ /* If we get to here, the user successfully authenticated. */
+ return true;
+@@ -154,8 +159,9 @@ password_dbm(char *name, const char *file)
+ char *password;
+
+ database = dbm_open(file, O_RDONLY, 0600);
+- if (database == NULL)
++ if (database == NULL) {
+ return NULL;
++ }
+ key.dptr = name;
+ key.dsize = strlen(name);
+ value = dbm_fetch(database, key);
+@@ -189,8 +195,10 @@ password_shadow(const char *user)
+ struct spwd *spwd;
+
+ spwd = getspnam(user);
+- if (spwd != NULL)
+- return xstrdup(spwd->sp_pwdp);
++ if (spwd != NULL) {
++ char* ret = xstrdup(spwd->sp_pwdp);
++ return ret;
++ }
+ return NULL;
+ }
+ #endif /* HAVE_GETSPNAM */
+@@ -207,8 +215,10 @@ password_system(const char *username)
+ struct passwd *pwd;
+
+ pwd = getpwnam(username);
+- if (pwd != NULL)
+- return xstrdup(pwd->pw_passwd);
++ if (pwd != NULL) {
++ char* ret = xstrdup(pwd->pw_passwd);
++ return ret;
++ }
+ return NULL;
+ }
+
+@@ -226,12 +236,15 @@ group_system(const char *username)
+ struct group *gr;
+
+ pwd = getpwnam(username);
+- if (pwd == NULL)
++ if (pwd == NULL) {
+ return NULL;
++ }
+ gr = getgrgid(pwd->pw_gid);
+- if (gr == NULL)
++ if (gr == NULL) {
+ return NULL;
+- return xstrdup(gr->gr_name);
++ }
++ char* ret = xstrdup(gr->gr_name);
++ return ret;
+ }
+
+
+@@ -243,12 +256,13 @@ output_user(const char *username, bool wantgroup)
+ {
+ if (wantgroup) {
+ char *group = group_system(username);
+- if (group == NULL)
++ if (group == NULL) {
+ die("group info for user %s not available", username);
++ }
+ printf("User:%s@%s\n", username, group);
+- }
+- else
++ } else {
+ printf("User:%s\n", username);
++ }
+ }
+
+
+@@ -276,29 +290,35 @@ main(int argc, char *argv[])
+ while ((opt = getopt(argc, argv, "gf:u:p:" OPT_DBM OPT_SHADOW)) != -1) {
+ switch (opt) {
+ case 'g':
+- if (type == AUTH_DBM || type == AUTH_FILE)
++ if (type == AUTH_DBM || type == AUTH_FILE) {
+ die("-g option is incompatible with -d or -f");
++ }
+ wantgroup = true;
+ break;
+ case 'd':
+- if (type != AUTH_NONE)
++ if (type != AUTH_NONE) {
+ die("only one of -s, -f, or -d allowed");
+- if (wantgroup)
++ }
++ if (wantgroup) {
+ die("-g option is incompatible with -d or -f");
++ }
+ type = AUTH_DBM;
+ filename = optarg;
+ break;
+ case 'f':
+- if (type != AUTH_NONE)
++ if (type != AUTH_NONE) {
+ die("only one of -s, -f, or -d allowed");
+- if (wantgroup)
++ }
++ if (wantgroup) {
+ die("-g option is incompatible with -d or -f");
++ }
+ type = AUTH_FILE;
+ filename = optarg;
+ break;
+ case 's':
+- if (type != AUTH_NONE)
++ if (type != AUTH_NONE) {
+ die("only one of -s, -f, or -d allowed");
++ }
+ type = AUTH_SHADOW;
+ break;
+ case 'u':
+@@ -319,12 +339,15 @@ main(int argc, char *argv[])
+ exit(1);
+ }
+ }
+- if (argc != optind)
+- die("extra arguments given");
+- if (authinfo != NULL && authinfo->username == NULL)
++ if (argc != optind) {
++ die("extra arguments given");
++ }
++ if (authinfo != NULL && authinfo->username == NULL) {
+ die("-u option is required if -p option is given");
+- if (authinfo != NULL && authinfo->password == NULL)
++ }
++ if (authinfo != NULL && authinfo->password == NULL) {
+ die("-p option is required if -u option is given");
++ }
+
+ // /* Unless a username or password was given on the command line, assume
+ // we're being run by nnrpd. */
+@@ -339,8 +362,9 @@ main(int argc, char *argv[])
+ switch (type) {
+ case AUTH_SHADOW:
+ password = password_shadow(authinfo->username);
+- if (password == NULL)
++ if (password == NULL) {
+ password = password_system(authinfo->username);
++ }
+ break;
+ // case AUTH_FILE:
+ // password = password_file(authinfo->username, filename);
+@@ -357,10 +381,12 @@ main(int argc, char *argv[])
+ break;
+ }
+
+- if (password == NULL)
++ if (password == NULL) {
+ die("user %s unknown", authinfo->username);
+- if (strcmp(password, crypt(authinfo->password, password)) != 0)
++ }
++ if (strcmp(password, crypt(authinfo->password, password)) != 0) {
+ die("invalid password for user %s", authinfo->username);
++ }
+
+ /* The password matched. */
+ output_user(authinfo->username, wantgroup);
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index 75d7e35b6..5e5f95dfa 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package smartcardauth (version R14.0.0)
+# spec file for package smartcardauth (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg smartcardauth
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -54,7 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: trinity-%{tde_pkg}-rpmlintrc
-Patch0: %{tde_pkg}-%{tde_version}.patch
+Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -137,7 +139,9 @@ in addition to the PKCS certificate functionality
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?rhel} != 6
%patch0 -p1 -b .ftbfs
+%endif
%__sed -i "Makefile" \
-e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g"
diff --git a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc b/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc
new file mode 100644
index 000000000..7dc0bac20
--- /dev/null
+++ b/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc
@@ -0,0 +1 @@
+setBadness('64bit-portability-issue', 0)
diff --git a/redhat/applications/smb4k/smb4k-14.0.0.spec b/redhat/applications/smb4k/smb4k-14.0.0.spec
index f6ccc55cd..1e0c28158 100644
--- a/redhat/applications/smb4k/smb4k-14.0.0.spec
+++ b/redhat/applications/smb4k/smb4k-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package smb4k (version R14.0.0)
+# spec file for package smb4k (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg smb4k
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
index 320c979a7..8f96695e8 100644
--- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
+++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package soundkonverter (version R14.0.0)
+# spec file for package soundkonverter (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg soundkonverter
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index 2a3803e9c..cde6fa645 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tde-guidance (version R14.0.0)
+# spec file for package tde-guidance (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tde-guidance
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -146,14 +148,14 @@ Requires: python
Requires: hwdata
%endif
-Requires: %{name}-backends = %{version}-%{release}
+Requires: %{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release}
# POWERMANAGER support (requires HAL)
#define with_powermanager 1
Obsoletes: trinity-tde-guidance-powermanager
-Obsoletes: trinity-guidance < %{version}-%{release}
-Provides: trinity-guidance = %{version}-%{release}
+Obsoletes: trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release}
%description
Guidance currently consists of four programs designed to help you
@@ -222,8 +224,8 @@ Requires: hwdata
%endif
Requires: python
-Obsoletes: trinity-guidance-backends < %{version}-%{release}
-Provides: trinity-guidance-backends = %{version}-%{release}
+Obsoletes: trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release}
%description backends
This package contains the platform neutral backends used in the
@@ -246,11 +248,11 @@ Guidance configuration tools.
%package powermanager
Group: Applications/Utilities
Summary: HAL based power manager applet [Trinity]
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: hal
-Obsoletes: trinity-guidance-powermanager < %{version}-%{release}
-Provides: trinity-guidance-powermanager = %{version}-%{release}
+Obsoletes: trinity-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-guidance-powermanager = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{tde_prefix}" == "/usr"
Conflicts: guidance-power-manager
diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec
index aa5751837..2e834c7b5 100644
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec
+++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tde-style-lipstik (version R14.0.0)
+# spec file for package tde-style-lipstik (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tde-style-lipstik
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
index 69489e27b..33b906cbb 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
+++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tde-style-qtcurve (version R14.0.0)
+# spec file for package tde-style-qtcurve (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tde-style-qtcurve
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
index b4190ad5e..eedbf2917 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tde-systemsettings (version R14.0.0)
+# spec file for package tde-systemsettings (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tde-systemsettings
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -55,14 +57,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kde-settings-laptops.directory
-Patch0: %{tde_pkg}-%{tde_version}.patch
+Patch0: %{tde_pkg}-14.0.0.patch
-Provides: trinity-kde-systemsettings = %{version}-%{release}
-Obsoletes: trinity-kde-systemsettings < %{version}-%{release}
-Provides: trinity-systemsettings = %{version}-%{release}
-Obsoletes: trinity-systemsettings < %{version}-%{release}
+Provides: trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-kde-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec
new file mode 100644
index 000000000..f4094752e
--- /dev/null
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.1.spec
@@ -0,0 +1,192 @@
+#
+# spec file for package tde-systemsettings (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+%define tde_pkg tde-systemsettings
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_sysconfdir %{_sysconfdir}/trinity
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.0svn20070312
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Easy to use control centre for TDE
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1: kde-settings-laptops.directory
+
+
+Provides: trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-kde-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+Requires: trinity-guidance
+
+
+%description
+System preferences is a replacement for the TDE
+Control Centre with an improved user interface.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+
+%configure \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ --sysconfdir=%{tde_sysconfdir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath \
+ --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-laptops.directory
+
+# Unwanted files
+%__rm -f %{buildroot}%{tde_datadir}/applications/tde/kcmfontinst.desktop
+%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory
+%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory
+
+%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop
+
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/audioencoding.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/defaultapplication.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_ss.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
+
+%postun
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
+
+%files
+%defattr(-,root,root,-)
+%doc README TODO
+%dir %{tde_sysconfdir}/xdg
+%dir %{tde_sysconfdir}/xdg/menus
+%dir %{tde_sysconfdir}/xdg/menus/applications-merged
+%{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu
+%{tde_sysconfdir}/xdg/menus/tde-system-settings.menu
+%{tde_bindir}/systemsettings
+%{tde_datadir}/applications/tde/audioencoding.desktop
+%{tde_datadir}/applications/tde/defaultapplication.desktop
+%{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop
+#%{tde_datadir}/applications/tde/laptop.desktop
+%{tde_datadir}/applications/tde/medianotifications.desktop
+%{tde_datadir}/applications/tde/systemsettings.desktop
+%{tde_datadir}/apps/systemsettings/
+%{tde_datadir}/config/systemsettingsrc
+%{tde_datadir}/desktop-directories/*.directory
+%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
+%{tde_tdedocdir}/HTML/en/systemsettings/
+
+
+%changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.0svn20070312-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
index 0154c60ef..3508548fa 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeio-apt (version R14.0.0)
+# spec file for package tdeio-apt (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeio-apt
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
index 014858e5c..902f012bb 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
+++ b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeio-ftps (version R14.0.0)
+# spec file for package tdeio-ftps (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeio-ftps
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
index 93d0a0ca4..7d4ac6cd7 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
+++ b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeio-locate (version R14.0.0)
+# spec file for package tdeio-locate (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeio-locate
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
index 8f44108ee..5699cdfd1 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
+++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeio-sword (version R14.0.0)
+# spec file for package tdeio-sword (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeio-sword
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
index ecf4a7cf1..4523faed9 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
+++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeio-umountwrapper (version R14.0.0)
+# spec file for package tdeio-umountwrapper (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeio-umountwrapper
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index 1695ecc6a..53039cc14 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdenetworkmanager (version R14.0.0)
+# spec file for package tdenetworkmanager (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdenetworkmanager
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 0c665ac3b..585a3253d 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdepowersave (version R14.0.0)
+# spec file for package tdepowersave (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdepowersave
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec
index 686aea156..8d2112031 100644
--- a/redhat/applications/tderadio/tderadio-14.0.0.spec
+++ b/redhat/applications/tderadio/tderadio-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tderadio (version R14.0.0)
+# spec file for package tderadio (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -21,7 +21,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tderadio
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tdesudo/tdesudo-14.0.0.spec b/redhat/applications/tdesudo/tdesudo-14.0.0.spec
index cec78c7e6..72829ad64 100644
--- a/redhat/applications/tdesudo/tdesudo-14.0.0.spec
+++ b/redhat/applications/tdesudo/tdesudo-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdesudo (version R14.0.0)
+# spec file for package tdesudo (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdesudo
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
index 10292e44e..b2fc61788 100644
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec
+++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdesvn (version R14.0.0)
+# spec file for package tdesvn (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdesvn
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -53,7 +55,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: %{tde_pkg}-%{tde_version}.patch
+Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -91,11 +93,11 @@ BuildRequires: libidn-devel
BuildRequires: gamin-devel
%endif
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: trinity-libsvnqt = %{version}-%{release}
+Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: trinity-kdesvn < %{version}-%{release}
-Provides: trinity-kdesvn = %{version}-%{release}
+Obsoletes: trinity-kdesvn < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-kdesvn = %{?epoch:%{epoch}:}%{version}-%{release}
%description
@@ -173,7 +175,7 @@ written in C++.
%package -n trinity-libsvnqt-devel
Group: Development/Libraries
-Requires: trinity-libsvnqt = %{version}-%{release}
+Requires: trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: qt-devel
Requires: subversion-devel
Summary: Qt wrapper library for subversion (development files) [Trinity]
@@ -194,10 +196,10 @@ Group: Development/Libraries
Conflicts: trinity-kdesdk-tdeio-plugins
Summary: subversion I/O slaves for Trinity
-Obsoletes: trinity-kdesvn-kio-plugins < %{version}-%{release}
-Provides: trinity-kdesvn-kio-plugins = %{version}-%{release}
-Obsoletes: trinity-tdesvn-kio-plugins < %{version}-%{release}
-Provides: trinity-tdesvn-kio-plugins = %{version}-%{release}
+Obsoletes: trinity-kdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-kdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-tdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-tdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
%description tdeio-plugins
This packages includes TDEIO slaves for svn, svn+file, svn+http,
diff --git a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
index f1db6fc0b..dd43dd4b2 100644
--- a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
+++ b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdmtheme (version R14.0.0)
+# spec file for package tdmtheme (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdmtheme
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 731363619..744397f36 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tellico (version R14.0.0)
+# spec file for package tellico (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tellico
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -98,8 +100,8 @@ BuildRequires: libv4l-devel
BuildRequires: %{_lib}v4l-devel
%endif
-Requires: %{name}-data = %{version}-%{release}
-Requires: %{name}-scripts = %{version}-%{release}
+Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
%description
diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork-14.0.0.spec
index 0618be62a..8ed36935a 100644
--- a/redhat/applications/tork/tork-14.0.0.spec
+++ b/redhat/applications/tork/tork-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tork (version R14.0.0)
+# spec file for package tork (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tork
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
index 8d98d69bf..020e104fb 100644
--- a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
+++ b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package twin-style-crystal (version R14.0.0)
+# spec file for package twin-style-crystal (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg twin-style-crystal
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
index 2ad812d24..535aa004a 100644
--- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec
+++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package wlassistant (version R14.0.0)
+# spec file for package wlassistant (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg wlassistant
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -53,7 +55,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: %{tde_pkg}-%{tde_version}.patch
+Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
diff --git a/redhat/applications/wlassistant/wlassistant-14.0.1.spec b/redhat/applications/wlassistant/wlassistant-14.0.1.spec
new file mode 100644
index 000000000..ff2c05226
--- /dev/null
+++ b/redhat/applications/wlassistant/wlassistant-14.0.1.spec
@@ -0,0 +1,206 @@
+#
+# spec file for package wlassistant (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+%define tde_pkg wlassistant
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.5.7
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: User friendly TDE frontend for wireless network connection
+Group: Applications/Utilities
+URL: http://wlassistant.sourceforge.net/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+
+BuildRequires: cmake libtool
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# Wireless support
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+BuildRequires: wireless-tools-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
+BuildRequires: %{_lib}iw29-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?suse_version}
+BuildRequires: wireless-tools
+%endif
+%if 0%{?suse_version} || 0%{?mgaversion} >= 3
+BuildRequires: libiw-devel
+%endif
+
+# IDN support
+BuildRequires: libidn-devel
+
+# GAMIN support
+# Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires: gamin-devel
+%endif
+# PYTHON support
+BuildRequires: python
+
+
+%description
+Wireless Assistant scans for wireless access points and displays link quality,
+encryption and other useful information. When user wants to connect to a
+network, Wireless Assistant opens up its wizards and guides the user through
+Wi-Fi settings. After a successful connection is made the settings are
+remembered so next time the user won't have to enter them again.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Shitty hack for RHEL4 ...
+if [ -d "/usr/X11R6" ]; then
+ export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ -DBUILD_ALL=on \
+ ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog VERSION
+%{tde_bindir}/wlassistant
+%{tde_tdeappdir}/wlassistant.desktop
+%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
+%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
+%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
+%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
+%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
+%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
+%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
+%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
+%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
+%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
+%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
+%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
+
+
+%changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.5.7-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/applications/yakuake/yakuake-14.0.0.spec b/redhat/applications/yakuake/yakuake-14.0.0.spec
index 675f5b48e..296367838 100644
--- a/redhat/applications/yakuake/yakuake-14.0.0.spec
+++ b/redhat/applications/yakuake/yakuake-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package yakuake (version R14.0.0)
+# spec file for package yakuake (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg yakuake
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin