From c0c670967f8942bc6e8718ec3a3d35e36c8d37ed Mon Sep 17 00:00:00 2001 From: Manvendra Bhangui Date: Mon, 22 May 2023 23:15:42 +0530 Subject: [PATCH] updated spec file for amazonlinux --- indimail-access/indimail-access.spec.in | 8 ++++---- indimail-auth/indimail-auth.spec.in | 7 ++++++- indimail-spamfilter-x/indimail-spamfilter.spec.in | 2 +- indimail-x/indimail.spec.in | 9 +++++++-- indium-x/indium.spec.in | 9 +++++++-- logalert-x/logalert.spec.in | 2 +- pam-multi-x/pam-multi.spec.in | 4 +++- 7 files changed, 29 insertions(+), 12 deletions(-) diff --git a/indimail-access/indimail-access.spec.in b/indimail-access/indimail-access.spec.in index eaa7ab37d..c847f8dfa 100644 --- a/indimail-access/indimail-access.spec.in +++ b/indimail-access/indimail-access.spec.in @@ -48,7 +48,7 @@ %endif %endif -%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} ) +%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} || %{defined amzn} || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} ) %global pythondir %{python3_sitelib} %else %global pythondir %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") @@ -93,7 +93,7 @@ BuildRequires: gzip autoconf automake libtool pkgconfig BuildRequires: sed findutils procps BuildRequires: xz bison flex BuildRequires: gettext-devel -%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} ) +%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} || %{defined amzn} || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} ) BuildRequires: python3 python3-devel %else BuildRequires: python python-devel @@ -176,7 +176,7 @@ echo target_alias %_target_alias echo target_cpu %_target_cpu echo target_os %_target_os echo target_vendor %_target_vendor -%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} ) +%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} || %{defined amzn} || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} ) echo pythondir %{python3_sitelib} %else echo pythondir %{pythondir} @@ -393,7 +393,7 @@ done %lang(ro) /usr/share/indimail/locale/ro/LC_MESSAGES/fetchmail.mo %lang(sr) /usr/share/indimail/locale/sr/LC_MESSAGES/fetchmail.mo -%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} ) +%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} || %{defined amzn} || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} ) %attr(644,root,root) %{python3_sitelib}/__pycache__/*.pyc %attr(755,root,root) %{python3_sitelib}/fetchmailconf.py %else diff --git a/indimail-auth/indimail-auth.spec.in b/indimail-auth/indimail-auth.spec.in index e77ccf172..ce545db7c 100644 --- a/indimail-auth/indimail-auth.spec.in +++ b/indimail-auth/indimail-auth.spec.in @@ -74,7 +74,12 @@ AutoReqProv: Yes BuildRequires: gcc gcc-c++ make autoconf automake libtool BuildRequires: glibc glibc-devel procps binutils BuildRequires: sed findutils gzip coreutils grep -BuildRequires: mysql-devel pam-devel libqmail-devel libqmail +BuildRequires: pam-devel libqmail-devel libqmail +%if %{defined amzn} +BuildRequires: mariadb-connector-c-devel +%else +BuildRequires: mysql-devel +%endif ################################# OBS ############################### %if %build_on_obs == 1 diff --git a/indimail-spamfilter-x/indimail-spamfilter.spec.in b/indimail-spamfilter-x/indimail-spamfilter.spec.in index af4cf5b98..0d8a20299 100644 --- a/indimail-spamfilter-x/indimail-spamfilter.spec.in +++ b/indimail-spamfilter-x/indimail-spamfilter.spec.in @@ -70,7 +70,7 @@ BuildRequires: flex bison %if 0%{?suse_version} BuildRequires: db-devel %else -%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} +%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined amzn} || %{defined mgaversion} BuildRequires: libdb-devel %else BuildRequires: db4-devel diff --git a/indimail-x/indimail.spec.in b/indimail-x/indimail.spec.in index c1541cc78..fc7bb6565 100644 --- a/indimail-x/indimail.spec.in +++ b/indimail-x/indimail.spec.in @@ -1,6 +1,6 @@ # # -# $Id: indimail.spec.in,v 1.133 2023-05-22 20:58:23+05:30 Cprogrammer Exp mbhangui $ +# $Id: indimail.spec.in,v 1.134 2023-05-22 23:14:09+05:30 Cprogrammer Exp mbhangui $ %undefine _missing_build_ids_terminate_build %global _unpackaged_files_terminate_build 1 @@ -104,7 +104,12 @@ BuildRequires: openssl-devel rpm coreutils grep BuildRequires: glibc glibc-devel openssl procps ncurses-devel BuildRequires: gzip autoconf automake libtool pkgconfig BuildRequires: sed findutils binutils -BuildRequires: mysql-devel libgsasl-devel +BuildRequires: libgsasl-devel +%if %{defined amzn} +BuildRequires: mariadb-connector-c-devel +%else +BuildRequires: mysql-devel +%endif BuildRequires: libqmail-devel > 1.1 Requires: libqmail > 1.1 diff --git a/indium-x/indium.spec.in b/indium-x/indium.spec.in index b3bf99154..150f01f81 100644 --- a/indium-x/indium.spec.in +++ b/indium-x/indium.spec.in @@ -1,6 +1,6 @@ # # -# $Id: indium.spec.in,v 1.29 2023-05-14 09:49:08+05:30 Cprogrammer Exp mbhangui $ +# $Id: indium.spec.in,v 1.30 2023-05-22 23:15:01+05:30 Cprogrammer Exp mbhangui $ %undefine _missing_build_ids_terminate_build %global _unpackaged_files_terminate_build 1 @@ -61,7 +61,12 @@ BuildRequires: tcl-devel rpm gcc gcc-c++ make coreutils grep BuildRequires: tk-devel glibc glibc-devel procps tcl tk cpio BuildRequires: sed gettext-devel BuildRequires: findutils -BuildRequires: gzip autoconf mysql-devel +BuildRequires: gzip autoconf +%if %{defined amzn} +BuildRequires: mariadb-connector-c-devel +%else +BuildRequires: mysql-devel +%endif %if %{undefined centos_version} && %{undefined rhel_version} && %{undefined sles_version} && %{undefined fedora} && %{undefined rhel} BuildRequires: chrpath diff --git a/logalert-x/logalert.spec.in b/logalert-x/logalert.spec.in index 11abdf77d..054c06fea 100644 --- a/logalert-x/logalert.spec.in +++ b/logalert-x/logalert.spec.in @@ -49,7 +49,7 @@ BuildRequires: gcc gcc-c++ make autoconf automake %if %{defined suse_version} || %{defined sles_version} BuildRequires: bison %endif -%if 0%{?fedora_version} > 27 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined mgaversion} +%if 0%{?fedora_version} > 27 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined amzn} || %{defined mgaversion} BuildRequires: libtirpc libtirpc-devel %endif %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 diff --git a/pam-multi-x/pam-multi.spec.in b/pam-multi-x/pam-multi.spec.in index e72c7ece1..cb96fc0c0 100644 --- a/pam-multi-x/pam-multi.spec.in +++ b/pam-multi-x/pam-multi.spec.in @@ -45,7 +45,9 @@ Source: http://downloads.sourceforge.net/indimail/%{name}-%{version}.tar.gz URL: http://www.indimail.org BuildRequires: pam-devel -%if %build_on_obs == 1 +%if %{defined amzn} +BuildRequires: mariadb-connector-c-devel +%else BuildRequires: mysql-devel %endif %if %{undefined centos_version} && %{undefined rhel_version} && %{undefined sles_version}