updated spec files for copr builds

indimail · May 11, 2023 · a5c9ab4 · a5c9ab4
1 parent fe3af38
commit a5c9ab4
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/indimail-access/doc/ChangeLog b/indimail-access/doc/ChangeLog
@@ -23,6 +23,8 @@ Release 1.1.1-1.1 Start 01/03/2021 End 23/04/2023
 - 23/04/2023 - indimail-3.4.4
 - 06/05/2023
 50. upgraded courier-imap to 5.2.4
+- 12/05/2023
+51. indimail-access.spec: updated for copr builds
 
 * Thu 08 Sep 2022 14:38:16 +0000 Manvendra Bhangui <indimail-access@indimail.org> 1.1.0-1.1%{?dist}
 Release 1.1.0-1.1 Start 01/03/2021 End 08/09/2022

diff --git 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%{?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 || ( 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%{?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 || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} )
 BuildRequires: python3 python3-devel
 %else
 BuildRequires: python python-devel
@@ -184,7 +184,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%{?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 || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} )
 echo pythondir      %{python3_sitelib}
 %else
 echo pythondir      %{pythondir}
@@ -400,7 +400,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%{?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 || ( 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-spamfilter-x/doc/ChangeLog b/indimail-spamfilter-x/doc/ChangeLog
@@ -26,3 +26,5 @@ Release 1.0.0-1.1 Start 06/06/2020 End 28/03/2023
 - 28/03/2023
 10. format.c: fix format for '%'
 - 23/04/2023 - indimail-3.4.4
+- 12/05/2023
+11. indimail-spamfilter.spec: updated for copr builds
diff --git 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} > 17 || 0%{?centos_version} > 600 || 0%{?rhel_version} > 600 || 0%{?centos_ver} > 7 || 0%{?scientificlinux_version} > 600 || 0%{?openeuler_version} > 2000 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700
+%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
 BuildRequires: libdb-devel
 %else
 BuildRequires: db4-devel
@@ -131,7 +131,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
+%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
 echo pythondir      %{python3_sitelib}
 %else
 echo pythondir      %{pythondir}

diff --git a/indimail-x/doc/ChangeLog b/indimail-x/doc/ChangeLog
@@ -6,6 +6,8 @@ Release 3.4.5-1.1 Start 25/04/2023 End XX/XX/XXXX
 03. roundcubemail.te: selinux module for roundcubemail
 - 11/05/2023
 04. crc.c: define SYS_OPEN on the basis of openat is present or not
+- 12/05/2023
+05. indimail.spec: updated for copr builds
 
 * Sun Apr 23 2023 19:21:03 +0000 Manvendra Bhangui <indimail-virtualdomains@indimail.org> 3.4.4-1.1%{?dist}
 Release 3.4.4-1.1 Start 26/03/2023 End 23/04/2023

diff --git a/indimail-x/indimail.spec.in b/indimail-x/indimail.spec.in
@@ -1,6 +1,6 @@
 #
 #
-# $Id: indimail.spec.in,v 1.130 2023-05-06 21:24:45+05:30 Cprogrammer Exp mbhangui $
+# $Id: indimail.spec.in,v 1.131 2023-05-12 00:50:49+05:30 Cprogrammer Exp mbhangui $
 %undefine _missing_build_ids_terminate_build
 %global _unpackaged_files_terminate_build 1
 
@@ -19,7 +19,7 @@
 %global debug_package      %{nil}
 %endif
 
-%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7
+%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?fedora} > 30 || 0%{?rhel} > 7
 %global pythondir %{python3_sitelib}
 %else
 %global pythondir %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
@@ -109,8 +109,9 @@ BuildRequires: mysql-devel libgsasl-devel
 BuildRequires: libqmail-devel > 1.1
 Requires: libqmail > 1.1
 
+%if %{undefined copr_build}
 %if %build_on_obs == 0
-%if %{defined fedora_version} || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7
+%if %{defined fedora_version} || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || %{defined fedora} || 0%{?rhel} > 7
 BuildRequires: redhat-lsb-core
 %endif
 %if %{defined rhel_version}
@@ -122,6 +123,7 @@ BuildRequires: redhat-lsb
 %endif
 %endif
 %endif
+%endif
 
 # suse_version gets defined for sles too
 %if %{defined suse_version}
@@ -171,10 +173,10 @@ Requires: mysql-libs
 %endif
 %endif
 
-%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7
+%if %{defined fedora_version} || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || %{defined fedora} || 0%{?rhel} > 7
 Requires: python3-policycoreutils
 %else
-%if %{defined centos_version} || %{defined rhel_version} || %{defined centos_ver}
+%if %{defined centos_version} || %{defined rhel_version} || %{defined centos_ver} || %{defined rhel}
 Requires: policycoreutils-python
 %endif
 %endif