Accepting request 605842 from home:tglatt:branches:network

Problem: FreeFileSync 10 requires wxWidgets-3_2 which is not available on Leap 42.3. Don't know if it's sensible to lock out users of a still supported Leap release.

OBS-URL: https://build.opensuse.org/request/show/605842
OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=28

FreeFileSync.spec

@@ -17,7 +17,7 @@
 
 Name:           FreeFileSync
 Summary:        Free backup software to synchronize files and folders
-Version:        9.8
+Version:        10.0
 Release:        1
 License:        GPL-3.0+
 Group:          Productivity/Networking/System
@@ -27,12 +27,10 @@ Source1:        %{name}.desktop
 Source2:        %{name}.png
 Source3:        RealTimeSync.desktop
 Source4:        RealTimeSync.png
-Patch0:			freefilesync-build.patch
-# Patch created thanks to doubledodge https://www.freefilesync.org/forum/viewtopic.php?t=4288
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  unzip
 BuildRequires:  boost-devel >= 1.54
-BuildRequires:  wxWidgets-3_0-devel
+BuildRequires:  wxWidgets-3_2-devel
 BuildRequires:  update-desktop-files
 %if 0%{?suse_version} < 1500
 # FreeFileSync requires C++14 support.
@@ -41,14 +39,6 @@ BuildRequires:  gcc7-c++
 BuildRequires:  gcc-c++
 %endif
 
-# FreeFileSync requires libboost_{chrono,system,thread}1_{opensuseboostversion}_0_devel
-%if ( 0%{?sle_version} == 150000 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 )
-BuildRequires:	libboost_chrono1_66_0-devel
-BuildRequires:	libboost_system1_66_0-devel
-BuildRequires:	libboost_thread1_66_0-devel
-%endif
-
-
 %description
 FreeFileSync is a free Open Source software that helps you synchronize files
 and synchronize folders for Windows, Linux and Mac OS X. It is designed to save
@@ -66,7 +56,6 @@ Usually this command line will trigger a FreeFileSync batch job.
 
 %prep
 %setup -c %{name}-%{version}
-%patch0 -p1
 sed -i 's/\r$//' License.txt
 chmod -x License.txt
 # Fix for false Makefile
@@ -85,13 +74,17 @@ export CXX="g++"
 %endif
 #
 pushd %{name}/Source
+
+# Add -lz to LINKFLAGS for proper compilation
+sed -i -e 's:CPP_FILES=:LINKFLAGS += -lz\n\n CPP_FILES=:g' Makefile
+
 %if 0%{?suse_version} < 1500
 sed -i -e 's:g++:g++-7:g' Makefile
 sed -i -e 's:CXXFLAGS  =:CXXFLAGS  +=:g' Makefile
 %else
 sed -i -e 's:g++:g++:g' Makefile
 %endif
-#export CXXFLAGS="-include 'zen/warn_static.h'"
+
 make %{?_smp_mflags} BUILD=FreeFileSync
 popd
 pushd %{name}/Source/RealTimeSync

FreeFileSync_10.0_Source.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:071b8a8a778c4598936ea714f146d585673fe22854b4dab061b9c4c199de27e6
+size 2906191

FreeFileSync_9.8_Source.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77a59586284a518d6df6c0cc934c3efa434f247acce70452ab9fe37e7747b96d
-size 2866149