rpms / filezilla

Clone
Source Code
GIT

#3 Old patch deletion and spec modernization/cleanup.
Merged 3 years ago by limb. Opened 3 years ago by kathenas.
Unknown source f29  into  f29

file removed
-8 
@@ -1,8 +0,0 @@
 

- --- data/filezilla.desktop~	2017-02-18 04:46:43.000000000 -0600
 

- +++ data/filezilla.desktop	2017-02-22 07:16:01.533943733 -0600
 

- @@ -1,4 +1,4 @@
 

- -[Desktop Entry]
 

- +[Desktop Entry]
 

-  Name=FileZilla
 

-  GenericName=FTP client
 

-  GenericName[da]=FTP-klient

file removed
-27 
@@ -1,27 +0,0 @@
 

- --- FileZilla3/trunk/configure.ac	2017/06/02 15:16:07	8433
 

- +++ FileZilla3/trunk/configure.ac	2017/06/02 15:16:48	8434
 

- @@ -546,6 +546,13 @@
 

-    AC_SUBST(NETTLE_LIBS)
 

-    AC_SUBST(NETTLE_CFLAGS)
 

-  

- +  PKG_CHECK_MODULES([HOGWEED], [hogweed >= 3.1],, [
 

- +    AC_MSG_ERROR([hogweed 3.1 greater was not found. You can get it from https://www.lysator.liu.se/~nisse/nettle/])
 

- +  ])
 

- +
 

- +  AC_SUBST(HOGWEED_LIBS)
 

- +  AC_SUBST(HOGWEED_CFLAGS)
 

- +
 

-    # GnuTLS
 

-    # ------
 

-  

- --- FileZilla3/trunk/src/interface/Makefile.am	2017/06/02 15:16:07	8433
 

- +++ FileZilla3/trunk/src/interface/Makefile.am	2017/06/02 15:16:48	8434
 

- @@ -270,7 +270,7 @@
 

-  

-  filezilla_LDFLAGS = ../engine/libengine.a $(LIBFILEZILLA_LIBS)
 

-  filezilla_LDFLAGS += $(PUGIXML_LIBS)
 

- -filezilla_LDFLAGS += $(NETTLE_LIBS)
 

- +filezilla_LDFLAGS += $(NETTLE_LIBS) $(HOGWEED_LIBS)
 

-  filezilla_LDFLAGS += $(LIBGNUTLS_LIBS)
 

-  

-  if HAVE_DBUS

file removed
-17 
@@ -1,17 +0,0 @@
 

- --- FileZilla3/trunk/src/interface/sitemanager_dialog.cpp	2016/07/01 08:37:58	7612
 

- +++ FileZilla3/trunk/src/interface/sitemanager_dialog.cpp	2016/07/01 12:20:05	7613
 

- @@ -383,6 +383,14 @@
 

-  	pSizer->Add(m_pNotebook_Bookmark, 1, wxGROW);
 

-  	pSizer->SetItemMinSize(1, pSizer->GetItem((size_t)0)->GetMinSize().GetWidth(), -1);
 

-  

- +	// Set min size of tree to actual size of tree.
 

- +	// Otherwise some platforms automatically calculate a min size fitting all items,
 

- +	// resulting in a huge dialog if there are many sites.
 

- +	wxSize const treeSize = pTree->GetSize();
 

- +	if (treeSize.IsFullySpecified()) {
 

- +		pTree->SetMinSize(treeSize);
 

- +	}
 

- +
 

-  	if (!Load()) {
 

-  		return false;
 

-  	}

file removed
-11 
@@ -1,11 +0,0 @@
 

- --- src/engine/serverpath.cpp~	2016-05-09 02:15:19.000000000 -0500
 

- +++ src/engine/serverpath.cpp	2016-05-09 10:53:49.364540531 -0500
 

- @@ -344,7 +344,7 @@
 

-  		return false;
 

-  	}
 

-  	if (prefix_len) {
 

- -		data.m_prefix = fz::sparse_optional<wxString>(new wxString(p, p + prefix_len));
 

- +		data.m_prefix = fz::sparse_optional<wxString>(wxString(p, p + prefix_len));
 

-  		p += prefix_len + 1;
 

-  	}
 

-

file modified
+62 -67 
@@ -1,63 +1,64 @@
 

- #%%global fz_rc	rc1
 

- 

- Name:           filezilla
 

- Version:        3.43.0
 

- #Release:        0.%%{?fz_rc}%%{?dist}
 

- Release:        1%{?dist}
 

- Summary:        FTP, FTPS and SFTP client
 

- 

- License:        GPLv2+
 

- URL:            http://filezilla-project.org/
 

- Source0:        http://download.filezilla-project.org/FileZilla_%{version}%{?fz_rc:-%{?fz_rc}}_src.tar.bz2
 

- 

- ## Needed if autogen.sh is invoked
 

- #BuildRequires:  automake, autoconf, libtool
 

- ## 

- ## Needed if test program is build
 

- BuildRequires:  gcc-c++
 

- BuildRequires:  cppunit-devel >= 1.10.2
 

- ##
 

- %if 0%{?fedora}
 

- BuildRequires:  libappstream-glib
 

+ # Enable (1 = enabled/0 = disabled) if configure regeneration etc. is required.
 

+ %define run_autogen 0
 

+ 

+ Name: filezilla
 

+ Version: 3.43.0
 

+ Release: 2%{?dist}
 

+ Summary: FTP, FTPS and SFTP client
 

+ License: GPLv2+
 

+ URL: https://filezilla-project.org/
 

+ 

+ Source0: https://download.filezilla-project.org/FileZilla_%{version}_src.tar.bz2
 

+ 

+ %if 0%{?run_autogen}
 

+ BuildRequires: autoconf
 

+ BuildRequires: automake
 

+ BuildRequires: libtool
 

  %endif
 

- BuildRequires:  desktop-file-utils
 

- BuildRequires:  xdg-utils
 

- Requires:       xdg-utils
 

- 

- BuildRequires:  dbus-devel
 

- BuildRequires:  gettext
 

- BuildRequires:  gnutls-devel >= 2.8.3
 

- BuildRequires:  libidn-devel
 

- BuildRequires:  pugixml-devel >= 1.7
 

- BuildRequires:  sqlite-devel
 

- BuildRequires:  wxGTK3-devel >= 3.0.3
 

- BuildRequires:  libappstream-glib
 

- BuildRequires:  libfilezilla-devel >= 0.17.1
 

- BuildRequires:  nettle-devel
 

- BuildRequires:  libstorj-devel
 

+ BuildRequires: gcc-c++
 

+ BuildRequires: glibc-devel
 

+ BuildRequires: glib2-devel
 

+ BuildRequires: cppunit-devel >= 1.13.0
 

+ BuildRequires: dbus-devel
 

+ BuildRequires: desktop-file-utils
 

+ BuildRequires: gettext
 

+ BuildRequires: gnutls-devel >= 2.8.3
 

+ BuildRequires: libappstream-glib
 

+ BuildRequires: libfilezilla-devel >= 0.17.1
 

+ BuildRequires: libidn-devel
 

+ BuildRequires: libstorj-devel
 

+ BuildRequires: nettle-devel
 

+ BuildRequires: pugixml-devel >= 1.7
 

+ BuildRequires: sqlite-devel
 

+ BuildRequires: wxGTK3-devel >= 3.0.4
 

+ BuildRequires: xdg-utils
 

+ 

+ Requires: xdg-utils
 

  

  %description
 

  FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.
 

  - Supports FTP, FTP over SSL/TLS (FTPS) and SSH File Transfer Protocol (SFTP)
 

  - Cross-platform
 

  - Available in many languages
 

- - Supports resume and transfer of large files >4GB
 

+ - Supports resume and transfer of large files greater than 4GB
 

  - Easy to use Site Manager and transfer queue
 

  - Drag & drop support
 

  - Speed limits
 

  - Filename filters
 

  - Network configuration wizard 

  

- 

  %prep
 

- %setup -q -n %{name}-%{version}%{?fz_rc:-%{?fz_rc}}
 

- 

- #autoreconf -if
 

- 

+ %autosetup -n %{name}-%{version}
 

+ %if 0%{?run_autogen}
 

+ autoreconf -if
 

+ %endif
 

  

  %build
 

- # for wxGTK3 - needed to find wxrc
 

+ # For wxGTK3 - needed to find wxrc
 

  export WXRC=%{_bindir}/wxrc-3.0
 

+ 

+ # Do not use '--enable-buildtype=official' in configure. That option enables the
 

+ # "check for updates" dialog to download new binaries from the official website.
 

  %configure \
 

    --disable-static \
 

    --enable-locales \
 
@@ -67,20 +68,11 @@
 

    --with-wx-config=wx-config-3.0 \
 

    --with-dbus \
 

    --enable-gnutlssystemciphers \
 

-   --disable-autoupdatecheck 

- 

- ## Do not use --enable-buildtype=official 

- ## that option enables the "check for updates" dialog to download
 

- ## new binaries from the official website.
 

- 

- # Remove the timyxml internal static lib to configure will not fails
 

- #rm -rf src/tinyxml/
 

- 

- make %{?_smp_mflags}
 

- 

+   --disable-autoupdatecheck
 

+ %make_build
 

  

  %install
 

- make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
 

+ %make_install
 

  

  # Update the screenshot shown in the software center
 

  #
 
@@ -104,19 +96,16 @@
 

    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
 

    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 

  

- %if 0%{?fedora}
 

  appstream-util validate-relax --nonet \
 

-   $RPM_BUILD_ROOT/%{_datadir}/appdata/*.appdata.xml
 

- %endif
 

+   $RPM_BUILD_ROOT/%{_datadir}/appdata/%{name}.appdata.xml
 

  

- #Create directory for system wide settings
 

+ # Create directory for system wide settings.
 

  mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 

- #Ghost configuration file
 

+ # Ghost configuration file.
 

  touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/fzdefaults.xml
 

- #This is not the usual docdir
 

+ # This is not the usual docdir.
 

  rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/docs
 

  

- 

  %find_lang %{name}
 

  

  %check
 
@@ -128,17 +117,23 @@
 

  %license COPYING
 

  %dir %{_sysconfdir}/%{name}
 

  %ghost %{_sysconfdir}/%{name}/fzdefaults.xml
 

- %{_bindir}/*
 

- %{_datadir}/filezilla/
 

- %{_datadir}/appdata/filezilla.appdata.xml
 

+ %{_bindir}/%{name}
 

+ %{_bindir}/fzputtygen
 

+ %{_bindir}/fzsftp
 

+ %{_bindir}/fzstorj
 

+ %{_datadir}/%{name}/
 

+ %{_datadir}/appdata/%{name}.appdata.xml
 

  %{_datadir}/applications/%{name}.desktop
 

  %{_datadir}/icons/hicolor/*/apps/%{name}.png
 

- %{_datadir}/icons/hicolor/scalable/apps/filezilla.svg
 

+ %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 

  %{_mandir}/man1/*
 

  %{_mandir}/man5/*
 

  

- 

  %changelog
 

+ * Wed Jul 31 2019 Phil Wyett <philwyett@kathenas.org> - 3.43.0-2
 

+ - Delete unused patches.
 

+ - Fix, modernize and cleanup spec file.
 

+ 

  * Thu Jun 27 2019 Gwyn Ciesla <gwync@protonmail.com> - 3.43.0-1
 

  - 3.43.0

  • Delete unused patches.
  • Fix, modernize and cleanup spec file.

Note:

Removed RC related code. RCs come a matter of days before final releases and not worth the effort. Private builds can be done in branches or copr.

This version (f29 branch as best) is tested and is epel8 ready.

Pull-Request has been merged by limb
3 years ago
Changes Summary 5
-8
file removed
filezilla-3.24.1-desktop.patch
-27
file removed
filezilla-3.26.0-hogweed.patch
-17
file removed
filezilla-gtk.patch
-11
file removed
filezilla-wxstring.patch
+62 -67
file changed
filezilla.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.