From 0dc6cb5d87d30c851ff292fd1d033c9ea5fb68a2 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Wed, 25 May 2022 13:49:34 -0400 Subject: ffs: rpm rc2 --- freefilesync/freefilesync.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 9ffa82f..5c6bfb8 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -46,7 +46,8 @@ Patch10: revert_zenju_aggressive_upstreamisms.patch Patch11: ffs_traditional_view.patch Patch12: ffs_desktop_notifications.patch Patch13: ffs_openssl.patch -#Patch14: ffs_icon_loader.patch +Patch14: ffs_icon_loader.patch +Patch15: ffs_no_gcc12.patch Packager: B. Stack BuildRequires: brotli-devel @@ -113,7 +114,8 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ # Patch13 openssl is only for openssl < 3.0.0 %patch13 -p1 %endif -#%%patch14 -p1 +%patch14 -p1 +%patch15 -p1 # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags @@ -217,9 +219,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog -* Sun May 22 2022 B. Stack - 11.21-1 +* Wed May 25 2022 B. Stack - 11.21-1 - version bump -- remove icon_loader patch (fixed by upstream) +- add ffs_no_gcc12 patch * Mon Apr 18 2022 B. Stack - 11.20-1 - version bump -- cgit From c2daca42dfabe0840d5a6f54395a2c6830bde95d Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Wed, 25 May 2022 14:49:34 -0400 Subject: disable package note file --- freefilesync/freefilesync.spec | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 5c6bfb8..76d9c4b 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -18,6 +18,11 @@ %if 0%{?rhel} >= 8 %define libssh2_name libssh2-%{name} %endif +%if 0%{?fedora} >= 36 +# https://www.spinics.net/lists/fedora-devel/msg296646.html +# https://fedoraproject.org/wiki/Changes/Package_information_on_ELF_objects +%undefine _package_note_file +%endif Name: freefilesync Version: 11.21 Release: 1%{?dist} -- cgit