X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=FileZilla.spec;h=1bebda8b6bab2dfbfa5cda90fa300b41604cd54e;hb=78254bbe97f40a3d8dea078ff4a9734b4d0e4b9b;hp=ca119465f013ca8cc336df430f46523d7282795f;hpb=774cc049ec8e6428ff9005256e7c5aa3c8b2011f;p=packages%2FFileZilla.git

diff --git a/FileZilla.spec b/FileZilla.spec
index ca11946..1bebda8 100644
--- a/FileZilla.spec
+++ b/FileZilla.spec
@@ -1,7 +1,4 @@
-# TODO
-# - /usr/share/locale/ca_ES@valencia is needed by FileZilla-3.0.5.2-1.i686
-#   (there is probably ca_ES@valencia locale in Debian glibc - merge it)
-#   Temporary removed locale...
+%define		libfilezillaver	0.13.0
 Summary:	FTP client for X Window
 Summary(es.UTF-8):	Cliente FTP para el X Window
 Summary(ja.UTF-8):	X Window System 用マルチスレッド FTP クライアント
@@ -10,30 +7,40 @@ Summary(pt_BR.UTF-8):	Cliente FTP para o X Window
 Summary(ru.UTF-8):	FTP клиент для X Window
 Summary(uk.UTF-8):	FTP клієнт для X Window
 Name:		FileZilla
-Version:	3.13.1
+Version:	3.35.1
 Release:	1
 License:	GPL
 Group:		X11/Applications/Networking
-Source0:	http://downloads.sourceforge.net/filezilla/%{name}_%{version}_src.tar.bz2
-# Source0-md5:	48e1e32813cfda37ec4688336fed7408
+Source0:	https://dl1.cdn.filezilla-project.org/client/%{name}_%{version}_src.tar.bz2
+# Source0-md5:	6595bef0872e230eba2aa3a449d03c92
 Patch0:		%{name}-desktop.patch
 URL:		http://filezilla-project.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	cppunit-devel
-BuildRequires:	dbus-devel
-BuildRequires:	gettext-tools
-BuildRequires:	gnutls-devel >= 2.8.3
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1.6
+BuildRequires:	cppunit-devel >= 1.10.2
+BuildRequires:	dbus-devel >= 1.2
+BuildRequires:	gettext-tools >= 0.11.0
+BuildRequires:	gnutls-devel >= 3.4.15
 BuildRequires:	gtk+2-devel
+BuildRequires:	libfilezilla-devel >= %{libfilezillaver}
 BuildRequires:	libidn-devel
-BuildRequires:	libtool >= 2:1.5
+# -std=c++14
+BuildRequires:	libstdc++-devel >= 6:5
+BuildRequires:	libtool >= 2:2
+BuildRequires:	nettle-devel >= 3.1
 BuildRequires:	pkgconfig
 BuildRequires:	pugixml-devel >= 1.6-2
-BuildRequires:	wxGTK2-unicode-devel >= 3.0.1
-BuildRequires:	wxWidgets-devel >= 3.0.1
-BuildRequires:	wxWidgets-utils >= 3.0.1
+BuildRequires:	sqlite3-devel >= 3.7
+BuildRequires:	wxGTK2-unicode-devel >= 3.0.3
+BuildRequires:	wxWidgets-devel >= 3.0.3
+BuildRequires:	wxWidgets-utils >= 3.0.3
 BuildRequires:	xdg-utils
-Requires:	wxWidgets >= 3.0.1
+Requires:	dbus-libs >= 1.2
+Requires:	gnutls-libs >= 3.4.15
+Requires:	libfilezilla >= %{libfilezillaver}
+Requires:	nettle >= 3.1
+Requires:	pugixml >= 1.6-2
+Requires:	wxGTK2-unicode >= 3.0.3
 Provides:	filezilla
 Obsoletes:	filezilla
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,34 +58,32 @@ opcjami oraz intuicyjnym interfejsem.
 %patch0 -p1
 
 cd locales
