diff options
| author | B Stack <bgstack15@gmail.com> | 2019-10-28 14:05:35 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-10-28 14:05:35 +0000 |
| commit | ef304a13cc18f52c47de12c9989ad4bbb89de5c6 (patch) | |
| tree | 07227896792c43bd00a41d7bbabbb93870f48959 /freefilesync/freefilesync.spec | |
| parent | Merge branch 'veracrypt-bump' into 'master' (diff) | |
| parent | freefilesync: el7 use c++2a now (diff) | |
| download | stackrpms-ef304a13cc18f52c47de12c9989ad4bbb89de5c6.tar.gz stackrpms-ef304a13cc18f52c47de12c9989ad4bbb89de5c6.tar.bz2 stackrpms-ef304a13cc18f52c47de12c9989ad4bbb89de5c6.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.17
See merge request bgstack15/stackrpms!95
Diffstat (limited to 'freefilesync/freefilesync.spec')
| -rw-r--r-- | freefilesync/freefilesync.spec | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 7b7cc80..ce183fa 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-7 - %define scl_buildreq devtoolset-7-toolchain + %define scl_env devtoolset-8 + %define scl_buildreq devtoolset-8-toolchain %define min_libcurl >= 7.64.0 %define min_libssh2 >= 1.8.0 %define min_openssl >= 1.1.1c @@ -18,8 +18,8 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 10.16 -Release: 2%{?dist} +Version: 10.17 +Release: 1%{?dist} Summary: A file synchronization utility Group: Applications/File @@ -38,6 +38,8 @@ Patch3: ffs_sftp.patch Patch4: ffs_fedora.patch Patch5: ffs_el.patch Patch6: ffs_libssh2.patch +Patch7: ffs_curl.patch +Patch8: ffs_bit.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. @@ -92,6 +94,10 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %patch4 -p1 %endif %patch6 -p1 +%patch7 -p1 +%if 0%{?el6}%{?el7}%{?el8}%{?fc29} +%patch8 -p1 +%endif # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags @@ -194,6 +200,10 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Wed Oct 23 2019 B Stack <bgstack15@gmail.com> - 10.17-1 +- version bump +- el7 uses devtoolset-8 for c++2a support + * Wed Oct 09 2019 B Stack <bgstack15@gmail.com> - 10.16-2 - include support for el8 |