summaryrefslogtreecommitdiff
path: root/freefilesync/freefilesync.spec
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-05-18 09:59:30 -0400
committerB Stack <bgstack15@gmail.com>2020-05-18 09:59:30 -0400
commit153102526bc32494fecb8b31d26bc4a4b6635981 (patch)
tree6e6a92465f8aab5a96771133abf00c3941ca876a /freefilesync/freefilesync.spec
parentffs 10.24 gtk2 build (diff)
downloadstackrpms-153102526bc32494fecb8b31d26bc4a4b6635981.tar.gz
stackrpms-153102526bc32494fecb8b31d26bc4a4b6635981.tar.bz2
stackrpms-153102526bc32494fecb8b31d26bc4a4b6635981.zip
ffs rpm rc1 for 10.24
Diffstat (limited to 'freefilesync/freefilesync.spec')
-rw-r--r--freefilesync/freefilesync.spec14
1 files changed, 11 insertions, 3 deletions
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 6b28b26..914c333 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -1,6 +1,7 @@
%global pkgname FreeFileSync
%global prog2name RealTimeSync
%global dummy_package 0
+%define debug_package %{nil}
%define min_libcurl %{nil}
%define min_libssh2 %{nil}
%define min_openssl %{nil}
@@ -18,7 +19,7 @@
%define libssh2_name libssh2-%{name}
%endif
Name: freefilesync
-Version: 10.23
+Version: 10.24
Release: 1%{?dist}
Summary: A file synchronization utility
@@ -41,6 +42,7 @@ Patch6: ffs_libssh2.patch
Patch7: ffs_curl.patch
Patch8: ffs_bit.patch
Patch9: ffs_no_eraseif.patch
+Patch10: revert_zenju_aggressive_upstreamisms.patch
Packager: B Stack <bgstack15@gmail.com>
# WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system.
@@ -91,7 +93,7 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \
# use the el patch
%patch5 -p1
%else
-# use the fedora patch
+# use the fedora patch, even for el8
%patch4 -p1
%endif
%patch6 -p1
@@ -100,12 +102,13 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \
%patch8 -p1
%patch9 -p1
%endif
+%patch10 -p1
# custom build parameters for packaging application in rpm
# fedora provides build_cxxflags, which is really just optflags
%{__sed} \
-e 's|-O3 -DNDEBUG|-DNDEBUG -D"warn_static(arg)= " -DZEN_LINUX %{?build_cxxflags:%{build_cxxflags}}%{!?build_cxxflags:%{optflags}}|g' \
- -e '/LINKFLAGS/s|-s|%{__global_ldflags}|;' \
+ -e '/linkFlags/s|-s|%{__global_ldflags}|;' \
-i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile
%build
@@ -202,6 +205,11 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
%ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
%changelog
+* Mon May 18 2020 B Stack <bgstack15@gmail.com> - 10.24-1
+- version bump
+- add revert_zenju_aggressive_upstreamisms.patch
+- disable debug package
+
* Tue Apr 21 2020 B Stack <bgstack15@gmail.com> - 10.23-1
- version bump
- remove ffs_libssl.patch
bgstack15