-mv bg{_BG,}.po
-mv cs{_CZ,}.po
-mv da{_DK,}.po
-#mv et{_EE,}.po
-mv fa{_IR,}.po
-mv fi{_FI,}.po
-mv gl{_ES,}.po
-mv he{_IL,}.po
-mv hu{_HU,}.po
-mv id{_ID,}.po
-mv ja{_JP,}.po
-mv km{_KH,}.po
-mv ko{_KR,}.po
-mv lt{_LT,}.po
-mv lv{_LV,}.po
-mv mk{_MK,}.po
-mv nb{_NO,}.po
-mv nn{_NO,}.po
-mv pl{_PL,}.po
-mv pt{_PT,}.po
-mv ro{_RO,}.po
-mv sk{_SK,}.po
-mv sl{_SI,}.po
-mv th{_TH,}.po
-mv uk{_UA,}.po
-mv vi{_VN,}.po
-# Temporary - FIXME:
-rm -f ca@valencia.po 
+%{__mv} bg{_BG,}.po
+%{__mv} ca{_ES,}@valencia.po
+%{__mv} cs{_CZ,}.po
+%{__mv} fa{_IR,}.po
+%{__mv} fi{_FI,}.po
+%{__mv} gl{_ES,}.po
+%{__mv} he{_IL,}.po
+%{__mv} hu{_HU,}.po
+%{__mv} id{_ID,}.po
+%{__mv} ja{_JP,}.po
+%{__mv} km{_KH,}.po
+%{__mv} ko{_KR,}.po
+%{__mv} lo{_LA,}.po
+%{__mv} lt{_LT,}.po
+%{__mv} lv{_LV,}.po
+%{__mv} mk{_MK,}.po
+%{__mv} nb{_NO,}.po
+%{__mv} nn{_NO,}.po
+%{__mv} pl{_PL,}.po
+%{__mv} pt{_PT,}.po
+%{__mv} ro{_RO,}.po
+%{__mv} sk{_SK,}.po
+%{__mv} sl{_SI,}.po
+%{__mv} th{_TH,}.po
+%{__mv} uk{_UA,}.po
+%{__mv} vi{_VN,}.po
 
 %build
 %{__libtoolize}
@@ -87,6 +92,8 @@ rm -f ca@valencia.po
 %{__autoheader}
 %{__automake}
 %configure \
+	xdgopen=/usr/bin/xdg-open \
+	--disable-precomp \
 	--with-wx-config=wx-gtk2-unicode-config \
 	--with-tinyxml=builtin
 %{__make}
@@ -97,9 +104,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# Temporary - FIXME:
-rm -rf \
-	$RPM_BUILD_ROOT%{_datadir}/locale/{ca_ES@valencia,co,kab,lo_LA}
+# not supported by glibc (as of 2.25)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{co,kab}
+
+# Remove oversized icons
+%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/hicolor/480x480
 
 %find_lang filezilla
 
@@ -108,7 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f filezilla.lang
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/filezilla
 %attr(755,root,root) %{_bindir}/fzsftp
 %attr(755,root,root) %{_bindir}/fzputtygen
@@ -117,7 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/filezilla/docs
 %{_datadir}/filezilla/docs/*
 %dir %{_datadir}/filezilla/resources
-%{_datadir}/filezilla/resources/*.png
 %{_datadir}/filezilla/resources/*.wav
 %{_datadir}/filezilla/resources/*.xml
 %dir %{_datadir}/filezilla/resources/xrc
@@ -193,8 +201,21 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/filezilla/resources/tango/48x48
 %{_datadir}/filezilla/resources/tango/48x48/*.png
 %{_datadir}/filezilla/resources/tango/theme.xml
-%{_iconsdir}/hicolor/*/apps/filezilla.png
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.png
-%{_mandir}/man1/*.1*
-%{_mandir}/man5/*.5*
+%dir %{_datadir}/filezilla/resources/480x480
+%{_datadir}/filezilla/resources/480x480/*.png
+%dir %{_datadir}/filezilla/resources/classic
+%dir %{_datadir}/filezilla/resources/classic/16x16
+%{_datadir}/filezilla/resources/classic/16x16/*.png
+%{_datadir}/filezilla/resources/classic/theme.xml
+%dir %{_datadir}/filezilla/resources/default
+%dir %{_datadir}/filezilla/resources/default/480x480
+%{_datadir}/filezilla/resources/default/480x480/*.png
+%{_datadir}/filezilla/resources/default/theme.xml
+%{_iconsdir}/hicolor/*x*/apps/filezilla.png
+%{_iconsdir}/hicolor/scalable/apps/filezilla.svg
+%{_desktopdir}/filezilla.desktop
+%{_pixmapsdir}/filezilla.png
+%{_mandir}/man1/filezilla.1*
+%{_mandir}/man1/fzputtygen.1*
+%{_mandir}/man1/fzsftp.1*
+%{_mandir}/man5/fzdefaults.xml.5*