X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=FileZilla.spec;h=1c60ade9582f1b2adbe2245ac27dfbefdc7a7e2a;hb=b33b9bae7a8caa401409d138d81d6f59053b310d;hp=688c4e61329631db450b133017b400fb6d898d7d;hpb=0e81f015862f814c90787bdda88f4316bb1db743;p=packages%2FFileZilla.git

diff --git a/FileZilla.spec b/FileZilla.spec
index 688c4e6..1c60ade 100644
--- a/FileZilla.spec
+++ b/FileZilla.spec
@@ -1,6 +1,7 @@
 # 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)
+# - /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...
 Summary:	FTP client for X Window
 Summary(es.UTF-8):	Cliente FTP para el X Window
 Summary(ja.UTF-8):	X Window System 用マルチスレッド FTP クライアント
@@ -9,22 +10,23 @@ 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.0.8.1
+Version:	3.2.5
 Release:	1
 License:	GPL
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/filezilla/%{name}_%{version}_src.tar.bz2
-# Source0-md5:	465de8637065886ad07048c97385a387
+# Source0-md5:	480db0ca1cf187cf7fe85189f47acafc
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-locales.patch
 URL:		http://filezilla-project.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	dbus-devel
+BuildRequires:	gnutls-devel >= 2.0.4
 BuildRequires:	libtool >= 2:1.5
-BuildRequires:	wxGTK2-unicode-devel >= 2.8.6
-BuildRequires:	wxWidgets-devel >= 2.8.6
-BuildRequires:	wxWidgets-utils >= 2.8.6
-Requires:	wxWidgets >= 2.8.6
+BuildRequires:	wxGTK2-unicode-devel >= 2.8.9
+BuildRequires:	wxWidgets-devel >= 2.8.9
+BuildRequires:	wxWidgets-utils >= 2.8.9
+Requires:	wxWidgets >= 2.8.9
 Provides:	filezilla
 Obsoletes:	filezilla
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,7 +42,6 @@ opcjami oraz intuicyjnym interfejsem.
 %prep
 %setup -q -n filezilla-%{version}
 %patch0 -p1
-%patch1 -p1
 
 cd locales
 mv bg{_BG,}.po
@@ -60,12 +61,17 @@ 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
 
 %build
 %{__libtoolize}
@@ -83,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# Temporary - FIXME:
+rm -rf \
+	$RPM_BUILD_ROOT%{_datadir}/locale/ca_ES@valencia
+
 %find_lang filezilla
 
 %clean
@@ -93,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/filezilla
 %attr(755,root,root) %{_bindir}/fzsftp
+%attr(755,root,root) %{_bindir}/fzputtygen
 %dir %{_datadir}/filezilla
 %dir %{_datadir}/filezilla/docs
 %{_datadir}/filezilla/docs/*
@@ -108,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/filezilla/resources/48x48
 %{_datadir}/filezilla/resources/48x48/*.png
 %dir %{_datadir}/filezilla/resources/blukis
+%{_datadir}/filezilla/resources/blukis/theme.xml
 %dir %{_datadir}/filezilla/resources/blukis/16x16
 %{_datadir}/filezilla/resources/blukis/16x16/*.png
 %dir %{_datadir}/filezilla/resources/blukis/32x32
@@ -115,8 +127,32 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/filezilla/resources/blukis/48x48
 %{_datadir}/filezilla/resources/blukis/48x48/*.png
 %dir %{_datadir}/filezilla/resources/cyril
+%{_datadir}/filezilla/resources/cyril/theme.xml
 %dir %{_datadir}/filezilla/resources/cyril/16x16
 %{_datadir}/filezilla/resources/cyril/16x16/*.png
+%dir %{_datadir}/filezilla/resources/lone
+%{_datadir}/filezilla/resources/lone/theme.xml
+%dir %{_datadir}/filezilla/resources/lone/16x16
+%{_datadir}/filezilla/resources/lone/16x16/*.png
+%dir %{_datadir}/filezilla/resources/lone/32x32
+%{_datadir}/filezilla/resources/lone/32x32/*.png
+%dir %{_datadir}/filezilla/resources/lone/48x48
+%{_datadir}/filezilla/resources/lone/48x48/*.png
+%dir %{_datadir}/filezilla/resources/minimal
+%{_datadir}/filezilla/resources/minimal/theme.xml
+%dir %{_datadir}/filezilla/resources/minimal/16x16
+%{_datadir}/filezilla/resources/minimal/16x16/*.png
+%dir %{_datadir}/filezilla/resources/minimal/32x32
+%{_datadir}/filezilla/resources/minimal/32x32/file.png
+%dir %{_datadir}/filezilla/resources/opencrystal
+%{_datadir}/filezilla/resources/opencrystal/theme.xml
+%dir %{_datadir}/filezilla/resources/opencrystal/16x16
+%{_datadir}/filezilla/resources/opencrystal/16x16/*.png
+%dir %{_datadir}/filezilla/resources/opencrystal/32x32
+%{_datadir}/filezilla/resources/opencrystal/32x32/*.png
+%dir %{_datadir}/filezilla/resources/opencrystal/48x48
+%{_datadir}/filezilla/resources/opencrystal/48x48/*.png
+%{_iconsdir}/hicolor/*/apps/filezilla.png
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
 %{_mandir}/man1/*.1*