diff options
Diffstat (limited to 'freefilesync/freefilesync.spec')
| -rw-r--r-- | freefilesync/freefilesync.spec | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index e64fc02..1260fe9 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -7,8 +7,8 @@ %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 @@ -19,7 +19,7 @@ %endif Name: freefilesync Version: 10.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A file synchronization utility Group: Applications/File @@ -40,6 +40,7 @@ Patch5: ffs_el.patch Patch6: ffs_libssh2.patch Patch7: ffs_curl.patch Patch8: ffs_bit.patch +Patch8: ffs_no_eraseif.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. @@ -98,6 +99,9 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %if 0%{?el6}%{?el7}%{?el8}%{?fc29} %patch8 -p1 %endif +%if 0%{?el7} +%patch9 -p1 +%endif # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags @@ -200,6 +204,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Thu Nov 21 2019 B Stack <bgstack15@gmail.com> - 10.18-2 +- el7 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 |