Changeset: 63111ecc162b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/63111ecc162b
Modified Files:
MonetDB.spec
Branch: default
Log Message:
Merge with Dec2025 branch.
diffs (49 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -44,16 +44,13 @@
# If the EPEL repository is available, or if building for Fedora, most
# optional sub packages can be built. We indicate that here by
# setting the macro fedpkgs to 1. If the EPEL repository is not
-# available and we are not building for Fedora, we set fedpkgs to 0.
-%if %{?rhel:1}%{!?rhel:0}
+# available and we are not building for Fedora, we don't set fedpkgs.
+%if 0%{?rhel}
# RedHat Enterprise Linux (or CentOS or Scientific Linux)
%bcond_without epel
%if %{with epel}
# EPEL is enabled through the command line
%global fedpkgs 1
-%else
-# EPEL is not enabled
-%global fedpkgs 0
%endif
%else
# Not RHEL (so presumably Fedora)
@@ -65,7 +62,7 @@
# derivatives (CentOS, Scientific Linux), the geos library is not
# available. However, the geos library is available in the Extra
# Packages for Enterprise Linux (EPEL).
-%if %{fedpkgs} && (0%{?rhel} != 8)
+%if 0%{?fedpkgs} && (0%{?rhel} > 8)
# By default create the MonetDB-geom package on Fedora
%bcond_without geos
%endif
@@ -74,7 +71,7 @@
# operators. Otherwise the POSIX regex functions are used.
%bcond_without pcre
-%if %{fedpkgs}
+%if 0%{?fedpkgs}
# By default, create the MonetDB-cfitsio package.
%bcond_without fits
%endif
@@ -96,7 +93,7 @@ BuildRequires: cmake >= 3.12
BuildRequires: gcc
BuildRequires: bison
BuildRequires: python3-rpm-macros
-%if %{?rhel:1}%{!?rhel:0}
+%if 0%{?rhel} <= 8
# RH 7 (and for readline also 8)
BuildRequires: bzip2-devel
BuildRequires: unixODBC-devel
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
