Recommend logrotate rather than hard requiring

This makes it possible for the flatpak module builds (libreoffice flatpak) to avoid logrotate dep that doesn't make sense inside flatpak containers. Using Recommends instead of Requires still means that it gets pulled in by default for regular fedora rpm installs, but users can exclude the package if they have to.
Remove requires on systemd-units as per updated guidelines
2021-10-10 18:24:29 +02:00 · 2021-10-08 11:56:57 +02:00 · 2021-10-08 11:56:56 +02:00 · 2021-08-20 10:54:46 +02:00
3 changed files with 21314 additions and 8 deletions
--- a/firebird.spec
+++ b/firebird.spec
@ -10,7 +10,7 @@

 Name:           firebird
 Version:        %{upversion}
-Release:        2%{?dist}
+Release:        5%{?dist}

 Summary:        SQL relational database management system
 License:        Interbase
@ -32,8 +32,8 @@ Patch205:       cloop-honour-build-flags.patch
 # from upstream
 Patch301:       c++17.patch
 Patch302:       noexcept.patch
-# Firebird 4 have build issues (bz 1969393)
-ExcludeArch:    s390x
+Patch303:       fix_build_on_big_endian_platforms.patch
+Patch304:       ttmath-abseil.4.0.0.patch

 BuildRequires: autoconf
 BuildRequires: automake
@ -44,7 +44,7 @@ BuildRequires: libicu-devel
 BuildRequires: libedit-devel
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-static
-BuildRequires: systemd-units
+BuildRequires: systemd-rpm-macros
 BuildRequires: chrpath
 BuildRequires: zlib-devel
 BuildRequires: procmail
@ -57,10 +57,7 @@ Requires(postun): /usr/sbin/userdel
 Requires(postun): /usr/sbin/groupdel
 Requires(pre):    /usr/sbin/groupadd
 Requires(pre):    /usr/sbin/useradd
-Requires(post):   systemd-units
-Requires(preun):  systemd-units
-Requires(postun): systemd-units
-Requires:       logrotate
+Recommends:     logrotate
 Requires:       libfbclient2 = %{version}-%{release}
 Requires:       libib-util = %{version}-%{release}
 Requires:       %{name}-utils = %{version}-%{release}
@ -200,8 +197,16 @@ in production systems, under a variety of names, since 1981.
 %patch205 -p1
 %patch301 -p1
 %patch302 -p1
+%ifarch s390x
+%patch303 -p1
+%patch304 -p1
+%endif
+

 %build
+%ifarch s390x
+%global _lto_cflags %{nil}
+%endif
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 export CXXFLAGS="${CFLAGS} -fno-delete-null-pointer-checks"
 NOCONFIGURE=1 ./autogen.sh
@ -371,6 +376,16 @@ fi


 %changelog
+* Sun Oct 10 2021 Kalev Lember <klember@redhat.com> - 4.0.0.2496-5
+- Recommend logrotate rather than hard requiring
+
+* Fri Oct 08 2021 Kalev Lember <klember@redhat.com> - 4.0.0.2496-4
+- BuildRequire systemd-rpm-macros instead of systemd-units
+- Remove requires on systemd-units as per updated guidelines
+
+* Fri Aug 20 2021 Philippe Makowski <makowski@fedoraproject.org> - 4.0.0.2496-3
+- Fix build on s390x (#1969393)
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0.2496-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

--- a/fix_build_on_big_endian_platforms.patch
+++ b/fix_build_on_big_endian_platforms.patch
@ -0,0 +1,36 @@
+From cd0682bc55eb01d53278d09edc1e9e2e9bfb9983 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Fri, 11 Jun 2021 12:39:31 +0200
+Subject: [PATCH] fix build on big endian platforms (#6852)
+
+* fix missing declaration of type_alignments[] for big endian platforms
+* add missing definition of lwp for big endian platforms
+---
+ src/jrd/sort.cpp | 1 +
+ src/jrd/sort.h   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/jrd/sort.cpp b/src/jrd/sort.cpp
+index 37f5f816407..77ca69c2536 100644
+--- a/src/jrd/sort.cpp
+++ b/src/jrd/sort.cpp
+@@ -713,6 +713,7 @@ void Sort::diddleKey(UCHAR* record, bool direction, bool duplicateHandling)
+ 	for (sort_key_def* key = m_description.begin(), *end = m_description.end(); key < end; key++)
+ 	{
+ 		UCHAR* p = record + key->getSkdOffset();
+		SORTP* lwp = (SORTP*) p;
+ 		USHORT n = key->getSkdLength();
+ 		USHORT complement = key->skd_flags & SKD_descending;
+ 
+diff --git a/src/jrd/sort.h b/src/jrd/sort.h
+index 8e23e70ccc5..e3bbbb7779c 100644
+--- a/src/jrd/sort.h
+++ b/src/jrd/sort.h
+@@ -27,6 +27,7 @@
+ #include "../include/fb_blk.h"
+ #include "../common/DecFloat.h"
+ #include "../jrd/TempSpace.h"
+#include "../jrd/align.h"
+ 
+ namespace Jrd {
+ 
--- a/ttmath-abseil.4.0.0.patch
+++ b/ttmath-abseil.4.0.0.patch
Author	SHA1	Message	Date
Kalev Lember	b609bd4fdb	Recommend logrotate rather than hard requiring This makes it possible for the flatpak module builds (libreoffice flatpak) to avoid logrotate dep that doesn't make sense inside flatpak containers. Using Recommends instead of Requires still means that it gets pulled in by default for regular fedora rpm installs, but users can exclude the package if they have to.	2021-10-10 18:24:29 +02:00
Kalev Lember	2f20c35175	Remove requires on systemd-units as per updated guidelines There is no need to have them as systemd correctly handles reloading depending on the transaction ordering (even if systemd is installed _after_ the package that installs the unit file).	2021-10-08 11:56:57 +02:00
Kalev Lember	4c47f59674	BuildRequire systemd-rpm-macros instead of systemd-units The package that ships %systemd_post/postun/preun macros is systemd-rpm-macros.	2021-10-08 11:56:56 +02:00
Philippe Makowski	77c392bbb4	Fix build on s390x (#1969393 )	2021-08-20 10:54:46 +02:00