From 0f89dea0ef020cc7c2d06da87516a13565b3a91b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Jul 25 2008 11:49:06 +0000 Subject: -Update to 3.1.0.1 --- diff --git a/.cvsignore b/.cvsignore index f97fcde..fa023ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -FileZilla_3.1.0-beta2_src.tar.bz2 +FileZilla_3.1.0.1_src.tar.bz2 diff --git a/FileZilla_3.0.11-rc1-system.patch b/FileZilla_3.0.11-rc1-system.patch deleted file mode 100644 index a23f62f..0000000 --- a/FileZilla_3.0.11-rc1-system.patch +++ /dev/null @@ -1,169 +0,0 @@ -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.1.0-socket.patch b/FileZilla_3.1.0-socket.patch deleted file mode 100644 index 9d16c09..0000000 --- a/FileZilla_3.1.0-socket.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up filezilla-3.1.0-beta2/tests/ipaddress.cpp.socket filezilla-3.1.0-beta2/tests/ipaddress.cpp ---- filezilla-3.1.0-beta2/tests/ipaddress.cpp.socket 2008-07-14 17:51:44.000000000 +0200 -+++ filezilla-3.1.0-beta2/tests/ipaddress.cpp 2008-07-14 17:52:08.000000000 +0200 -@@ -2,6 +2,7 @@ - #include "directorylistingparser.h" - #include - #include -+#include - - /* - * This testsuite asserts the correctness of the diff --git a/filezilla.spec b/filezilla.spec index 6d46e09..3476111 100644 --- a/filezilla.spec +++ b/filezilla.spec @@ -1,18 +1,16 @@ Name: filezilla -Version: 3.1.0 -Release: 0.1.beta2%{?dist} +Version: 3.1.0.1 +Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client Group: Applications/Internet License: GPLv2+ URL: http://filezilla-project.org/ -Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}-beta2_src.tar.bz2 -Patch0: FileZilla_3.0.11-rc1-system.patch -Patch1: FileZilla_3.1.0-socket.patch +Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2 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 @@ -40,14 +38,12 @@ FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features. %prep -%setup -q -n %{name}-%{version}-beta2 -%patch0 -p1 -b .system -%patch1 -p1 -b .socket +%setup -q -n %{name}-%{version} #sed -i -e 's/2.0.4/1.6.3/' configure.in # Run autotools if needed -sh autogen.sh +# sh autogen.sh %build @@ -55,6 +51,7 @@ sh autogen.sh --disable-static \ --enable-locales \ --disable-manualupdatecheck \ + --with-tinyxml=system \ --disable-autoupdatecheck ## Do not use --enable-buildtype=official @@ -68,13 +65,9 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT __doc +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" -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 \ @@ -114,7 +107,7 @@ fi || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS -%doc __doc/* +%doc %{_datadir}/%{name}/docs/* %{_bindir}/* %{_datadir}/filezilla/ %{_datadir}/applications/*%{name}.desktop @@ -124,15 +117,15 @@ fi || : %changelog +* Fri Jul 25 2008 kwizart < kwizart at gmail.com > - 3.1.0.1-1 +- Update to 3.1.0.1 + * Mon Jul 14 2008 kwizart < kwizart at gmail.com > - 3.1.0-0.1.beta2 - Update to 3.1.0-beta2 * Tue Jul 8 2008 kwizart < kwizart at gmail.com > - 3.0.11.1-1 - Update to 3.0.11.1 -* Wed Jun 25 2008 Tomas Mraz - 3.0.11-2 -- rebuild with new gnutls - * Mon Jun 16 2008 kwizart < kwizart at gmail.com > - 3.0.11-1 - Update to 3.0.11 - Create patch for a shared tinyxml. diff --git a/sources b/sources index a9d08aa..06048e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0be04004b138a80f7a4d94bfd82cb69d FileZilla_3.1.0-beta2_src.tar.bz2 +45a28bac466bd8f2eb1a97dfeb3ea8b3 FileZilla_3.1.0.1_src.tar.bz2