diff options
Diffstat (limited to 'freefilesync/freefilesync.spec')
| -rw-r--r-- | freefilesync/freefilesync.spec | 56 |
1 files changed, 48 insertions, 8 deletions
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index ce183fa..030b863 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -1,14 +1,15 @@ %global pkgname FreeFileSync %global prog2name RealTimeSync %global dummy_package 0 +%define debug_package %{nil} %define min_libcurl %{nil} %define min_libssh2 %{nil} %define min_openssl %{nil} %define scl_env %{nil} %define scl_buildreq coreutils %if 0%{?el6}%{?el7} - %define scl_env devtoolset-8 - %define scl_buildreq devtoolset-8-toolchain + %define scl_env devtoolset-7 + %define scl_buildreq devtoolset-7-toolchain %define min_libcurl >= 7.64.0 %define min_libssh2 >= 1.8.0 %define min_openssl >= 1.1.1c @@ -18,7 +19,7 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 10.17 +Version: 11.0 Release: 1%{?dist} Summary: A file synchronization utility @@ -40,10 +41,12 @@ Patch5: ffs_el.patch Patch6: ffs_libssh2.patch Patch7: ffs_curl.patch Patch8: ffs_bit.patch +Patch9: ffs_no_eraseif.patch +Patch10: revert_zenju_aggressive_upstreamisms.patch Packager: B Stack <bgstack15@gmail.com> -# WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. -BuildRequires: compat-wxGTK3-gtk2-devel +BuildRequires: brotli-devel +BuildRequires: wxGTK3-devel BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: ImageMagick @@ -54,7 +57,6 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(zlib) %if 0%{?el6}%{?el7} -BuildRequires: wxGTK-devel BuildRequires: %{scl_buildreq} BuildRequires: openssl-%{name}-devel %{min_openssl} Requires: libcurl %{min_libcurl} @@ -90,23 +92,26 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ # use the el patch %patch5 -p1 %else -# use the fedora patch +# use the fedora patch, even for el8 %patch4 -p1 %endif %patch6 -p1 %patch7 -p1 %if 0%{?el6}%{?el7}%{?el8}%{?fc29} %patch8 -p1 +%patch9 -p1 %endif +%patch10 -p1 # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags %{__sed} \ -e 's|-O3 -DNDEBUG|-DNDEBUG -D"warn_static(arg)= " -DZEN_LINUX %{?build_cxxflags:%{build_cxxflags}}%{!?build_cxxflags:%{optflags}}|g' \ - -e '/LINKFLAGS/s|-s|%{__global_ldflags}|;' \ + -e '/linkFlags/s|-s|%{__global_ldflags}|;' \ -i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile %build +export TMPDIR=/tmp # necessary since 11.0 %if !%{dummy_package} %if "%{?scl_env}" != "" scl enable %{scl_env} /bin/bash << 'EOFSCL' @@ -119,6 +124,7 @@ EOFSCL %endif %install +export TMPDIR=/tmp # necessary since 11.0 %if !%{dummy_package} # removed by upstream! #%%make_install -C %%{pkgname}/Source @@ -200,6 +206,40 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Wed Jul 22 2020 B Stack <bgstack15@gmail.com> - 11.0-1 +- version bump +- use gtk3 +- el6,7,8 and fc31 packages are becoming stale + +* Sun Jun 21 2020 B Stack <bgstack15@gmail.com> - 10.25-1 +- version bump +- el6,7,8 and fc31 packages not built because upstream requires g++-10 + +* Mon May 18 2020 B Stack <bgstack15@gmail.com> - 10.24-1 +- version bump +- add revert_zenju_aggressive_upstreamisms.patch +- disable debug package + +* Tue Apr 21 2020 B Stack <bgstack15@gmail.com> - 10.23-1 +- version bump +- remove ffs_libssl.patch + +* Wed Mar 18 2020 B Stack <bgstack15@gmail.com> - 10.22-1 +- version bump +- add ffs_libssl.patch + +* Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 10.20-1 +- version bump + +* Fri Dec 27 2019 B Stack <bgstack15@gmail.com> - 10.19-1 +- version bump + +* Thu Nov 21 2019 B Stack <bgstack15@gmail.com> - 10.18-2 +- el and fc29 reverted to devtoolset-7, -std=c++17, and some older internal logic + +* Wed Nov 20 2019 B Stack <bgstack15@gmail.com> - 10.18-1 +- version bump + * Wed Oct 23 2019 B Stack <bgstack15@gmail.com> - 10.17-1 - version bump - el7 uses devtoolset-8 for c++2a support |