Commit 731ddfab authored by B Stack's avatar B Stack

freefilesync 10.6-1

parent 7ab43d84
# upstream project did not include user manual in release.
diff -Naur -x '*.orig' -x '*.rej' 10.5-0/FreeFileSync/Source/Makefile 10.5-1/FreeFileSync/Source/Makefile
--- 10.5-0/FreeFileSync/Source/Makefile 2018-10-16 22:14:04.472035798 -0400
+++ 10.5-1/FreeFileSync/Source/Makefile 2018-10-16 22:17:45.141649203 -0400
@@ -121,7 +121,6 @@
../Build/gong.wav \
../Build/harp.wav \
../Build/Resources.zip \
- "../Build/User Manual.pdf" \
$(APPSHAREDIR)
mkdir -p $(DOCSHAREDIR)
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-14 21:39:14.715702415 -0500
@@ -85,8 +85,11 @@
else //OS standard path (XDG layout): ~/.config/FreeFileSync
{
//wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag
- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
- cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync";
+
+ // Fedora 28 does not ship wxgtk 3.1.1...
+ // So subsitute a hard-coded name instead of requesting file layout of XDG
+ //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
+ cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync";
}
#ifdef __GNUC__
......@@ -2,7 +2,7 @@
%global prog2name RealTimeSync
%global dummy_package 0
Name: freefilesync
Version: 10.5
Version: 10.6
Release: 1%{?dist}
Summary: A file synchronization utility
......@@ -18,7 +18,7 @@ Patch0: ffs_include_lz.patch
Patch1: ffs_no_check_updates.patch
Patch2: ffs_no_wx311.patch
Patch3: ffs_fedora.patch
Patch4: ffs_no_user_manual.patch
Patch4: ffs_xdg_config_dir.patch
Packager: B Stack <bgstack15@gmail.com>
BuildRequires: boost-devel
......@@ -134,6 +134,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%ghost %config %attr(666, -, -) %{_datadir}/%{pkgname}/GlobalSettings.xml
%changelog
* Wed Nov 14 2018 B Stack <bgstack15@gmail.com> - 10.6-1
- version bump
* Tue Oct 16 2018 B Stack <bgstack15@gmail.com> - 10.5-1
- version bump
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment