- added pgsql_disable_* macros for disabling locale and multibyte support

- removed non-existing --enable-unicode-conversion option

Changed files:
    postgresql.spec -> 1.75

diff --git a/postgresql.spec b/postgresql.spec
index 2a88a18461ef6cf7fa76ccfbae61e07149230881..67e54d35a4e0e79639ffb79f1d823c022708f89b 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -539,10 +539,8 @@ rm -fR `find contrib/ -type d -name CVS`
 PATH=$PATH:. ; export PATH
 cd src
 
-
-# NOTE: this doesn't work. 
-#CONFIGURE_OPT=%{pgsql_with_locale?: "--enable-locale"}
-#CONFIGURE_OPT="$CONFIGURE_FLAGS %{pgsql_with_unicode?: --with-mulitbyte=UNICODE}"
+ENABLE_LOCALE="%{!?pgsql_disable_locale:--enable-locale}"
+ENABLE_MULTIBYTE="%{!?pgsql_disable_multibyte:--enable-multibyte}"
 
 aclocal
 autoconf
@@ -552,9 +550,6 @@ autoconf
 %else
        --with-template=linux_%{_target_cpu} \
 %endif
-  --enable-locale \
-  --enable-multibyte \
-  --enable-unicode-conversion \
        --enable-hba \
        --with-odbc \
        --with-odbcinst=%{_sysconfdir} \
@@ -562,7 +557,7 @@ autoconf
        --with-tk \
        --with-python \
        --with-x \
-       --with-perl $CONFIGURE_OPT
+       --with-perl $ENABLE_LOCALE $ENABLE_MULTIBYTE
 
 %{__make} OPT="%{!?debug:$RPM_OPT_FLAGS}%{?debug:-O -g}" \
          TEMPLATEDIR=%{_libdir}/pgsql