RPM packaging: update kerberostray, kftpgrabber, kgtk_qt3, kile

4 files changed, 76 insertions, 335 deletions

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 a0f0eec9f..159372d2c 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
@@ -1,54 +1,96 @@
-# Default version for this component
-%define tde_pkg kgtk-qt3
+#
+# spec file for package kgtk-qt3 (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 kgtk-qt3
+%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_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:		Use TDE dialogs in Gtk apps
+Epoch:			%{tde_epoch}
 Version:		0.10.2
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:		Use TDE dialogs in Gtk apps
 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:	gettext
 
+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
+
+# GTK2 support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+BuildRequires:	gtk2-devel
+%else
+BuildRequires:	gtk+2.0-devel
+%endif
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
 
 %description
 This is an LD_PRELOAD hack that allows most GTK
@@ -60,10 +102,14 @@ with this TDE module/application.
 This package includes the kqt3-wrapper
 
 
-%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}}
@@ -73,10 +119,10 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
 
 
 %cmake \
@@ -131,5 +177,5 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
 %{tde_datadir}/kgtk/preload
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.2-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.10.2-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13-fix_libsuffix.patch b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13-fix_libsuffix.patch
deleted file mode 100644
index a8deaa551..000000000
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13-fix_libsuffix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kgtk-qt3/qt3/kqt3-wrapper.cmake.ORI	2012-08-08 22:30:14.598900960 +0200
-+++ kgtk-qt3/qt3/kqt3-wrapper.cmake	2012-08-08 22:30:39.661367613 +0200
-@@ -15,7 +15,7 @@
- app=`basename $0`
- 
- if [ "$app" = "kqt3-wrapper" ] ; then
--    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib/kgtk/libkqt3.so:$LD_PRELOAD "$@"
-+    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@/kgtk/libkqt3.so:$LD_PRELOAD "$@"
- else
-     dir=`dirname $0`
-     oldPath=$PATH
---- kgtk-qt3/gtk2/kgtk2-wrapper.cmake.ORI	2012-08-08 22:31:30.684286835 +0200
-+++ kgtk-qt3/gtk2/kgtk2-wrapper.cmake	2012-08-08 22:32:10.294452119 +0200
-@@ -19,7 +19,7 @@
- app=`basename $0`
- 
- if [ "$app" = "kgtk2-wrapper" ] ; then
--    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib/kgtk/libkgtk2.so:libnspr4.so:$LD_PRELOAD "$@"
-+    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@/kgtk/libkgtk2.so:libnspr4.so:$LD_PRELOAD "$@"
- else
-     dir=`dirname $0`
-     oldPath=$PATH
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec
deleted file mode 100644
index a0b4ae4bd..000000000
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define kdecomp kgtk-qt3
-
-# 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:	Use KDE dialogs in Gtk apps
-Version:	0.10.2
-Release:	4%{?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
-
-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
-This is an LD_PRELOAD hack that allows most GTK
-applications to use Trinity's file dialogs when run under Trinity.
-
-The Gtk file chooser functions have been overridden to communicate
-with this KDE module/application.
-
-This package includes the kqt3-wrapper
-
-
-%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 !
-find . -name CMakeLists.txt -exec sed -i {} \
-  -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \
-  -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \
-  -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \
-  \;
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -L${QTLIB} -lX11"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DBUILD_ALL=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# The "preload" file is used by "startkde" script
-%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
-echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
-
-%find_lang kgtk
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kgtk.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kdialogd-wrapper
-%{tde_bindir}/kdialogd3
-%{tde_bindir}/kgtk-wrapper
-%{tde_bindir}/kgtk2-wrapper
-%{tde_bindir}/kqt3-wrapper
-%{tde_libdir}/kgtk/libkgtk2.so
-%{tde_libdir}/kgtk/libkqt3.so
-%{tde_datadir}/kgtk/preload
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3
-- Add 'preload' file for startkde script
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec
deleted file mode 100644
index c15f8b933..000000000
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec
+++ /dev/null
@@ -1,138 +0,0 @@
-# Default version for this component
-%define kdecomp kgtk-qt3
-
-# 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:	Use KDE dialogs in Gtk apps
-Version:	0.10.2
-Release:	3%{?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
-
-# [kgtk-qt-engine] Fix libsuffix for 64 bits machines
-Patch1:		kgtk-qt3-3.5.13-fix_libsuffix.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-This is an LD_PRELOAD hack that allows most GTK
-applications to use Trinity's file dialogs when run under Trinity.
-
-The Gtk file chooser functions have been overridden to communicate
-with this KDE module/application.
-
-This package includes the kqt3-wrapper
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-find . -name CMakeLists.txt -exec sed -i {} \
-  -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \
-  -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \
-  -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \
-  \;
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -L${QTLIB} -lX11"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# The "preload" file is used by "startkde" script
-%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
-echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
-
-%find_lang kdialogd3
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kdialogd3.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kdialogd-wrapper
-%{tde_bindir}/kdialogd3
-%{tde_bindir}/kgtk-wrapper
-%{tde_bindir}/kgtk2-wrapper
-%{tde_bindir}/kqt3-wrapper
-%{tde_libdir}/kgtk/libkgtk2.so
-%{tde_libdir}/kgtk/libkqt3.so
-%{tde_datadir}/kgtk/preload
-
-%Changelog
-* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3
-- Add 'preload' file for startkde script
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16