RPM packaging: update kbarcode, kbfx, kbibtex, kbiff

14 files changed, 284 insertions, 877 deletions

diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
index 5f122bd1a..7e29f4616 100644
--- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec
+++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
@@ -1,56 +1,84 @@
-# Default version for this component
-%define tde_pkg kbarcode
+#
+# spec file for package kbarcode (version R14.0.0)
+#
+# 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
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg kbarcode
+%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_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
-##########
 
 Name:			trinity-%{tde_pkg}
-Summary:		barcode and label printing application for Trinity
+Epoch:			%{tde_epoch}
 Version:		2.0.7
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
+Summary:		barcode and label printing application for Trinity
 Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
 URL:			http://www.kbarcode.net
 
-Prefix:			%{tde_prefix}
+%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-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
+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
+
+# PCRE support
+BuildRequires:	pcre-devel
+
 Requires:		%{name}-tdefile-plugin = %{version}-%{release}
 
 
@@ -119,7 +147,7 @@ Group:			Applications/Utilities
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -164,9 +192,18 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-
 %find_lang %{tde_pkg}
 
+# Fix invalid icon path
+%__sed -i "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" -e "s|Icon=.*|Icon=kbarcode|"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kbarcode        Utility PrintingUtility
+%suse_update_desktop_file -r kbarcode-batch  Utility PrintingUtility
+%suse_update_desktop_file -r kbarcode-editor Utility PrintingUtility
+%suse_update_desktop_file -r kbarcode-single Utility PrintingUtility
+%endif
 
 
 %clean
