diff --git a/libfilezilla-0.9.2-util.patch b/libfilezilla-0.9.2-util.patch deleted file mode 100644 index 05e3628..0000000 --- a/libfilezilla-0.9.2-util.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libfilezilla/trunk/lib/libfilezilla/util.hpp 2017/06/01 19:28:46 8431 -+++ libfilezilla/trunk/lib/libfilezilla/util.hpp 2017/06/02 15:08:22 8432 -@@ -28,7 +28,7 @@ - - /** \brief Get random uniformly distributed bytes - */ --std::vector random_bytes(size_t size); -+std::vector FZ_PUBLIC_SYMBOL random_bytes(size_t size); - - } - diff --git a/libfilezilla.spec b/libfilezilla.spec index 59105a1..8749244 100644 --- a/libfilezilla.spec +++ b/libfilezilla.spec @@ -1,20 +1,25 @@ Name: libfilezilla Version: 0.17.1 -Release: 2%{?dist} -URL: http://lib.filezilla-project.org/ +Release: 3%{?dist} +URL: https://lib.filezilla-project.org/ Summary: C++ Library for FileZilla License: GPLv2+ -Source0: http://download.sourceforge.net/sourceforge/filezilla/%{name}-%{version}.tar.bz2 -BuildRequires: gcc-c++ nettle-devel gnutls-devel gettext -%package devel -Summary: Development files for C++ Library for FileZilla -Requires: %{name}%{?_isa} = %{version}-%{release} +Source0: https://download.filezilla-project.org/%{name}/%{name}-%{version}.tar.bz2 + +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: gnutls-devel +BuildRequires: nettle-devel %description libfilezilla is a small and modern C++ library, offering some basic functionality to build high-performing, platform-independent programs. +%package devel +Summary: Development files for C++ Library for FileZilla +Requires: %{name}%{?_isa} = %{version}-%{release} + %description devel libfilezilla is a small and modern C++ library, offering some basic functionality to build high-performing, platform-independent programs. @@ -22,15 +27,14 @@ functionality to build high-performing, platform-independent programs. This package contains files needed to compile code using libfilezilla. %prep -%setup -q +%autosetup %build %configure --disable-static -make %{?_smp_mflags} +%make_build %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%make_install %ldconfig_scriptlets @@ -39,15 +43,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %files -f %{name}.lang %license COPYING %doc AUTHORS ChangeLog NEWS README -%{_libdir}/*.so.* +%{_libdir}/libfilezilla.so.* %files devel +%exclude %{_libdir}/*.la %doc doc/* -%{_libdir}/*.so %{_includedir}/* +%{_libdir}/libfilezilla.so %{_libdir}/pkgconfig/libfilezilla.pc %changelog +* Wed Jul 31 2019 Phil Wyett - 0.17.1-3 +- Use HTTPS and fix Source0 URL. +- Remove old unused patch. +- Modernize and cleanup spec file. + * Thu Jul 25 2019 Fedora Release Engineering - 0.17.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild