- [jdbc] BR += jakarta-ant.

Changed files:
    postgresql.spec -> 1.270

diff --git a/postgresql.spec b/postgresql.spec
index df450b03343700e34c39ee8145bcbd7a97bf176e..7ca1b0cb4d0cba3ac573f33d9bd315b97b3b1d2b 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -10,7 +10,7 @@
 %bcond_without pgsql_locale            # disable PostgreSQL locale
 %bcond_without pgsql_multibyte         # disable PostgreSQL multibyte
 %bcond_without python                  # disable python support
-%bcond_with    jdbc                    # enable JDBC driver
+%bcond_with    jdbc                    # build JDBC interface and Java tools
 %bcond_with    absolute_dbpaths        # enable absolute paths to create database
                                        # (disabled by default because it is a security risk)
 
@@ -56,6 +56,7 @@ BuildRequires:        automake
 BuildRequires: flex
 BuildRequires: gettext-devel
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
+%{?with_jdbc:BuildRequires:    jakarta-ant >= 1.5}
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
@@ -821,7 +822,7 @@ install /usr/share/automake/config.* config
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
        $RPM_BUILD_ROOT{/var/{lib/pgsql,log},%{_pgsqldir}} \
-       $RPM_BUILD_ROOT%{_mandir} \
+       $RPM_BUILD_ROOT{%{_mandir},%{_javadir}} \
        $RPM_BUILD_ROOT/home/services/postgres
 
 %{__make} install install-all-headers \
@@ -846,6 +847,11 @@ touch $RPM_BUILD_ROOT/var/log/pgsql
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/postgresql
 
+%if %{with jdbc}
+mv     $RPM_BUILD_ROOT%{_datadir}/postgresql/java/*.jar \
+       $RPM_BUILD_ROOT%{_javadir}
+%endif
+
 install -d howto
 ( cd howto
   tar xzf $RPM_SOURCE_DIR/pgsql-Database-HOWTO-html.tar.gz
@@ -974,6 +980,11 @@ fi
 %{_datadir}/postgresql/*.sql
 %{_datadir}/postgresql/*.txt
 
+%if %{with jdbc}
+#{_javadir}/postgresql-exmaples.jar
+%{_javadir}/postgresql.jar
+%endif
+
 %attr(700,postgres,postgres) /home/services/postgres
 %attr(700,postgres,postgres) %dir /var/lib/pgsql
 %attr(640,postgres,postgres) %config(noreplace) %verify(not md5 size mtime) /var/log/pgsql