summaryrefslogtreecommitdiff
path: root/support-files/mysql.spec.sh
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-04-12 16:20:10 +0200
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-04-12 16:20:10 +0200
commit7901b9e9e58e279766c18bb6a4f0c2056cb6be5a (patch)
treec8c5271c1ad95fdbaa53508f09927abbdcfe4898 /support-files/mysql.spec.sh
parentb4068bb2fe824ef468e5037d08e73f497e2fc4f0 (diff)
downloadmariadb-git-7901b9e9e58e279766c18bb6a4f0c2056cb6be5a.tar.gz
More fixes/cleanups.
Diffstat (limited to 'support-files/mysql.spec.sh')
-rw-r--r--support-files/mysql.spec.sh30
1 files changed, 15 insertions, 15 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 623faf9b0fd..fc964950c31 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -33,9 +33,15 @@
%define release 1
-# Macros we use which are not available in all versions of RPM
-%if 0%{defined expand}
+#
+# Macros we use which are not available in all supported versions of RPM
+#
+# - defined/undefined are missing on RHEL4
+#
+%if %{expand:%{?defined:0}%{!?defined:1}}
%define defined() %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
+%endif
+%if %{expand:%{?undefined:0}%{!?undefined:1}}
%define undefined() %{expand:%%{?%{1}:0}%%{!?%{1}:1}}
%endif
@@ -100,6 +106,13 @@
%endif
# ----------------------------------------------------------------------------
+# Server suffix and package name
+# ----------------------------------------------------------------------------
+%if %{undefined server_suffix}
+%define server_suffix %{nil}
+%endif
+
+# ----------------------------------------------------------------------------
# Distribution support
# ----------------------------------------------------------------------------
#
@@ -144,19 +157,6 @@
%endif
# ----------------------------------------------------------------------------
-# Build with yaSSL support (off by default)
-# ----------------------------------------------------------------------------
-%{?_with_yassl:%define YASSL_BUILD 1}
-%{!?_with_yassl:%define YASSL_BUILD 0}
-
-# ----------------------------------------------------------------------------
-# Build using the bundled zlib (on by default)
-# ----------------------------------------------------------------------
-%{!?_with_bundled_zlib:%{!?_without_bundled_zlib:%define WITH_BUNDLED_ZLIB 1}}
-%{?_with_bundled_zlib:%define WITH_BUNDLED_ZLIB 1}
-%{?_without_bundled_zlib:%define WITH_BUNDLED_ZLIB 0}
-
-# ----------------------------------------------------------------------------
# Support optional "tcmalloc" library (experimental)
# ----------------------------------------------------------------------------
%{?malloc_lib_target:%define WITH_TCMALLOC 1}