X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=FileZilla.spec;h=46c196b23d34e7d85cd30c915a2adc3156522a99;hb=HEAD;hp=3debffb4ae32767d45cca66a6fa6708f2ceed042;hpb=16f607752d4aa24e80e13fbf8ad98f2731ea3247;p=packages%2FFileZilla.git

diff --git a/FileZilla.spec b/FileZilla.spec
index 3debffb..1554793 100644
--- a/FileZilla.spec
+++ b/FileZilla.spec
@@ -1,8 +1,6 @@
-#
-# Conditional build:
 %bcond_with	storj	# support for Storj decentralized cloud storage provider
 
-%define		libfilezillaver	0.17.0
+%define		libfilezilla_ver	0.47.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 クライアント
@@ -11,43 +9,43 @@ 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.43.0
+Version:	3.67.0
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		X11/Applications/Networking
-Source0:	https://download.filezilla-project.org/client/%{name}_%{version}_src.tar.bz2
-# Source0-md5:	44d7279e95cdd9c14b14218ac30f00e3
+Source0:	https://download.filezilla-project.org/client/%{name}_%{version}_src.tar.xz
+# Source0-md5:	ddcf03519e2e55ada0bb77c2a6a73fba
 Patch0:		%{name}-desktop.patch
-URL:		http://filezilla-project.org/
+Patch1:		disable-avx-on-i686.patch
+URL:		https://filezilla-project.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1.6
+BuildRequires:	boost-devel >= 1.76
 BuildRequires:	cppunit-devel >= 1.13.0
 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:	gtk+3-devel
+BuildRequires:	libfilezilla-devel >= %{libfilezilla_ver}
 BuildRequires:	libidn-devel
-# -std=c++14
-BuildRequires:	libstdc++-devel >= 6:5
-%{?with_storj:BuildRequires:	libstorj-devel >= 1.0}
+# -std=c++17
+BuildRequires:	libstdc++-devel >= 6:7
 BuildRequires:	libtool >= 2:2
 BuildRequires:	nettle-devel >= 3.1
 BuildRequires:	pkgconfig
-BuildRequires:	pugixml-devel >= 1.6-2
+BuildRequires:	pugixml-devel >= 1.9
 BuildRequires:	sqlite3-devel >= 3.7
-BuildRequires:	wxGTK2-unicode-devel >= 3.0.4
+%{?with_storj:BuildRequires:	storj-uplink-c-devel}
+BuildRequires:	wxGTK3-unicode-devel >= 3.0.4
 BuildRequires:	wxWidgets-devel >= 3.0.4
 BuildRequires:	wxWidgets-utils >= 3.0.4
 BuildRequires:	xdg-utils
 Requires:	dbus-libs >= 1.2
-Requires:	gnutls-libs >= 3.4.15
-Requires:	libfilezilla >= %{libfilezillaver}
+Requires:	libfilezilla >= %{libfilezilla_ver}
 Requires:	nettle >= 3.1
-Requires:	pugixml >= 1.6-2
-Requires:	wxGTK2-unicode >= 3.0.4
+Requires:	pugixml >= 1.9
+Requires:	wxGTK3-unicode >= 3.0.4
 Provides:	filezilla
-Obsoletes:	filezilla
+Obsoletes:	filezilla < 3.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,6 +59,7 @@ opcjami oraz intuicyjnym interfejsem.
 %prep
 %setup -q -n filezilla-%{version}
 %patch0 -p1
+%patch1 -p1
 
 cd locales
 %{__mv} bg{_BG,}.po
@@ -99,7 +98,7 @@ cd locales
 %configure \
 	xdgopen=/usr/bin/xdg-open \
 	--disable-precomp \
-	--with-wx-config=wx-gtk2-unicode-config \
+	--with-wx-config=wx-gtk3-unicode-config \
 	%{?with_storj:--enable-storj} \
 	--with-tinyxml=builtin
 %{__make}
@@ -110,8 +109,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# not supported by glibc (as of 2.25)
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{co,kab}
+# API not exported
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libfzclient-private.{la,so}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libfzclient-commonui-private.{la,so}
+
+# not supported by glibc (as of 2.32)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/co
 
 # Remove oversized icons
 %{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/hicolor/480x480
@@ -121,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files -f filezilla.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
@@ -130,6 +136,8 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with storj}
 %attr(755,root,root) %{_bindir}/fzstorj
 %endif
+%attr(755,root,root) %{_libdir}/libfzclient-commonui-private-%{version}.so
+%attr(755,root,root) %{_libdir}/libfzclient-private-%{version}.so
 %{_datadir}/appdata/filezilla.appdata.xml
 %dir %{_datadir}/filezilla
 %dir %{_datadir}/filezilla/docs
@@ -137,8 +145,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/filezilla/resources
 %{_datadir}/filezilla/resources/*.wav
 %{_datadir}/filezilla/resources/*.xml
-%dir %{_datadir}/filezilla/resources/xrc
-%{_datadir}/filezilla/resources/xrc/*.xrc
 %dir %{_datadir}/filezilla/resources/16x16
 %{_datadir}/filezilla/resources/16x16/*.gif
 %{_datadir}/filezilla/resources/16x16/*.png