From 53d4379affa81361ef87d212e9b4e4fb93ae76be Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Jun 16 2008 15:32:11 +0000 Subject: - Update to 3.0.11 - Create patch for a shared tinyxml. - Add support for hicolor icons. --- 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.spec b/filezilla.spec index d009f76..56c8a76 100644 --- a/filezilla.spec +++ b/filezilla.spec @@ -1,5 +1,5 @@ Name: filezilla -Version: 3.0.10 +Version: 3.0.11 Release: 1%{?dist} Summary: FileZilla FTP, FTPS and SFTP client @@ -7,10 +7,11 @@ Group: Applications/Internet License: GPLv2+ URL: http://filezilla-project.org/ Source0: http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2 +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 @@ -19,6 +20,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gnutls-devel >= 2.0.4 BuildRequires: libidn-devel +BuildRequires: tinyxml-devel >= 2.5.3 BuildRequires: wxGTK-devel >= 2.8.6 @@ -38,16 +40,16 @@ FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .system # Run autotools if needed -# sh autogen.sh +sh autogen.sh %build %configure \ --disable-static \ --enable-locales \ - --localedir=%{_datadir}/locale \ --disable-manualupdatecheck \ --disable-autoupdatecheck @@ -55,6 +57,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} @@ -66,6 +71,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 \ @@ -81,6 +94,18 @@ make check rm -rf $RPM_BUILD_ROOT +%post +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 +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 %defattr(-,root,root,-) @@ -89,12 +114,17 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_datadir}/filezilla/ %{_datadir}/applications/*%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/* %{_mandir}/man5/* %changelog +* 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. + * Wed May 21 2008 kwizart < kwizart at gmail.com > - 3.0.10-1 - Update to 3.0.10 diff --git a/sources b/sources index 2264522..9b791fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d453cef44a89e3448fc6790669a811f6 FileZilla_3.0.10_src.tar.bz2 +776e6eec6ee19b33b35fb55269da1e85 FileZilla_3.0.11_src.tar.bz2