RPM: merge redhat directory with master branch

2 files changed, 104 insertions, 46 deletions

diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch
new file mode 100644
index 000000000..f8e019e63
--- /dev/null
+++ b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch
@@ -0,0 +1,39 @@
+diff --git a/kftpgrabber/src/engine/ftpdirectoryparser.cpp b/kftpgrabber/src/engine/ftpdirectoryparser.cpp
+index 981d0b6..71e2cd2 100644
+--- a/kftpgrabber/src/engine/ftpdirectoryparser.cpp
++++ b/kftpgrabber/src/engine/ftpdirectoryparser.cpp
+@@ -421,6 +421,8 @@ bool FtpDirectoryParser::parseUnixPermissions(const TQString &permissions, Direc
+   if (permissions[9] == 't' || permissions[9] == 'T') p |= S_ISVTX;
+    
+    entry.setPermissions(p);
++
++  return(p);
+ }
+ 
+ bool FtpDirectoryParser::parseLine(const TQString &line, DirectoryEntry &entry)
+diff --git a/kftpgrabber/src/misc/desencryptor.cpp b/kftpgrabber/src/misc/desencryptor.cpp
+index 126fad7..fac681f 100644
+--- a/kftpgrabber/src/misc/desencryptor.cpp
++++ b/kftpgrabber/src/misc/desencryptor.cpp
+@@ -65,8 +65,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode)
+   char *o_message = (char*) malloc(8);
+   char *o_output = (char*) malloc(8);
+   
+-  memset(o_message, 0, 9);
+-  memset(o_output, 0, 9);
++  memset(o_message, 0, sizeof o_message);
++  memset(o_output, 0, sizeof o_output);
+   //out.resize(in.size() * 2);
+   
+   while (i < in.size()) {
+@@ -79,8 +79,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode)
+     i += 8;
+     
+     // Clear everything
+-    memset(o_message, 0, 9);
+-    memset(o_output, 0, 9);
++    memset(o_message, 0, sizeof o_message);
++    memset(o_output, 0, sizeof o_output);
+   }
+   
+   free(o_message);
diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
index 67d590624..75cb03836 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
+++ b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
@@ -1,47 +1,84 @@
-# 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
+#
+# spec file for package kftprgrabber (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
-
-# Default version for this component
 %define tde_pkg kftpgrabber
-%define tde_version 14.0.0
-
-
-# TDE specific building variables
+%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
 
-%define _docdir %{tde_docdir}
 
-Name:           trinity-%{tde_pkg}
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
 Version:        0.8.1
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary:        A FTP client for TDE.
-
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:        A FTP client for TDE
 Group:          Applications/Internet
-License:        GPLv2+
 URL:            http://www.kftp.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
+Patch0:			%{tde_pkg}-14.0.0.patch
 
 
-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:	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
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 
 %description
 KFTPgrabber is a graphical FTP client for the Trinity Desktop Environment. It
@@ -77,22 +114,26 @@ Requires: 	%{name} = %{version}-%{release}
 %{summary}
 
 
-%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}}
+%patch0 -p1 -b .orig
 
 %__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"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
 %build
 unset QTDIR QTINC QTDIR
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # Warning: --enable-final causes FTBFS
 %configure \
@@ -125,20 +166,6 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 %__rm -rf $RPM_BUILD_ROOT
 
 
-%post
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
-
-%postun
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
-
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog
@@ -154,10 +181,7 @@ done
 %{tde_tdelibdir}/kftpimportplugin_ncftp.la
 %{tde_tdelibdir}/kftpimportplugin_ncftp.so
 %{tde_tdeappdir}/kftpgrabber.desktop
-%{tde_datadir}/apps/kftpgrabber/commands.xml
-%{tde_datadir}/apps/kftpgrabber/kftpgrabber-bi-wizard.png
-%{tde_datadir}/apps/kftpgrabber/kftpgrabber-logo.png
-%{tde_datadir}/apps/kftpgrabber/kftpgrabberui.rc
+%{tde_datadir}/apps/kftpgrabber/
 %{tde_datadir}/config.kcfg/kftpgrabber.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kftpgrabber.png
 %{tde_datadir}/services/kftpimportplugin_filezilla3.desktop
@@ -170,14 +194,9 @@ done
 
 %files devel
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/kftpgrabber/kftpbookmarkimportplugin.h
+%{tde_tdeincludedir}/kftpgrabber/
 %{tde_libdir}/libkftpinterfaces.la
 %{tde_libdir}/libkftpinterfaces.so
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2
-- Initial release for TDE 14.0.0
-
-* Mon Apr 08 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.1-1
-- Initial release for TDE 3.5.13.2