@@ -174,5 +211,5 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.0.7-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch
deleted file mode 100644
index e779aa994..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 14ba7d8af6ef7248dcd3eb85ae977950d1758600
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336066403 -0500
-
-    Fix 'format not a string literal' error
-
-diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp
-index 26e59da..6b07a7b 100644
---- a/kbarcode/csvimportdlg.cpp
-+++ b/kbarcode/csvimportdlg.cpp
-@@ -334,7 +334,6 @@ void CSVImportDlg::accept()
-     TQValueList<int> headers;
-     TQStringList list;
-     TQString name = getDatabaseName();
--    int i = 0;
- 
-     TQString q = "INSERT INTO " + name + " (";
-     for( int c = 0; c < table->horizontalHeader()->count(); c++ ) {
-@@ -375,7 +374,7 @@ void CSVImportDlg::accept()
- 
-         TQSqlQuery query;
-         if( !query.exec( line ) )
--            qDebug( i18n("Could not import the following line:") + line );
-+            qDebug( "%s", i18n("Could not import the following line:") + line );
-             //KMessageBox::error( this, i18n("Could not import the following line:") + line );
-     }
- 
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch
deleted file mode 100644
index 87328eb06..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 62777d2782c7fa738eb047eff175785fc2cd24ff
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336091409 -0500
-
-    Fix FTBFS
-
-diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp
-index 6b07a7b..b5c6efa 100644
---- a/kbarcode/csvimportdlg.cpp
-+++ b/kbarcode/csvimportdlg.cpp
-@@ -374,7 +374,7 @@ void CSVImportDlg::accept()
- 
-         TQSqlQuery query;
-         if( !query.exec( line ) )
--            qDebug( "%s", i18n("Could not import the following line:") + line );
-+            qDebug( "%s", (i18n("Could not import the following line:") + line).ascii() );
-             //KMessageBox::error( this, i18n("Could not import the following line:") + line );
-     }
- 
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch
deleted file mode 100644
index de445db7f..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit b8dc3f5795c618c3617302973fff7d7bbf0ead2d
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336099921 -0500
-
-    Fix remaining string format errors
-
-diff --git a/kbarcode/pixmapbarcode.cpp b/kbarcode/pixmapbarcode.cpp
-index 02cb19b..4768b3e 100644
---- a/kbarcode/pixmapbarcode.cpp
-+++ b/kbarcode/pixmapbarcode.cpp
-@@ -178,7 +178,7 @@ bool PixmapBarcode::createPixmap( TQPixmap* target, int resx, int resy )
-         cmd += input->name();
- 	cmd += " -sNOPAUSE -q - -c showpage quit";
- 	
--        qDebug("cmd: " + cmd );
-+        qDebug("cmd: %s", cmd.ascii() );
- 	gs_pipe = popen( cmd.latin1(), "w" );
-         if( !gs_pipe )
- 	{
-diff --git a/kbarcode/tbarcode2.cpp b/kbarcode/tbarcode2.cpp
-index 8490f7c..95cc64f 100644
---- a/kbarcode/tbarcode2.cpp
-+++ b/kbarcode/tbarcode2.cpp
-@@ -122,7 +122,7 @@ bool TBarcode2::createPostscript( char** postscript, long* postscript_size )
-                        tbarcode->height(),
-                        tbarcode->checksum() );
- 
--    qDebug( "Cmd = " + cmd );
-+    qDebug( "Cmd = %s", cmd.ascii() );
-     if( !readFromPipe( cmd.latin1(), postscript, postscript_size ) )
-         return false;
- 
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec
deleted file mode 100644
index eb1805d37..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec
+++ /dev/null
@@ -1,160 +0,0 @@
-# Default version for this component
-%define kdecomp kbarcode
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	barcode and label printing application for Trinity
-Version:	2.0.6
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.kbarcode.net
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KBarcode is a barcode and label printing application for Trinity. It can be used
-to print everything from simple business cards up to complex labels with
-several barcodes (e.g. article descriptions).
-
-KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard,
-batch import of data for batch printing labels (directly from the delivery
-note), thousands of predefined labels, database management tools and
-translations in many languages. Even printing more than 10.000 labels in one
-go is no problem for KBarcode. Data for printing can be imported from several
-different data sources, including SQL databases, CSV files and the KDE address
-book.
-
-Additionally it is a simple barcode generator (similar to the old xbarcode you
-might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are
-supported. Even complex 2D barcodes are supported using third party tools. The
-generated barcodes can be directly printed or you can export them into images
-to use them in another application.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%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 %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kbarcode
-%{tde_tdelibdir}/kfile_kbarcode.la
-%{tde_tdelibdir}/kfile_kbarcode.so
-%{tde_tdeappdir}/kbarcode-batch.desktop
-%{tde_tdeappdir}/kbarcode-editor.desktop
-%{tde_tdeappdir}/kbarcode-label.desktop
-%{tde_tdeappdir}/kbarcode-single.desktop
-%{tde_tdeappdir}/kbarcode.desktop
-%{tde_datadir}/apps/kbarcode/
-%{tde_datadir}/icons/hicolor/*/actions/barcode.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
-%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
-%{tde_datadir}/services/kfile_kbarcode.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.6-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.spec
deleted file mode 100644
index 287fea1b6..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13.spec
+++ /dev/null
@@ -1,161 +0,0 @@
-# Default version for this component
-%define kdecomp kbarcode
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	barcode and label printing application for Trinity
-Version:	2.0.6
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.kbarcode.net
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kbarcode] Fix 'format not a string literal' error [Commit #14ba7d8a]
-Patch1:		kbarcode-3.5.13-fix_format_not_a_string_literal.patch
-# [kbarcode] Fix FTBFS [Commit #62777d27]
-Patch2:		kbarcode-3.5.13-fix_ftbfs.patch
-# [kbarcode] Fix remaining string format errors [Commit #b8dc3f57]
-Patch3:		kbarcode-3.5.13-fix_remaining_string_literal.patch
-
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KBarcode is a barcode and label printing application for Trinity. It can be used
-to print everything from simple business cards up to complex labels with
-several barcodes (e.g. article descriptions).
-
-KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard,
-batch import of data for batch printing labels (directly from the delivery
-note), thousands of predefined labels, database management tools and
-translations in many languages. Even printing more than 10.000 labels in one
-go is no problem for KBarcode. Data for printing can be imported from several
-different data sources, including SQL databases, CSV files and the KDE address
-book.
-
-Additionally it is a simple barcode generator (similar to the old xbarcode you
-might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are
-supported. Even complex 2D barcodes are supported using third party tools. The
-generated barcodes can be directly printed or you can export them into images
-to use them in another application.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-extra-includes=%{_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%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 %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kbarcode
-%{tde_tdelibdir}/kfile_kbarcode.la
-%{tde_tdelibdir}/kfile_kbarcode.so
-%{tde_tdeappdir}/kbarcode-batch.desktop
-%{tde_tdeappdir}/kbarcode-editor.desktop
-%{tde_tdeappdir}/kbarcode-label.desktop
-%{tde_tdeappdir}/kbarcode-single.desktop
-%{tde_tdeappdir}/kbarcode.desktop
-%{tde_datadir}/apps/kbarcode/
-%{tde_datadir}/icons/hicolor/*/actions/barcode.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
-%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
-%{tde_datadir}/services/kfile_kbarcode.desktop
-
-
-%Changelog
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec
index 6721d1cc6..11c948ac8 100644
--- a/redhat/applications/kbfx/kbfx-14.0.0.spec
+++ b/redhat/applications/kbfx/kbfx-14.0.0.spec
@@ -1,53 +1,92 @@
-# Default version for this component
-%define tde_pkg kbfx
+#
+# spec file for package kbfx (version R14.0.0)
+#
+# 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
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg kbfx
+%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_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
 Name:			trinity-%{tde_pkg}
-Summary:		an alternative to K-Menu for TDE [Trinity]
+Epoch:			%{tde_epoch}
 Version:		0.4.9.3.1
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:		an alternative to K-Menu for TDE [Trinity]
 Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
 URL:			http://www.trinitydesktop.org/
 
-Prefix:			%{tde_prefix}
+%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-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	cmake libtool
+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
+
+# 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
+
+# PCRE support
+BuildRequires:	pcre-devel
+
 
 %description
 KBFX is an alternative to the classical K-Menu button and its menu.
@@ -60,10 +99,14 @@ bar a try.
 Homepage: http://www.kbfx.org
 
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -123,6 +166,16 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build VERBOSE=1
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "KBFX Configuration Utility" kbfxconfigapp -r KDE Utility DesktopUtility
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/applications/tde/kbfx_theme.desktop
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -145,6 +198,8 @@ update-desktop-database %{tde_appdir} &> /dev/null
 %defattr(-,root,root,-)
 %{tde_bindir}/kbfxconfigapp
 %{tde_tdeincludedir}/kbfx/
+%dir %{tde_libdir}/kbfx
+%dir %{tde_libdir}/kbfx/plugins
 %{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la
 %{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so
 %{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la
@@ -161,7 +216,8 @@ update-desktop-database %{tde_appdir} &> /dev/null
 %{tde_tdelibdir}/kbfxspinx.so
 %{tde_tdeappdir}/kbfx_theme.desktop
 %{tde_tdeappdir}/kbfxconfigapp.desktop
-%{tde_datadir}/apps/kbfx/skins/*/*
+%{tde_datadir}/apps/kbfx/
+%dir %{tde_datadir}/apps/kbfxconfigapp
 %{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
 %{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
@@ -178,5 +234,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.4.9.3.1-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch b/redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch
deleted file mode 100644
index 43ec3a0ed..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- kbfx/doc/CMakeLists.txt.ORI	2012-08-04 18:33:25.916251160 +0200
-+++ kbfx/doc/CMakeLists.txt	2012-08-04 18:33:49.658779402 +0200
-@@ -14,4 +14,4 @@
- 	)
- 
- INSTALL(FILES ${DOCFILES}
--    DESTINATION ${SHARE_INSTALL_PREFIX}/doc/kbfx)
-+	DESTINATION ${DOC_INSTALL_DIR}/kbfx)
diff --git a/redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch b/redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch
deleted file mode 100644
index ac20238f7..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- kbfx/plugins/applications/CMakeLists.txt.ORI	2012-08-04 18:24:43.221636976 +0200
-+++ kbfx/plugins/applications/CMakeLists.txt	2012-08-04 18:26:32.602463608 +0200
-@@ -21,6 +21,7 @@
- 	    ${KDE3_UI_LIBRARY}
- 	    ${KDE3_KHTML_LIBRARY}
- 	    ${M_LIBRARY}
-+	    ${KDE3_DCOP_LIBRARY}
- 	    )
- 
- 	KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatastub ${LIB_INSTALL_DIR}/kbfx/plugins)
---- kbfx/plugins/settings/CMakeLists.txt.ORI	2012-08-04 18:28:43.968853387 +0200
-+++ kbfx/plugins/settings/CMakeLists.txt	2012-08-04 18:29:10.408328041 +0200
-@@ -21,6 +21,7 @@
- 	    ${KDE3_UI_LIBRARY}
- 	    ${KDE3_KHTML_LIBRARY}
- 	    ${M_LIBRARY}
-+	    ${KDE3_DCOP_LIBRARY}
- 	    )
- 
- 	KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatasettings ${LIB_INSTALL_DIR}/kbfx/plugins)
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.1-fix_install_directories.patch b/redhat/applications/kbfx/kbfx-3.5.13.1-fix_install_directories.patch
deleted file mode 100644
index 93d0a406e..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13.1-fix_install_directories.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kbfx-3.5.13.1/doc/CMakeLists.txt.dir	2012-07-05 19:59:27.000000000 +0200
-+++ kbfx-3.5.13.1/doc/CMakeLists.txt	2012-10-03 22:55:59.145960716 +0200
-@@ -13,5 +13,8 @@
- #	TODO
- 	)
- 
-+#add_subdirectory( common )
-+#add_subdirectory( en )
-+
- INSTALL(FILES ${DOCFILES}
--    DESTINATION ${SHARE_INSTALL_PREFIX}/doc/kbfx)
-+	DESTINATION ${DOC_INSTALL_DIR}/kbfx)
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.1.spec b/redhat/applications/kbfx/kbfx-3.5.13.1.spec
deleted file mode 100644
index c6eb49dab..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13.1.spec
+++ /dev/null
@@ -1,169 +0,0 @@
-# Default version for this component
-%define kdecomp kbfx
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	an alternative to K-Menu for KDE [Trinity]
-Version:	0.4.9.3.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [kbfx] Some files are installed in wrong directories ...
-Patch2:		kbfx-3.5.13.1-fix_install_directories.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-%description
-KBFX is an alternative to the classical K-Menu button and its menu.
-It improves the user experience by enabling him to set a bigger (and thus more
-visible) start button and by finally replacing the Win95-like K-Menu.
-If you still want the old menu, because you're used to it, it is still
-available as an option in kbfx. We recommend, however, that you give the Spinx
-bar a try.
-
-Homepage: http://www.kbfx.org
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch2 -p1 -b .dir
-
-# Fix TDE executable path in 'CMakeLists.txt' ...
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \
-  -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|"
-  
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}:%{tde_includedir}/tqt"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
-  -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
-  -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DUSE_STRIGI=OFF \
-  -DUSE_MENUDRAKE=OFF \
-  -DBUILD_DOC=ON \
-  -DBUILD_ALL=OFF \
-  ..
-
-# Not SMP safe !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build VERBOSE=1
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kbfxconfigapp
-%{tde_tdeincludedir}/kbfx/
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so
-%{tde_libdir}/libkbfxcommon.la
-%{tde_libdir}/libkbfxcommon.so
-%{tde_libdir}/libkbfxdata.la
-%{tde_libdir}/libkbfxdata.so
-%{tde_tdelibdir}/kbfxspinx.la
-%{tde_tdelibdir}/kbfxspinx.so
-%{tde_tdeappdir}/kbfx_theme.desktop
-%{tde_tdeappdir}/kbfxconfigapp.desktop
-%{tde_datadir}/apps/kbfx/skins/*/*
-%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
-%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg
-#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/
-%{tde_tdedocdir}/kbfx/
-%{tde_datadir}/icons/hicolor/*/apps/kbfx.png
-%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
-#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo
-%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-2
-- Initial release for TDE 3.5.13.1
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.spec b/redhat/applications/kbfx/kbfx-3.5.13.spec
deleted file mode 100644
index 47b4831e0..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13.spec
+++ /dev/null
@@ -1,165 +0,0 @@
-# Default version for this component
-%define kdecomp kbfx
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	an alternative to K-Menu for KDE [Trinity]
-Version:	0.4.9.3.1
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kbfx] Missing LDFLAGS cause FTBFS on Mageia 2 and Mandriva 2011
-Patch1:		kbfx-3.5.13-missing_ldflags.patch
-# [kbfx] Some files are installed in wrong directories ...
-Patch2:		kbfx-3.5.13-fix_install_directories.patch
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-KBFX is an alternative to the classical K-Menu button and its menu.
-It improves the user experience by enabling him to set a bigger (and thus more
-visible) start button and by finally replacing the Win95-like K-Menu.
-If you still want the old menu, because you're used to it, it is still
-available as an option in kbfx. We recommend, however, that you give the Spinx
-bar a try.
-
-Homepage: http://www.kbfx.org
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1 -b .ldflags
-%patch2 -p1 -b .dir
-
-# Fix TDE executable path in 'CMakeLists.txt' ...
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \
-  -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|"
-  
-# Prevents hardcoded TDE directories ...
-%__sed -i "cmakemodules/FindKdeLibs.cmake" \
-  -e "s|^\(set(HTML_INSTALL_DIR.*\)|#\1|" \
-  -e "s|^\(set(INCLUDE_INSTALL_DIR.*\)|#\1|"
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}:%{tde_includedir}/tqt"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
-  -DHTML_INSTALL_DIR=%{tde_tdedocdir}/HTML \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DUSE_STRIGI=OFF \
-  -DUSE_MENUDRAKE=OFF \
-  -DUSE_KDE4=OFF \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build VERBOSE=1
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kbfxconfigapp
-%{tde_tdeincludedir}/kbfx/
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so
-%{tde_libdir}/libkbfxcommon.la
-%{tde_libdir}/libkbfxcommon.so
-%{tde_libdir}/libkbfxdata.la
-%{tde_libdir}/libkbfxdata.so
-%{tde_tdelibdir}/libkbfxspinx.la
-%{tde_tdelibdir}/libkbfxspinx.so
-%{tde_tdeappdir}/kbfx_theme.desktop
-%{tde_tdeappdir}/kbfxconfigapp.desktop
-%{tde_datadir}/apps/kbfx/skins/*/*
-%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
-%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg
-%{tde_tdedocdir}/HTML/en/kbfxconfigapp/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/kbfxconfigapp/index.docbook
-%{tde_tdedocdir}/kbfx/
-%{tde_datadir}/icons/hicolor/*/apps/kbfx.png
-%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
-%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo
-%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
-
-
-%Changelog
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbibtex/kbibtex-14.0.0.spec b/redhat/applications/kbibtex/kbibtex-14.0.0.spec
index f5d20b725..c12fc7dd3 100644
--- a/redhat/applications/kbibtex/kbibtex-14.0.0.spec
+++ b/redhat/applications/kbibtex/kbibtex-14.0.0.spec
@@ -1,55 +1,96 @@
-# Default version for this component
-%define tde_pkg kbibtex
+#
+# spec file for package kbibtex (version R14.0.0)
+#
+# 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
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg kbibtex
+%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
 
-%define _docdir %{tde_docdir}
 
-Name:           trinity-kbibtex
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
 Version:        0.2.3
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:        A BibTeX editor for TDE
-
 Group:          Applications/Internet
-License:        GPLv2+
 URL:            http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download.html
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%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-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
+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
+
+# XSLT support
+BuildRequires:	libxslt-devel
+
+
 %description
 KBibTeX is a BibTeX editor for TDE to edit bibliographies used with LaTeX.
 KBibTeX is released under the GNU Public License (GPL) version 2 or any later version.
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
@@ -61,7 +102,6 @@ KBibTeX is released under the GNU Public License (GPL) version 2 or any later
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # Warning: --enable-final causes FTBFS
 %configure \
@@ -93,6 +133,11 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Bibliography Manager" kbibtex TDE Office Database
+%endif
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -121,7 +166,9 @@ update-desktop-database %{tde_tdeappdir} > /dev/null
 %{tde_tdelibdir}/libkbibtexpart.so
 %{tde_tdeappdir}/kbibtex.desktop
 %{tde_datadir}/apps/kbibtex/
+%dir %{tde_datadir}/apps/kbibtexpart
 %{tde_datadir}/apps/kbibtexpart/kbibtex_part.rc
+%dir %{tde_datadir}/apps/kbibtexpart/xslt
 %{tde_datadir}/apps/kbibtexpart/xslt/MARC21slim2MODS3.xsl
 %{tde_datadir}/apps/kbibtexpart/xslt/MARC21slimUtils.xsl
 %{tde_datadir}/apps/kbibtexpart/xslt/UNIMARC2MODS3.xsl
@@ -133,8 +180,5 @@ update-desktop-database %{tde_tdeappdir} > /dev/null
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.3-2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.2.3-1
 - Initial release for TDE 14.0.0
-
-* Fri Mar 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.3-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec
index ac1633c80..11d058e37 100644
--- a/redhat/applications/kbiff/kbiff-14.0.0.spec
+++ b/redhat/applications/kbiff/kbiff-14.0.0.spec
@@ -1,50 +1,82 @@
-# Default version for this component
-%define tde_pkg kbiff
+#
+# spec file for package kbiff (version R14.0.0)
+#
+# 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
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg kbiff
+%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
 
-%define _docdir %{tde_docdir}
-
 
-Name:           trinity-%{tde_pkg}
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
 Version:        3.9
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:        TDE mail notification utility 
-
 Group:          Applications/Internet
-License:        GPLv2+
 URL:            http://www.trinitydesktop.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%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:	tqt3-compat-headers >= 3.5.0
-BuildRequires:	libtqt4-devel >= 2:4.2.0
-BuildRequires:	trinity-arts-devel >= 2:1.5.10
 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
+
+# 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
+
+
 %description
 Kbiff is a "xbiff"-like mail notification utility. It has  multiple pixmaps,
 session management, and GUI configuration.  It can "dock" into the TDE panel.
@@ -52,10 +84,14 @@ It can display animated gifs, play system sounds, or run arbitrary shell
 command when new mail arrives. It supports mbox, maildir, mh, POP3, IMAP4, and
 NNTP mailboxes.
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
@@ -94,6 +130,16 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Fix icon location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Internet/kbiff.desktop" "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
+%suse_update_desktop_file kbiff Applet
+%endif
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -121,7 +167,7 @@ done
 %{tde_libdir}/libtdeinit_kbiff.so
 %{tde_tdelibdir}/kbiff.la
 %{tde_tdelibdir}/kbiff.so
-%{tde_datadir}/applnk/Internet/kbiff.desktop
+%{tde_tdeappdir}/kbiff.desktop
 %{tde_datadir}/apps/kbiff/
 %{tde_datadir}/icons/hicolor/*/apps/kbiff.png
 %{tde_datadir}/icons/locolor/*/apps/kbiff.png
@@ -133,8 +179,5 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.9-2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:3.9-1
 - Initial release for TDE 14.0.0
-
-* Mon Apr 08 2013 Francois Andriot <francois.andriot@free.fr> - 3.9-1
-- Initial release for TDE 3.5.13.2