From 91470526155cffbef28ebadbd28ef2cf80617c0c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Jul 03 2008 22:24:40 +0000 Subject: - Update to 3.0.11 - Create patch for a shared tinyxml. - Add support for hicolor icons. - Downgrade gnutls requirement (assuming a fixed version is used - see #451952 ). --- diff --git a/FileZilla_3.0.11-rc1-system.patch b/FileZilla_3.0.11-rc1-system.patch new file mode 100644 index 0000000..a23f62f --- /dev/null +++ b/FileZilla_3.0.11-rc1-system.patch @@ -0,0 +1,169 @@ +diff -up filezilla-3.0.11-rc1/configure.in.system filezilla-3.0.11-rc1/configure.in +--- filezilla-3.0.11-rc1/configure.in.system 2008-06-09 18:31:44.000000000 +0200 ++++ filezilla-3.0.11-rc1/configure.in 2008-06-12 23:30:33.000000000 +0200 +@@ -347,6 +347,24 @@ AH_BOTTOM([ + AC_SUBST(LIBGNUTLS_LIBS) + AC_SUBST(LIBGNUTLS_CFLAGS) + ++ # TinyXML ++ # ------ ++ ++AC_CHECK_LIB(tinyxml, main, ++ [ ++ AC_DEFINE(HAVE_LIBTINYXML, 1, [Define to 1 if you have the `tinyxml' library (-ltinyxml).]) ++ TINYXML_LIBS="-ltinyxml" ++ have_tinyxml="true" ++ ], ++ [ ++ TINYXML_LIBS="../tinyxml/libtinyxml.a" ++ have_tinyxml="false" ++ ] ++) ++ ++ AC_SUBST(TINYXML_LIBS) ++ AC_SUBST(TINYXML_CFLAGS) ++ + fi + + # Everything translation related +@@ -431,6 +449,7 @@ AM_CONDITIONAL(MAKENSISSCRIPT, [test "$m + AM_CONDITIONAL(USE_BINRELOC, test "$use_binreloc" = "yes") + AM_CONDITIONAL(ENABLE_PRECOMP, test "x$use_precomp" = "xyes") + AM_CONDITIONAL(HAS_CPPUNIT, [test "$has_cppunit" = "yes"]) ++AM_CONDITIONAL(HAVE_LIBTINYXML, [test x$have_tinyxml = xtrue]) + + AC_CONFIG_FILES(Makefile src/Makefile src/engine/Makefile src/tinyxml/Makefile + src/interface/Makefile src/interface/resources/Makefile src/include/Makefile +diff -up filezilla-3.0.11-rc1/src/Makefile.am.system filezilla-3.0.11-rc1/src/Makefile.am +--- filezilla-3.0.11-rc1/src/Makefile.am.system 2008-06-09 18:31:45.000000000 +0200 ++++ filezilla-3.0.11-rc1/src/Makefile.am 2008-06-12 23:39:08.000000000 +0200 +@@ -2,6 +2,13 @@ if MINGW + MAYBE_FZSHELLEXT = fzshellext + endif + +-SUBDIRS = include engine tinyxml interface putty $(MAYBE_FZSHELLEXT) . ++if HAVE_LIBTINYXML ++else ++ MAYBE_TINYXML = tinyxml ++endif ++ ++SUBDIRS = include engine $(MAYBE_TINYXML) interface putty $(MAYBE_FZSHELLEXT) . ++ ++ + + dist_noinst_DATA = FileZilla.sln +diff -up filezilla-3.0.11-rc1/src/interface/xmlfunctions.h.system filezilla-3.0.11-rc1/src/interface/xmlfunctions.h +--- filezilla-3.0.11-rc1/src/interface/xmlfunctions.h.system 2008-06-09 18:31:46.000000000 +0200 ++++ filezilla-3.0.11-rc1/src/interface/xmlfunctions.h 2008-06-12 23:30:33.000000000 +0200 +@@ -6,7 +6,11 @@ + #ifndef __XMLFUNCTIONS_H__ + #define __XMLFUNCTIONS_H__ + ++#ifdef HAVE_LIBTINYXML ++#include ++#else + #include "../tinyxml/tinyxml.h" ++#endif + + class CXmlFile + { +diff -up filezilla-3.0.11-rc1/src/interface/filter.cpp.system filezilla-3.0.11-rc1/src/interface/filter.cpp +--- filezilla-3.0.11-rc1/src/interface/filter.cpp.system 2008-06-09 18:31:46.000000000 +0200 ++++ filezilla-3.0.11-rc1/src/interface/filter.cpp 2008-06-12 23:30:33.000000000 +0200 +@@ -3,7 +3,11 @@ + #include "filteredit.h" + #include "ipcmutex.h" + #include "filezillaapp.h" ++#ifdef HAVE_LIBTINYXML ++#include ++#else + #include "../tinyxml/tinyxml.h" ++#endif + #include "xmlfunctions.h" + #include + #include "Mainfrm.h" +diff -up filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp.system filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp +--- filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp.system 2008-06-09 18:31:45.000000000 +0200 ++++ filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp 2008-06-12 23:30:33.000000000 +0200 +@@ -1,6 +1,10 @@ + #include "FileZilla.h" + #include "locale_initializer.h" ++#ifdef HAVE_LIBTINYXML ++#include ++#else + #include "../tinyxml/tinyxml.h" ++#endif + #include + #include + +diff -up filezilla-3.0.11-rc1/src/interface/sitemanager.cpp.system filezilla-3.0.11-rc1/src/interface/sitemanager.cpp +--- filezilla-3.0.11-rc1/src/interface/sitemanager.cpp.system 2008-06-09 18:31:45.000000000 +0200 ++++ filezilla-3.0.11-rc1/src/interface/sitemanager.cpp 2008-06-12 23:30:33.000000000 +0200 +@@ -1,7 +1,11 @@ + #include "FileZilla.h" + #include "sitemanager.h" + #include "Options.h" ++#ifdef HAVE_LIBTINYXML ++#include ++#else + #include "../tinyxml/tinyxml.h" ++#endif + #include "xmlfunctions.h" + #include "filezillaapp.h" + #include "ipcmutex.h" +diff -up filezilla-3.0.11-rc1/src/interface/Options.cpp.system filezilla-3.0.11-rc1/src/interface/Options.cpp +--- filezilla-3.0.11-rc1/src/interface/Options.cpp.system 2008-06-09 18:31:45.000000000 +0200 ++++ filezilla-3.0.11-rc1/src/interface/Options.cpp 2008-06-12 23:30:33.000000000 +0200 +@@ -1,6 +1,10 @@ + #include "FileZilla.h" + #include "Options.h" ++#ifdef HAVE_LIBTINYXML ++#include ++#else + #include "../tinyxml/tinyxml.h" ++#endif + #include "xmlfunctions.h" + #include "filezillaapp.h" + #include +diff -up filezilla-3.0.11-rc1/src/interface/Makefile.am.system filezilla-3.0.11-rc1/src/interface/Makefile.am +--- filezilla-3.0.11-rc1/src/interface/Makefile.am.system 2008-06-09 18:31:46.000000000 +0200 ++++ filezilla-3.0.11-rc1/src/interface/Makefile.am 2008-06-12 23:30:33.000000000 +0200 +@@ -184,7 +184,7 @@ filezilla_CXXFLAGS = $(WX_CXXFLAGS_ONLY) + filezilla_CFLAGS = $(WX_CFLAGS_ONLY) + + filezilla_LDFLAGS = ../engine/libengine.a +-filezilla_LDFLAGS += ../tinyxml/libtinyxml.a ++filezilla_LDFLAGS += $(TINYXML_LIBS) + filezilla_LDFLAGS += $(LIBGNUTLS_LIBS) + filezilla_LDFLAGS += $(WX_LIBS) + filezilla_LDFLAGS += $(RESOURCEFILE) +@@ -194,8 +194,12 @@ if MINGW + filezilla_LDFLAGS += -lole32 -luuid -lnetapi32 + endif + +-filezilla_DEPENDENCIES = ../engine/libengine.a \ +- ../tinyxml/libtinyxml.a ++filezilla_DEPENDENCIES = ../engine/libengine.a ++ ++if HAVE_LIBTINYXML ++else ++filezilla_DEPENDENCIES += $(TINYXML_LIBS) ++endif + + dist_noinst_DATA = interface.vcproj + +diff -up filezilla-3.0.11-rc1/src/interface/QueueView.cpp.system filezilla-3.0.11-rc1/src/interface/QueueView.cpp +--- filezilla-3.0.11-rc1/src/interface/QueueView.cpp.system 2008-06-09 18:31:45.000000000 +0200 ++++ filezilla-3.0.11-rc1/src/interface/QueueView.cpp 2008-06-12 23:30:33.000000000 +0200 +@@ -4,7 +4,11 @@ + #include "Options.h" + #include "StatusView.h" + #include "statuslinectrl.h" ++#ifdef HAVE_LIBTINYXML ++#include ++#else + #include "../tinyxml/tinyxml.h" ++#endif + #include "xmlfunctions.h" + #include "filezillaapp.h" + #include "ipcmutex.h" diff --git a/FileZilla_3.0.3-backport.patch b/FileZilla_3.0.3-backport.patch deleted file mode 100644 index 3e127bc..0000000 --- a/FileZilla_3.0.3-backport.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -up filezilla-3.0.2.1/src/engine/ControlSocket.h.backport filezilla-3.0.2.1/src/engine/ControlSocket.h ---- filezilla-3.0.2.1/src/engine/ControlSocket.h.backport 2007-10-17 20:22:27.000000000 +0200 -+++ filezilla-3.0.2.1/src/engine/ControlSocket.h 2007-11-07 16:00:18.000000000 +0100 -@@ -135,7 +135,7 @@ public: - wxString ConvToLocal(const char* buffer); - wxChar* ConvToLocalBuffer(const char* buffer); - wxChar* ConvToLocalBuffer(const char* buffer, wxMBConv& conv); -- wxCharBuffer ConvToServer(const wxString& str); -+ wxCharBuffer ConvToServer(const wxString& str, bool force_utf8 = false); - - // --- - // The following two functions control the timeout behaviour: -diff -up filezilla-3.0.2.1/src/engine/ControlSocket.cpp.backport filezilla-3.0.2.1/src/engine/ControlSocket.cpp ---- filezilla-3.0.2.1/src/engine/ControlSocket.cpp.backport 2007-10-17 20:22:27.000000000 +0200 -+++ filezilla-3.0.2.1/src/engine/ControlSocket.cpp 2007-11-07 16:00:18.000000000 +0100 -@@ -543,9 +543,9 @@ wxChar* CControlSocket::ConvToLocalBuffe - return res; - } - --wxCharBuffer CControlSocket::ConvToServer(const wxString& str) -+wxCharBuffer CControlSocket::ConvToServer(const wxString& str, bool force_utf8 /*=false*/) - { -- if (m_useUTF8) -+ if (m_useUTF8 || force_utf8) - { - #if wxUSE_UNICODE - wxCharBuffer buffer = wxConvUTF8.cWX2MB(str); -@@ -556,7 +556,7 @@ wxCharBuffer CControlSocket::ConvToServe - buffer = wxConvUTF8.cWC2MB(unicode); - #endif - -- if (buffer) -+ if (buffer || force_utf8) - return buffer; - } - -diff -up filezilla-3.0.2.1/src/engine/sftpcontrolsocket.cpp.backport filezilla-3.0.2.1/src/engine/sftpcontrolsocket.cpp ---- filezilla-3.0.2.1/src/engine/sftpcontrolsocket.cpp.backport 2007-11-07 16:00:18.000000000 +0100 -+++ filezilla-3.0.2.1/src/engine/sftpcontrolsocket.cpp 2007-11-07 16:00:18.000000000 +0100 -@@ -319,6 +319,19 @@ int CSftpControlSocket::Connect(const CS - LogMessage(Status, _("Connecting to %s:%d..."), server.GetHost().c_str(), server.GetPort()); - SetWait(true); - -+ delete m_pCSConv; -+ if (server.GetEncodingType() == ENCODING_CUSTOM) -+ { -+ m_pCSConv = new wxCSConv(server.GetCustomEncoding()); -+ m_useUTF8 = false; -+ } -+ else -+ { -+ m_pCSConv = 0; -+ m_useUTF8 = true; -+ } -+ -+ - if (m_pCurrentServer) - delete m_pCurrentServer; - m_pCurrentServer = new CServer(server); -@@ -577,9 +590,10 @@ bool CSftpControlSocket::Send(wxString c - return AddToStream(cmd); - } - --bool CSftpControlSocket::AddToStream(const wxString& cmd) -+bool CSftpControlSocket::AddToStream(const wxString& cmd, bool force_utf8 /*=false*/) - { -- const wxCharBuffer str = ConvToServer(cmd); -+ const wxCharBuffer str = ConvToServer(cmd, force_utf8); -+ - if (!m_pProcess) - return false; - -@@ -1537,24 +1551,42 @@ int CSftpControlSocket::FileTransferSend - InitTransferStatus(pData->remoteFileSize, pData->resume ? pData->localFileSize : 0, false); - cmd += _T("get "); - cmd += QuoteFilename(pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath)) + _T(" "); -- cmd += QuoteFilename(pData->localFile); -+ -+ wxString localFile = QuoteFilename(pData->localFile); -+ wxString logstr = cmd; -+ logstr += localFile; -+ LogMessageRaw(Command, logstr); -+ -+ if (!AddToStream(cmd) || !AddToStream(localFile + _T("\n"), true)) -+ { -+ ResetOperation(FZ_REPLY_ERROR); -+ return FZ_REPLY_ERROR; -+ } - } - else - { - InitTransferStatus(pData->localFileSize, pData->resume ? pData->remoteFileSize : 0, false); - cmd += _T("put "); -- cmd += QuoteFilename(pData->localFile) + _T(" "); -- cmd += QuoteFilename(pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath)); -+ -+ wxString logstr = cmd; -+ wxString localFile = QuoteFilename(pData->localFile) + _T(" "); -+ wxString remoteFile = QuoteFilename(pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath)); -+ -+ logstr += localFile; -+ logstr += remoteFile; -+ LogMessageRaw(Command, logstr); -+ -+ if (!AddToStream(cmd) || !AddToStream(localFile, true) || -+ !AddToStream(remoteFile + _T("\n"))) -+ { -+ ResetOperation(FZ_REPLY_ERROR); -+ return FZ_REPLY_ERROR; -+ } - } - SetTransferStatusStartTime(); - - pData->transferInitiated = true; -- if (!Send(cmd)) -- { -- ResetOperation(FZ_REPLY_ERROR); -- return FZ_REPLY_ERROR; -- } -- -+ - return FZ_REPLY_WOULDBLOCK; - } - -diff -up filezilla-3.0.2.1/src/engine/sftpcontrolsocket.h.backport filezilla-3.0.2.1/src/engine/sftpcontrolsocket.h ---- filezilla-3.0.2.1/src/engine/sftpcontrolsocket.h.backport 2007-10-17 20:22:27.000000000 +0200 -+++ filezilla-3.0.2.1/src/engine/sftpcontrolsocket.h 2007-11-07 16:00:18.000000000 +0100 -@@ -100,7 +100,7 @@ protected: - int RenameSend(int prevResult = FZ_REPLY_OK); - - bool Send(wxString cmd, const wxString& show = _T("")); -- bool AddToStream(const wxString& cmd); -+ bool AddToStream(const wxString& cmd, bool force_utf8 = false); - - virtual void OnRateAvailable(enum CRateLimiter::rate_direction direction); - void OnQuotaRequest(enum CRateLimiter::rate_direction direction); diff --git a/filezilla.spec b/filezilla.spec index 510dc4f..9fca7e7 100644 --- a/filezilla.spec +++ b/filezilla.spec @@ -1,30 +1,29 @@ Name: filezilla -Version: 3.0.2.1 -Release: 2%{?dist} +Version: 3.0.11 +Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client Group: Applications/Internet License: GPLv2+ -URL: http://filezilla.sourceforge.net/ +URL: http://filezilla-project.org/ Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2 -Patch0: FileZilla_3.0.3-backport.patch +Patch0: FileZilla_3.0.11-rc1-system.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Needed if autogen.sh is invoked -#BuildRequires: automake, autoconf, libtool +BuildRequires: automake, autoconf, libtool ## ## Needed if test program is build BuildRequires: cppunit-devel >= 1.10.2 ## BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: gnutls-devel >= 1.5.4 +BuildRequires: gnutls-devel >= 1.6.3 BuildRequires: libidn-devel -BuildRequires: wxGTK-devel >= 2.8.4 - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +BuildRequires: tinyxml-devel >= 2.5.3 +BuildRequires: wxGTK-devel >= 2.8.6 +Requires: gnutls >= 1.6.3-4 %description FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features. @@ -40,18 +39,20 @@ FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features. %prep -%setup -q -%patch0 -p1 -b .backport +%setup -q -n %{name}-%{version} +%patch0 -p1 -b .system + +# Downgrade gnutls requirement +sed -i -e 's/2.0.4/1.6.3/' configure.in # Run autotools if needed -# sh autogen.sh +sh autogen.sh %build %configure \ --disable-static \ --enable-locales \ - --localedir=%{_datadir}/locale \ --disable-manualupdatecheck \ --disable-autoupdatecheck @@ -59,6 +60,9 @@ FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features. ## that option enables the "check for updates" dialog to download ## new binaries from the official website. +# Remove the timyxml internal static lib to configure will not fails +#rm -rf src/tinyxml/ + make %{?_smp_mflags} @@ -70,6 +74,14 @@ mkdir -p __doc install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/docs/* __doc rm -rf $RPM_BUILD_ROOT%{_datadir}/filezilla/docs +for i in 16x16 32x32 48x48 ; do + mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps + ln -sf ../../../../%{name}/resources/${i}/%{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps/%{name}.png +done + +rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps + desktop-file-install --vendor "fedora" \ --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -79,18 +91,23 @@ desktop-file-install --vendor "fedora" \ %find_lang %{name} %check -pushd tests -make test -popd +make check %clean rm -rf $RPM_BUILD_ROOT + %post -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi || : %postun -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi || : %files -f %{name}.lang @@ -100,12 +117,62 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_bindir}/* %{_datadir}/filezilla/ %{_datadir}/applications/*%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_mandir}/man1/* +%{_mandir}/man5/* %changelog -* Wed Nov 7 2007 kwizart < kwizart at gmail.com > - 3.0.2.1-2 -- backport fixes from 3.0.3 +* Mon Jun 16 2008 kwizart < kwizart at gmail.com > - 3.0.11-1 +- Update to 3.0.11 +- Create patch for a shared tinyxml. +- Add support for hicolor icons. +- Downgrade gnutls requirement + (assuming a fixed version is used - see #451952 ). + +* Wed May 21 2008 kwizart < kwizart at gmail.com > - 3.0.10-1 +- Update to 3.0.10 + +* Wed May 7 2008 kwizart < kwizart at gmail.com > - 3.0.9.3-1 +- Update to 3.0.9.3 + +* Sat Apr 19 2008 kwizart < kwizart at gmail.com > - 3.0.9.2-1 +- Update to 3.0.9.2 + +* Mon Apr 7 2008 kwizart < kwizart at gmail.com > - 3.0.9.1-1 +- Update to 3.0.9.1 + +* Mon Apr 7 2008 kwizart < kwizart at gmail.com > - 3.0.9-1 +- Update to 3.0.9 + +* Mon Mar 31 2008 kwizart < kwizart at gmail.com > - 3.0.9-0.1.rc1 +- Update to 3.0.9-rc1 + +* Tue Mar 18 2008 kwizart < kwizart at gmail.com > - 3.0.8.1-1 +- Update to 3.0.8.1 +- Add patch for make check + +* Fri Mar 14 2008 kwizart < kwizart at gmail.com > - 3.0.8-1 +- Update to 3.0.8 + +* Fri Mar 7 2008 kwizart < kwizart at gmail.com > - 3.0.8-0.1.rc1 +- Update to 3.0.8-rc1 + +* Thu Feb 20 2008 kwizart < kwizart at gmail.com > - 3.0.7.1-1 +- Update to 3.0.7.1 + +* Thu Jan 31 2008 kwizart < kwizart at gmail.com > - 3.0.6-1 +- Update to 3.0.6 + +* Thu Jan 17 2008 kwizart < kwizart at gmail.com > - 3.0.5.2-1 +- Update to 3.0.5.2 +- Drop update desktop file in post and postun + +* Thu Jan 10 2008 kwizart < kwizart at gmail.com > - 3.0.4-1 +- Update to 3.0.4 + +* Wed Nov 7 2007 kwizart < kwizart at gmail.com > - 3.0.3-1 +- Update to 3.0.3 * Fri Oct 19 2007 kwizart < kwizart at gmail.com > - 3.0.2.1-1 - Update to 3.0.2.1 diff --git a/sources b/sources index f1409a3..9b791fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0182908d3091d19edc511b3a2a6b3e08 FileZilla_3.0.2.1_src.tar.bz2 +776e6eec6ee19b33b35fb55269da1e85 FileZilla_3.0.11_src.tar.bz2