Hello community, here is the log from the commit of package filezilla for openSUSE:Factory checked in at 2015-11-08 11:26:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/filezilla (Old) and /work/SRC/openSUSE:Factory/.filezilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "filezilla" Changes: -------- --- /work/SRC/openSUSE:Factory/filezilla/filezilla.changes 2015-11-02 12:54:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.filezilla.new/filezilla.changes 2015-11-08 11:26:55.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Nov 5 18:29:30 UTC 2015 - [email protected] + +- Only use explicit gcc5 for openSUSE Leap 42.1 (and older). +- Some spec simplifications. +- Update icon cache. +- Remove duplicate CXXFLAGS adding. + +------------------------------------------------------------------- +Thu Nov 5 17:52:45 UTC 2015 - [email protected] + +- Fixed compiler requirements, again. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filezilla.spec ++++++ --- /var/tmp/diff_new_pack.Fp3Thx/_old 2015-11-08 11:26:56.000000000 +0100 +++ /var/tmp/diff_new_pack.Fp3Thx/_new 2015-11-08 11:26:56.000000000 +0100 @@ -22,47 +22,57 @@ Summary: A GUI FTP and SFTP Client License: GPL-2.0+ Group: Productivity/Networking/Ftp/Clients -Url: http://filezilla-project.org/ +Url: https://filezilla-project.org/ Source0: http://download.filezilla-project.org/client/FileZilla_%{version}_src.tar.bz2 +# PATCH-FIX-OPENSUSE putty-no_DATE_and_TIME_.patch Patch0: putty-no_DATE_and_TIME_.patch +# PATCH-FIX-OPENSUSE filezilla-3.5.3-buildinfo-no-date.patch Patch1: filezilla-3.5.3-buildinfo-no-date.patch +# PATCH-FIX-UPSTREAM filezilla-3.14.1_wxstring.patch Patch2: filezilla-3.14.1_wxstring.patch +# PATCH-FIX-UPSTREAM filezilla-3.14.1_xml.patch Patch3: filezilla-3.14.1_xml.patch -BuildRequires: cppunit-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: fdupes -BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme +BuildRequires: libtool # needs long long support in pugixml BuildRequires: pugixml-devel >= 1.7 BuildRequires: update-desktop-files BuildRequires: wxWidgets-3_0-devel >= 3.0.2 BuildRequires: xdg-utils +BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gnutls) >= 3.1.12 BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libidn) BuildRequires: pkgconfig(sqlite3) -Requires(pre): update-desktop-files -Recommends: %{name}-lang = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-lang +%if 0%{?suse_version} <= 1320 +# FileZilla requires C++14 support. +BuildRequires: gcc5-c++ +%else +BuildRequires: gcc-c++ +%endif %description -FileZilla is a modern and powerful FTP client for Windows and Linux. -FileZilla development focuses on high usability while also supporting -as many useful features as possible. FileZilla is "Open Source" under -the GPL license. +FileZilla is a modern and powerful FTP client. +FileZilla development focuses on high usability while also +supporting as many useful features as possible. Some of the main features are: - * Continuing interrupted up-/downloads - * Managing different FTP sites - * Modifiable Commands - * Keep-Alive-System - * Timeout detection - * Firewall support - * SOCKS4/5 and HTTP 1.1 proxy support - * SSL support (secure connections) - * SFTP support - * Upload/Download queue - * Drag&Drop support + * Continuing interrupted up-/downloads. + * Managing different FTP sites. + * Modifiable Commands. + * Keep-Alive-System. + * Timeout detection. + * Firewall support. + * SOCKS4/5 and HTTP 1.1 proxy support. + * SSL support (secure connections). + * SFTP support. + * Upload/Download queue. + * Drag&Drop support. %lang_package @@ -74,41 +84,16 @@ %patch3 -p1 # Fix invalid translation locales: -cd locales -for LOC in\ - bg_BG\ - ca_ES@valencia\ - cs_CZ\ - da_DK\ - fa_IR\ - fi_FI\ - gl_ES\ - he_IL\ - hu_HU\ - id_ID\ - ja_JP\ - km_KH\ - ko_KR\ - lt_LT\ - lv_LV\ - mk_MK\ - nb_NO\ - nn_NO\ - pl_PL\ - pt_PT\ - ro_RO\ - sl_SI\ - sk_SK\ - th_TH\ - uk_UA\ - vi_VN; -do - mv -iv $LOC.po ${LOC/_??}.po +find locales/ -maxdepth 1 -type f -regex '.+_[A-Z][A-Z].*\.po' | while read file; do + mv -fv "$file" "${file/_[A-Z][A-Z]}" done %build -export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" +%if 0%{?suse_version} <= 1320 +export CC="gcc-5" +export CXX="g++-5" +%endif +autoreconf -fi %configure \ --disable-static \ --disable-manualupdatecheck \ @@ -116,36 +101,41 @@ --with-dbus make %{?_smp_mflags} -%check -make check %{?_smp_mflags} - %install %make_install %suse_update_desktop_file %{name} -%fdupes %{buildroot}%{_datadir} +%fdupes %{buildroot}%{_datadir}/ %find_lang %{name} +%check +make check %{?_smp_mflags} + +%post +%desktop_database_post +%icon_theme_cache_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun + %files -%defattr(-, root, root) +%defattr(-,root,root) %doc README NEWS %{_bindir}/%{name} %{_bindir}/fzsftp %{_bindir}/fzputtygen -%{_datadir}/%{name} +%{_datadir}/%{name}/ +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/pixmaps/%{name}.png -%dir %{_datadir}/appdata +%dir %{_datadir}/appdata/ %{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{_datadir}/applications/%{name}.desktop -%{_mandir}/man1/filezilla.* -%{_mandir}/man1/fzputtygen.* -%{_mandir}/man1/fzsftp.* -%{_mandir}/man5/fzdefaults.xml.* +%{_mandir}/man1/filezilla.1%{?ext_man} +%{_mandir}/man1/fzputtygen.1%{?ext_man} +%{_mandir}/man1/fzsftp.1%{?ext_man} +%{_mandir}/man5/fzdefaults.xml.5%{?ext_man} -%files -f %{name}.lang lang -%defattr(-, root, root) +%files lang -f %{name}.lang +%defattr(-,root,root) %changelog
