rpms/filezilla/F-8 FileZilla_3.0.11-rc1-system.patch, NONE, 1.1 sources, 1.4, 1.5 filezilla.spec, 1.4, 1.5 FileZilla_3.0.3-backport.patch, 1.1, NONE
Chauvet Nicolas (kwizart)
fedora-extras-commits at redhat.com
Thu Jul 3 22:25:31 UTC 2008
- Previous message (by thread): rpms/filezilla/F-9 FileZilla_3.0.11-rc1-system.patch, NONE, 1.1 filezilla.spec, 1.11, 1.12 sources, 1.11, 1.12
- Next message (by thread): rpms/minirpc/F-9 .cvsignore, 1.3, 1.4 minirpc.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kwizart
Update of /cvs/pkgs/rpms/filezilla/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16366
Modified Files:
sources filezilla.spec
Added Files:
FileZilla_3.0.11-rc1-system.patch
Removed Files:
FileZilla_3.0.3-backport.patch
Log Message:
- 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 ).
FileZilla_3.0.11-rc1-system.patch:
--- NEW FILE FileZilla_3.0.11-rc1-system.patch ---
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 <tinyxml.h>
+#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 <tinyxml.h>
+#else
#include "../tinyxml/tinyxml.h"
+#endif
#include "xmlfunctions.h"
#include <wx/regex.h>
#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 <tinyxml.h>
+#else
#include "../tinyxml/tinyxml.h"
+#endif
#include <string>
#include <locale.h>
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 <tinyxml.h>
+#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 <tinyxml.h>
+#else
#include "../tinyxml/tinyxml.h"
+#endif
#include "xmlfunctions.h"
#include "filezillaapp.h"
#include <wx/tokenzr.h>
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 <tinyxml.h>
+#else
#include "../tinyxml/tinyxml.h"
+#endif
#include "xmlfunctions.h"
#include "filezillaapp.h"
#include "ipcmutex.h"
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 19 Oct 2007 19:30:57 -0000 1.4
+++ sources 3 Jul 2008 22:24:40 -0000 1.5
@@ -1 +1 @@
-0182908d3091d19edc511b3a2a6b3e08 FileZilla_3.0.2.1_src.tar.bz2
+776e6eec6ee19b33b35fb55269da1e85 FileZilla_3.0.11_src.tar.bz2
Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-8/filezilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- filezilla.spec 7 Nov 2007 15:05:48 -0000 1.4
+++ filezilla.spec 3 Jul 2008 22:24:40 -0000 1.5
@@ -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 @@
%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 @@
## 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 @@
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 @@
%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 @@
%{_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
--- FileZilla_3.0.3-backport.patch DELETED ---
- Previous message (by thread): rpms/filezilla/F-9 FileZilla_3.0.11-rc1-system.patch, NONE, 1.1 filezilla.spec, 1.11, 1.12 sources, 1.11, 1.12
- Next message (by thread): rpms/minirpc/F-9 .cvsignore, 1.3, 1.4 minirpc.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list