From 6e46d0819a94060d6f8ee595de0be87bb201cecb Mon Sep 17 00:00:00 2001 From: B Stack Date: Fri, 16 Nov 2018 21:40:19 -0500 Subject: fix call to Resources.zip for fedora --- freefilesync/ffs_fedora.patch | 12 ++++++++++++ freefilesync/freefilesync.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch index 9a62974..ac975e0 100644 --- a/freefilesync/ffs_fedora.patch +++ b/freefilesync/ffs_fedora.patch @@ -10,3 +10,15 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 1 GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() +diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp +--- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-13 06:58:40.771249592 -0500 ++++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-16 21:34:30.341077845 -0500 +@@ -66,7 +66,7 @@ + ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName)); + + //if (isPortableVersion()) +- return appendSeparator(getExeFolderParentPath()); ++ return appendSeparator(getExeFolderParentPath()) + appendSeparator("share") + appendSeparator("freefilesync"); + //else //use OS' standard paths + // return appendSeparator(utfTo(wxStandardPathsBase::Get().GetResourcesDir())); + } diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 63e75c8..c2d548d 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -3,7 +3,7 @@ %global dummy_package 0 Name: freefilesync Version: 10.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A file synchronization utility Group: Applications/File @@ -132,7 +132,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %ghost %config %attr(666, -, -) %{_datadir}/%{pkgname}/GlobalSettings.xml %changelog -* Thu Nov 15 2018 B Stack - 10.6-2 +* Fri Nov 16 2018 B Stack - 10.6-3 - version bump * Tue Oct 16 2018 B Stack - 10.5-1 -- cgit