OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 19-Jul-2003 11:25:27 Branch: HEAD Handle: 2003071910252502 Modified files: openpkg-src/postgresql postgresql.spec openpkg-web news.txt Log: add optional TCL support Summary: Revision Changes Path 1.67 +24 -9 openpkg-src/postgresql/postgresql.spec 1.5662 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/postgresql/postgresql.spec ============================================================================ $ cvs diff -u -r1.66 -r1.67 postgresql.spec --- openpkg-src/postgresql/postgresql.spec 18 Jul 2003 11:42:37 -0000 1.66 +++ openpkg-src/postgresql/postgresql.spec 19 Jul 2003 09:25:27 -0000 1.67 @@ -40,13 +40,14 @@ Group: Database License: GPL Version: %{V_postgresql} -Release: 20030718 +Release: 20030719 # package options %option with_cxx no %option with_perl no %option with_odbc no %option with_compat no +%option with_tcl no # list of sources Source0: ftp://ftp.postgresql.org/pub/source/v%{V_postgresql}/postgresql-%{V_postgresql}.tar.gz @@ -73,6 +74,10 @@ BuildPreReq: unixodbc PreReq: unixodbc %endif +%if "%{with_tcl}" == "yes" +BuildPreReq: tcl, tcl::with_x11 = yes, X11 +PreReq: tcl, tcl::with_x11 = yes, X11 +%endif AutoReq: no AutoReqProv: no @@ -114,8 +119,13 @@ # configure package CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ +%if "%{with_tcl}" == "yes" + CPPFLAGS="%{l_cppflags tcl} -DOPENSSL_DISABLE_OLD_DES_SUPPORT" \ + LDFLAGS="%{l_ldflags} -L`%{l_prefix}/etc/rc --query x11_libdir`" \ +%else CPPFLAGS="%{l_cppflags} -DOPENSSL_DISABLE_OLD_DES_SUPPORT" \ LDFLAGS="%{l_ldflags}" \ +%endif TAR="%{l_tar}" \ ./configure \ --cache-file=./config.cache \ @@ -124,6 +134,11 @@ --with-openssl=%{l_prefix} \ --with-readline \ --with-zlib \ +%if "%{with_tcl}" == "yes" + --with-tcl \ + --with-tclconfig="%{l_prefix}/lib" \ + --with-tkconfig="%{l_prefix}/lib" \ +%endif --disable-syslog \ --disable-shared @@ -145,7 +160,7 @@ done rm -f libpq++.a ar rc libpq++.a $OBJS - ) + ) || exit $? ( cd libpqxx-%{V_libpqxx} export CC="%{l_cc}" export CXX="%{l_cxx}" @@ -159,7 +174,7 @@ --with-postgres-include=`pwd`/../src/interfaces/libpq \ --disable-shared %{l_make} %{l_mflags -O} - ) + ) || exit $? %endif # build Perl bindings @@ -176,7 +191,7 @@ Makefile.PL %{l_prefix}/bin/perl-openpkg install %{l_prefix}/bin/perl-openpkg epilog - ) + ) || exit $? %endif # build ODBC driver @@ -195,7 +210,7 @@ --with-unixodbc \ --with-odbcinst=%{l_prefix}/etc/unixodbc %{l_make} %{l_mflags -O} - ) + ) || exit $? %endif %install @@ -232,7 +247,7 @@ for man in *.7; do mv $man pg_$man done - ) + ) || exit $? # create additional directories %{l_shtool} mkdir -f -p -m 755 \ @@ -264,7 +279,7 @@ %{l_shtool} install -c -m 644 \ libpq++.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/ - ) + ) || exit $? ( cd libpqxx-%{V_libpqxx} %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/include/pqxx @@ -274,14 +289,14 @@ %{l_shtool} install -c -m 644 \ src/.libs/libpqxx.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/ - ) + ) || exit $? %endif # build ODBC driver %if "%{with_odbc}" == "yes" ( cd psqlodbc-%{V_psqlodbc} %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" - ) + ) || exit $? %endif # install run-command script @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.5661 -r1.5662 news.txt --- openpkg-web/news.txt 19 Jul 2003 09:16:32 -0000 1.5661 +++ openpkg-web/news.txt 19 Jul 2003 09:25:25 -0000 1.5662 @@ -1,3 +1,4 @@ +19-Jul-2003: Upgraded package: P<postgresql-7.3.3-20030719> 19-Jul-2003: Upgraded package: P<tcl-8.4.3-20030719> 19-Jul-2003: Upgraded package: P<openpkg-tool-20030719-20030719> 19-Jul-2003: Upgraded package: P<delegate-8.5.6-20030719> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]