summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2018-10-17 02:49:42 +0000
committerB Stack <bgstack15@gmail.com>2018-10-17 02:49:42 +0000
commit4f39f9666e00b6f1cc8a50b8cb96dc4575ca932e (patch)
treec89ca71b9b19f09d45f523aaa9abf84e3aea6a79
parentMerge branch 'waterfox-bump' into 'master' (diff)
parentfreefilesync: bump to 10.5 (diff)
downloadstackrpms-4f39f9666e00b6f1cc8a50b8cb96dc4575ca932e.tar.gz
stackrpms-4f39f9666e00b6f1cc8a50b8cb96dc4575ca932e.tar.bz2
stackrpms-4f39f9666e00b6f1cc8a50b8cb96dc4575ca932e.zip
Merge branch 'freefilesync-bump' into 'master'
freefilesync: bump to 10.5 See merge request bgstack15/stackrpms!12
-rw-r--r--freefilesync/ffs_no_user_manual.patch12
-rw-r--r--freefilesync/freefilesync.spec7
2 files changed, 18 insertions, 1 deletions
diff --git a/freefilesync/ffs_no_user_manual.patch b/freefilesync/ffs_no_user_manual.patch
new file mode 100644
index 0000000..97dde3c
--- /dev/null
+++ b/freefilesync/ffs_no_user_manual.patch
@@ -0,0 +1,12 @@
+# 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 --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 63d8d43..a1d0059 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -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
bgstack15