From e20d352b56479082360b22fc5656f3bd72ffe358 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sep 06 2018 10:34:39 +0000 Subject: Switch from postgresql-devel to libpq-devel from Fedora 30 onwards --- diff --git a/proftpd.spec b/proftpd.spec index e1c2ad4..4c5eece 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -45,6 +45,13 @@ %global mysql_devel_pkg mariadb-connector-c-devel %endif +# Switch from postgresql-devel to libpq-devel from Fedora 30 onwards +%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} <= 29) +%global postgresql_devel_pkg postgresql-devel +%else +%global postgresql_devel_pkg libpq-devel +%endif + # Do a hardened build where possible %global _hardened_build 1 @@ -52,7 +59,7 @@ %undefine _strict_symbol_defs_build #global prever rc3 -%global rpmrel 17 +%global rpmrel 18 %global mod_vroot_version 0.9.5 Summary: Flexible, stable and highly-configurable FTP server @@ -114,7 +121,7 @@ BuildRequires: perl BuildRequires: perl-interpreter %endif BuildRequires: pkgconfig -BuildRequires: libpq-devel +BuildRequires: %{postgresql_devel_pkg} BuildRequires: sqlite-devel BuildRequires: tar %if 0%{?libwrap_support:1} @@ -190,7 +197,7 @@ Requires: openssl-devel Requires: pam-devel Requires: pcre-devel Requires: pkgconfig -Requires: libpq-devel +Requires: %{postgresql_devel_pkg} Requires: sqlite-devel %if 0%{?libwrap_support:1} Requires: tcp_wrappers-devel @@ -621,6 +628,9 @@ fi %{_mandir}/man1/ftpwho.1* %changelog +* Thu Sep 6 2018 Paul Howarth - 1.3.6-18 +- Switch from postgresql-devel to libpq-devel from Fedora 30 onwards + * Fri Aug 24 2018 Paul Howarth - 1.3.6-17 - Fix infinite loop possible in mod_sftp's set_sftphostkey() function, by actually iterating properly for the next configuration record