Commit 4f39f966 authored by B Stack's avatar B Stack

Merge branch 'freefilesync-bump' into 'master'

freefilesync: bump to 10.5

See merge request !12
parents dd43fdc5 29e67ba7
# 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)
......@@ -2,7 +2,7 @@
%global prog2name RealTimeSync
%global dummy_package 0
Name: freefilesync
Version: 10.4
Version: 10.5
Release: 1%{?dist}
Summary: A file synchronization utility
......@@ -18,6 +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
Packager: B Stack <bgstack15@gmail.com>
BuildRequires: boost-devel
......@@ -48,6 +49,7 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# custom build parameters for packaging application in rpm
%{__sed} \
......@@ -132,6 +134,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%ghost %config %attr(666, -, -) %{_datadir}/%{pkgname}/GlobalSettings.xml
%changelog
* Tue Oct 16 2018 B Stack <bgstack15@gmail.com> - 10.5-1
- version bump
* Mon Sep 10 2018 B Stack <bgstack15@gmail.com> - 10.4-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