From 8303df38956fc971a236a2c7fc776a8da2f6ab54 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 22 Oct 2019 09:37:03 -0400 Subject: WIP: freefilesync 10.17 rpm rc1 Attempt at updating the patches for 10.17. Need to try with libcurl 7.66.0 which my local install does not have. --- freefilesync/freefilesync.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 7b7cc80..157c66b 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -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,7 @@ Patch3: ffs_sftp.patch Patch4: ffs_fedora.patch Patch5: ffs_el.patch Patch6: ffs_libssh2.patch +Patch7: ffs_curl.patch Packager: B Stack # WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. @@ -92,6 +93,7 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %patch4 -p1 %endif %patch6 -p1 +%patch7 -p1 # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags @@ -194,6 +196,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Mon Oct 21 2019 B Stack - 10.17-1 +- version bump + * Wed Oct 09 2019 B Stack - 10.16-2 - include support for el8 -- cgit From 1240098e4905fc5fdf54740709873bed5137f7eb Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 22 Oct 2019 13:56:22 -0400 Subject: WIP: test a separate patch for the include --- freefilesync/freefilesync.spec | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 157c66b..a10ff55 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -39,6 +39,7 @@ Patch4: ffs_fedora.patch Patch5: ffs_el.patch Patch6: ffs_libssh2.patch Patch7: ffs_curl.patch +Patch8: ffs_bit.patch Packager: B Stack # WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. @@ -94,6 +95,9 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %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 -- cgit From e39a5f977252c1169ac6c116e9099a99ac0ef4b6 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 22 Oct 2019 14:11:00 -0400 Subject: WIP: fix typo --- freefilesync/freefilesync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index a10ff55..4bba3cb 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -95,7 +95,7 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %endif %patch6 -p1 %patch7 -p1 -%if 0%{?el6}%{?el7}%{?el8}{?fc29} +%if 0%{?el6}%{?el7}%{?el8}%{?fc29} %patch8 -p1 %endif -- cgit From 5698f851f2b147e05aa9693cfc8d5f6e1e451635 Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 23 Oct 2019 09:55:53 -0400 Subject: freefilesync: el7 use c++2a now Thanks to devtoolset-8, el7 can now compile against -std=c++2a --- freefilesync/freefilesync.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 4bba3cb..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 @@ -200,8 +200,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog -* Mon Oct 21 2019 B Stack - 10.17-1 +* Wed Oct 23 2019 B Stack - 10.17-1 - version bump +- el7 uses devtoolset-8 for c++2a support * Wed Oct 09 2019 B Stack - 10.16-2 - include support for el8 -- cgit