- rel.1 - files fixed, merged parts from filezilla.spec

Changed files:
    FileZilla.spec -> 1.4

diff --git a/FileZilla.spec b/FileZilla.spec
index 8aa56661e5b33da842cda4124dcedca4b652af4f..31b08699af60fa63b2fd90a1880b8e3def7320b2 100644 (file)
--- a/FileZilla.spec
+++ b/FileZilla.spec
@@ -1,5 +1,3 @@
-# TODO:
-# - merge with old filezilla.spec
 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,11 +7,12 @@ Summary(ru.UTF-8):    FTP клиент для X Window
 Summary(uk.UTF-8):     FTP клієнт для X Window
 Name:          FileZilla
 Version:       3.0.2.1
-Release:       0.3
+Release:       1
 License:       GPL
 Group:         X11/Applications/Networking
 Source0:       http://downloads.sourceforge.net/filezilla/%{name}_%{version}_src.tar.bz2
 # Source0-md5: 0182908d3091d19edc511b3a2a6b3e08
+Patch0:                %{name}-desktop.patch
 URL:           http://filezilla-project.org/
 BuildRequires: wxGTK2-unicode-devel >= 2.8.4
 BuildRequires: wxWidgets-devel >= 2.8.4
@@ -21,9 +20,29 @@ BuildRequires:       wxWidgets-utils >= 2.8.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
+FileZilla is a fast and reliable FTP client with lots of useful
+features and an intuitive interface.
+
+%description -l pl.UTF-8
+FileZilla to szybki i wiarygodny klient FTP z wieloma przydatnymi
+opcjami oraz intuicyjnym interfejsem.
 
 %prep
 %setup -q -n filezilla-%{version}
+%patch0 -p1
+cd locales
+mv ca{_ES,}.po
+mv et{_EE,}.po
+mv da{_DK,}.po
+mv fr{_FR,}.po
+mv id{_ID,}.po
+mv it{_IT,}.po
+mv ja{_JP,}.po
+mv ko{_KR,}.po
+mv nb{_NO,}.po
+mv pl{_PL,}.po
+mv pt{_PT,}.po
+mv sv{_SE,}.po
 
 %build
 %configure \
@@ -36,12 +55,39 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-#%find_lang %{name} --all-name
+%find_lang filezilla
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
-# -f %{name}.lang
+%files -f filezilla.lang
 %defattr(644,root,root,755)
-#%doc
+%doc AUTHORS NEWS README
+%attr(755,root,root) %{_bindir}/filezilla
+%attr(755,root,root) %{_bindir}/fzsftp
+%dir %{_datadir}/filezilla
+%dir %{_datadir}/filezilla/docs
+%{_datadir}/filezilla/docs/*
+%dir %{_datadir}/filezilla/resources
+%{_datadir}/filezilla/resources/*.png
+%{_datadir}/filezilla/resources/*.wav
+%{_datadir}/filezilla/resources/*.xml
+%{_datadir}/filezilla/resources/*.xrc
+%dir %{_datadir}/filezilla/resources/16x16
+%{_datadir}/filezilla/resources/16x16/*.png
+%dir %{_datadir}/filezilla/resources/32x32
+%{_datadir}/filezilla/resources/32x32/*.png
+%dir %{_datadir}/filezilla/resources/48x48
+%{_datadir}/filezilla/resources/48x48/*.png
+%dir %{_datadir}/filezilla/resources/blukis
+%dir %{_datadir}/filezilla/resources/blukis/16x16
+%{_datadir}/filezilla/resources/blukis/16x16/*.png
+%dir %{_datadir}/filezilla/resources/blukis/32x32
+%{_datadir}/filezilla/resources/blukis/32x32/*.png
+%dir %{_datadir}/filezilla/resources/blukis/48x48
+%{_datadir}/filezilla/resources/blukis/48x48/*.png
+%dir %{_datadir}/filezilla/resources/cyril
+%dir %{_datadir}/filezilla/resources/cyril/16x16
+%{_datadir}/filezilla/resources/cyril/16x16/*.png
+%{_desktopdir}/*.desktop
+%{_pixmapsdir}/*.png