summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--freefilesync/ffs.fc28.patch13
-rw-r--r--freefilesync/freefilesync.spec2
2 files changed, 14 insertions, 1 deletions
diff --git a/freefilesync/ffs.fc28.patch b/freefilesync/ffs.fc28.patch
index e112b1f..02caceb 100644
--- a/freefilesync/ffs.fc28.patch
+++ b/freefilesync/ffs.fc28.patch
@@ -1,3 +1,4 @@
+Upstream uses a libcurl more current than Fedora 29.
diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp
--- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-07 05:03:34.000000000 -0400
+++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-29 22:13:40.240595334 -0400
@@ -54,3 +55,15 @@ diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/RealTimeSync/Makefi
#Gtk - support "no button border"
CXXFLAGS += `pkg-config --cflags gtk+-2.0`
+diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h
+--- 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-02-10 16:42:29.124040824 -0500
++++ 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-02-10 20:57:30.758315345 -0500
+@@ -75,7 +75,7 @@
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50);
+- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
++ //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index fe415fe..169fa08 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -28,7 +28,7 @@ Source1: %{pkgname}.desktop
Source2: %{prog2name}.desktop
Patch0: ffs_no_check_updates.patch
Patch1: ffs_no_wx311.patch
-Patch2: ffs%{?dist}.patch
+Patch2: ffs.%{?rhel:el%{?rhel}}%{!?rhel:%{?dist}}.patch
Patch3: ffs_allow_parallel_ops.patch
Patch4: ffs_sftp.patch
bgstack15