From 16404f9a3a0a8be665e6f4dab9eec1869c16ff4a Mon Sep 17 00:00:00 2001 From: wrobell Date: Wed, 5 Nov 2003 10:29:42 +0000 Subject: [PATCH] - merged DEVEL branch Changed files: postgresql-conf.patch -> 1.2 postgresql-configure.patch -> 1.8 postgresql-link.patch -> 1.2 postgresql-pg_ctl-nopsql.patch -> 1.2 postgresql.spec -> 1.218 --- postgresql-conf.patch | 40 +++++++-------- postgresql-configure.patch | 8 +-- postgresql-link.patch | 20 ++++---- postgresql-pg_ctl-nopsql.patch | 25 +++------- postgresql.spec | 90 ++++++++++++++-------------------- 5 files changed, 77 insertions(+), 106 deletions(-) diff --git a/postgresql-conf.patch b/postgresql-conf.patch index a909b61..edfbb18 100644 --- a/postgresql-conf.patch +++ b/postgresql-conf.patch @@ -1,27 +1,27 @@ -diff -Nur postgresql-7.3.1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-7.3.1/src/backend/utils/misc/postgresql.conf.sample ---- postgresql-7.3.1.orig/src/backend/utils/misc/postgresql.conf.sample Mon Sep 2 07:42:54 2002 -+++ postgresql-7.3.1/src/backend/utils/misc/postgresql.conf.sample Mon Jan 6 13:48:31 2003 -@@ -121,8 +121,8 @@ - # log, info, notice, warning, error - #silent_mode = false +--- postgresql-7.4beta1/src/backend/utils/misc/postgresql.conf.sample 2003-08-08 22:41:16.000000000 +0200 ++++ postgresql-7.4beta1/src/backend/utils/misc/postgresql.conf.sample.new 2003-08-08 22:40:08.000000000 +0200 +@@ -137,9 +137,9 @@ --#log_connections = false --#log_pid = false -+log_connections = true -+log_pid = true - #log_statement = false - #log_duration = false - #log_timestamp = false -@@ -144,9 +144,9 @@ - # - # Syslog - # --#syslog = 0 # range 0-2 + # - Syslog - + +-#syslog = 0 # range 0-2; 0=stdout; 1=both; 2=syslog -#syslog_facility = 'LOCAL0' -#syslog_ident = 'postgres' -+syslog = 2 # range 0-2 ++syslog = 2 # range 0-2; 0=stdout; 1=both; 2=syslog +syslog_facility = 'LOCAL0' +syslog_ident = 'postgres' + # - When to Log - - # +@@ -170,9 +170,9 @@ + #debug_print_rewritten = false + #debug_print_plan = false + #debug_pretty_print = false +-#log_connections = false ++log_connections = true + #log_duration = false +-#log_pid = false ++log_pid = true + #log_statement = false + #log_timestamp = false + #log_hostname = false diff --git a/postgresql-configure.patch b/postgresql-configure.patch index 07581d6..233b91f 100644 --- a/postgresql-configure.patch +++ b/postgresql-configure.patch @@ -1,12 +1,12 @@ -diff -Nur postgresql-7.3.4.orig/configure.in postgresql-7.3.4/configure.in ---- postgresql-7.3.4.orig/configure.in Sun Feb 2 20:56:45 2003 -+++ postgresql-7.3.4/configure.in Wed Feb 5 11:25:49 2003 +diff -Nur postgresql-7.3.2.orig/configure.in postgresql-7.3.2/configure.in +--- postgresql-7.3.2.orig/configure.in Sun Feb 2 20:56:45 2003 ++++ postgresql-7.3.2/configure.in Wed Feb 5 11:25:49 2003 @@ -20,9 +20,7 @@ dnl The GNU folks apparently haven't heard that some people don't use dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". m4_define([info], [doc]) -m4_define([infodir], [docdir]) - AC_INIT([PostgreSQL], [7.3.4], [pgsql-bugs@postgresql.org]) + AC_INIT([PostgreSQL], [7.4RC1], [pgsql-bugs@postgresql.org]) -m4_undefine([infodir]) m4_undefine([info]) AC_SUBST(docdir) diff --git a/postgresql-link.patch b/postgresql-link.patch index c1d58b1..98cfb56 100644 --- a/postgresql-link.patch +++ b/postgresql-link.patch @@ -1,6 +1,6 @@ ---- postgresql-7.3.2/configure.in.orig Wed Mar 12 00:19:05 2003 -+++ postgresql-7.3.2/configure.in Wed Mar 12 00:31:28 2003 -@@ -599,12 +599,13 @@ +--- postgresql-7.4beta1/configure.in.orig 2003-08-05 00:30:30.000000000 +0200 ++++ postgresql-7.4beta1/configure.in 2003-08-09 08:01:18.000000000 +0200 +@@ -614,12 +614,13 @@ if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then @@ -16,7 +16,7 @@ AC_CHECK_LIB(socket, main) AC_CHECK_LIB(ipc, main) AC_CHECK_LIB(IPC, main) -@@ -615,13 +615,13 @@ +@@ -630,6 +631,6 @@ AC_CHECK_LIB(BSD, main) AC_CHECK_LIB(gen, main) AC_CHECK_LIB(PW, main) @@ -24,11 +24,13 @@ +dnl AC_CHECK_LIB(resolv, main) AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt]) # QNX: - AC_CHECK_LIB([[unix]], main) - AC_SEARCH_LIBS(crypt, crypt) +@@ -639,7 +640,8 @@ # BeOS: --AC_CHECK_LIB(bind, __inet_ntoa) -+AC_CHECK_FUNC(inet_ntoa, ,[AC_CHECK_LIB(bind, __inet_ntoa)]) + if test "$PORTNAME" = "beos" + then +- AC_CHECK_LIB(bind, __inet_ntoa) ++ dnl AC_CHECK_LIB(bind, __inet_ntoa) ++ AC_CHECK_FUNC(inet_ntoa, ,[AC_CHECK_LIB(bind, __inet_ntoa)]) + fi # Solaris: AC_SEARCH_LIBS(fdatasync, [rt posix4]) - # Cygwin: diff --git a/postgresql-pg_ctl-nopsql.patch b/postgresql-pg_ctl-nopsql.patch index 778c7c3..f373afc 100644 --- a/postgresql-pg_ctl-nopsql.patch +++ b/postgresql-pg_ctl-nopsql.patch @@ -1,6 +1,6 @@ ---- src/bin/pg_ctl/pg_ctl.sh Sat Sep 29 05:09:32 2001 -+++ src/bin/pg_ctl/pg_ctl.sh.mis Mon Mar 24 23:16:48 2002 -@@ -96,12 +96,12 @@ +--- src/bin/pg_ctl/pg_ctl.sh.orig 2003-08-05 01:59:39.000000000 +0200 ++++ src/bin/pg_ctl/pg_ctl.sh 2003-08-08 22:04:34.000000000 +0200 +@@ -98,12 +98,12 @@ fi # Check if needed programs actually exist in path @@ -11,21 +11,8 @@ +elif [ -x "$bindir/postmaster" ]; then PGPATH="$bindir" else -- echo "The programs 'postmaster' and 'psql' are needed by $CMDNAME but" 1>&2 -+ echo "The program 'postmaster' is needed by $CMDNAME but" 1>&2 - echo "were not found in the directory '$bindir'." 1>&2 +- echo "The programs \"postmaster\" and \"psql\" are needed by $CMDNAME but" 1>&2 ++ echo "The programs \"postmaster\" is needed by $CMDNAME but" 1>&2 + echo "were not found in the directory \"$bindir\"." 1>&2 echo "Check your installation." 1>&2 exit 1 -@@ -370,8 +370,10 @@ - # 6) If the dynamic loader is not set up correctly (for this user/at - # this time), psql will fail (to find libpq). - # 7) If psql is misconfigured, this may fail. -- if "$PGPATH/psql" -l >/dev/null 2>&1 -- then -+ -+# YES, this is horribly misconceived. -+ -+ if ps -C postmaster >/dev/null 2>&1; then - break; - else - $silence_echo $ECHO_N "."$ECHO_C diff --git a/postgresql.spec b/postgresql.spec index 4cef902..d660759 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -7,12 +7,14 @@ # routine and send it to postgresql team... # # Conditional build: -# _with_jdbc - with JDBC driver -# _with_absolute_dbpaths - allow absolute paths to create database -# (disallowed by default because it is a security risk) -# +%bcond_without tcl # disables Tcl support +%bcond_with jdbc # enable JDBC driver +%bcond_with absolute_dbpaths # enable absolute paths to create database + # (disabled by default because it is a security risk) %include /usr/lib/rpm/macros.python + +%define _rc RC1 Summary: PostgreSQL Data Base Management System Summary(de): PostgreSQL Datenbankverwaltungssystem @@ -25,12 +27,12 @@ Summary(tr): Veri Taban Summary(uk): PostgreSQL - ÓÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ÂÁÚÁÍÉ ÄÁÎÉÈ Summary(zh_CN): PostgreSQL ¿Í»§¶Ë³ÌÐòºÍ¿âÎļþ Name: postgresql -Version: 7.3.4 -Release: 0.2 +Version: 7.4 +Release: 0.1.%{_rc} License: BSD Group: Applications/Databases -Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 82878d6d74c36384af3595d26ed38067 +Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}%{_rc}.tar.bz2 +# Source0-md5: ac449e3b83f226476cedfc09bef30ead Source1: %{name}.init Source2: pgsql-Database-HOWTO-html.tar.gz # Source2-md5: 5b656ddf1db41965761f85204a14398e @@ -43,10 +45,9 @@ Patch4: %{name}-absolute_dbpaths.patch Patch5: %{name}-link.patch Icon: postgresql.xpm URL: http://www.postgresql.org/ -BuildRequires: XFree86-devel BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool +BuildRequires: bison >= 1.875 BuildRequires: ncurses-devel >= 5.0 BuildRequires: openssl-devel >= 0.9.7c BuildRequires: pam-devel @@ -54,8 +55,8 @@ BuildRequires: perl-devel BuildRequires: python-devel >= 2.3 BuildRequires: readline-devel >= 4.2 BuildRequires: rpm-pythonprov -BuildRequires: tcl-devel >= 8.4.3 -BuildRequires: tk-devel >= 8.4.3 +%{?with_tcl:BuildRequires: tcl-devel >= 8.4.3} +%{?with_tcl:BuildRequires: tk-devel >= 8.4.3} BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) PreReq: rc-scripts @@ -412,34 +413,6 @@ C++, PERL ôÅÐÅÒ ÐÁËÅÔÉ Ú Â¦Â̦ÏÔÅËÁÍÉ ÄÌÑ Ò¦ÚÎÉÈ ÍÏ× ÐÒÏÇÒÁÍÕ×ÁÎÎÑ (C, C++, PERL ¦ TCL) ÒÏÚĦÌÅΦ. ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ Ô¦ÌØËÉ Â¦Â̦ÏÔÅËÉ ÄÌÑ ÍÏ×É C. -%package -n python-postgresql -Summary: The python-based client programs needed for accessing a PostgreSQL server -Summary(es): Módulo Python para acceder un servidor PostgreSQL -Summary(pl): Programy klienckie do dostêpu do serwera PostgreSQL napisane w Pythonie -Summary(pt_BR): Módulo Python para acesso ao servidor PostgreSQL -Summary(zh_CN): Python ³ÌÐò·ÃÎÊ PostgreSQL Êý¾Ý¿âËùÐèµÄ¿ª·¢Ä£¿é -Group: Libraries/Python -Requires: python >= 2.0 -Requires: python-mx-DateTime -Requires: %{name}-libs = %{version} -Obsoletes: python-PyGreSQL -Obsoletes: postgresql-python - -%description -n python-postgresql -postgresql-python includes the python-based client programs and client -libraries that you'll need to access a PostgreSQL database management -system server. - -%description -n python-postgresql -l es -Módulo Python para acceder un servidor PostgreSQL. - -%description -n python-postgresql -l pl -Pakiet ten zawiera napisane w Pythonie programy i biblioteki klienckie -do dostêpu do serwera baz danych PostgreSQL. - -%description -n python-postgresql -l pt_BR -Módulo Python para acesso ao servidor PostgreSQL. - %package doc Summary: Documentation for PostgreSQL Summary(pl): Dodatkowa dokumantacja dla PostgreSQL @@ -728,7 +701,7 @@ proceduralnego PL/TCL dla swojej bazy danych. Summary: Cryptographic functions for PostgreSQL Summary(pl): Funkcje kryptograficzne dla PostgreSQL Group: Applications/Databases -Requires: %{name} = %{version} +Requires: %{name} = %{version} %description module-pgcrypto Cryptographic functions for PostgreSQL. @@ -737,7 +710,7 @@ Cryptographic functions for PostgreSQL. Funkcje kryptograficzne dla PostgreSQL. %prep -%setup -q +%setup -q -n %{name}-%{version}%{_rc} %patch0 -p1 %patch1 -p1 %patch2 -p0 @@ -766,8 +739,8 @@ rm -f config/libtool.m4 --enable-syslog \ --enable-unicode-conversion \ --with-CXX \ - --with-tcl \ - --with-tk \ + %{?with_tcl:--with-tcl} \ + %{?with_tcl:--with-tk} \ --with-pam \ --with-perl \ --with-python \ @@ -780,8 +753,8 @@ rm -f config/libtool.m4 %{!?_without_tests: %{__make} check } %endif -cd contrib/pgcrypto -%{__make} +cd contrib/pgcrypto/ +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -922,6 +895,7 @@ fi %{_datadir}/postgresql/*.sample %{_datadir}/postgresql/*.description %{_datadir}/postgresql/*.sql +%{_datadir}/postgresql/*.txt %attr(700,postgres,postgres) /home/services/postgres %attr(700,postgres,postgres) %dir /var/lib/pgsql @@ -956,8 +930,10 @@ fi %files libs %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libpq.so.*.* %attr(755,root,root) %{_libdir}/libecpg.so.*.* +%attr(755,root,root) %{_libdir}/libecpg_compat.so.*.* +%attr(755,root,root) %{_libdir}/libpq.so.*.* +%attr(755,root,root) %{_libdir}/libpgtypes.so.*.* %attr(755,root,root) %{_bindir}/pg_id %files devel @@ -965,7 +941,9 @@ fi %attr(755,root,root) %{_bindir}/ecpg %attr(755,root,root) %{_bindir}/pg_config %attr(755,root,root) %{_libdir}/libecpg.so +%attr(755,root,root) %{_libdir}/libecpg_compat.so %attr(755,root,root) %{_libdir}/libpq.so +%attr(755,root,root) %{_libdir}/libpgtypes.so %dir %{_includedir}/postgresql %{_includedir}/pg_config.h %{_includedir}/pg_config_os.h @@ -976,6 +954,11 @@ fi %{_includedir}/postgres_ext.h %{_includedir}/sql3types.h %{_includedir}/sqlca.h +%{_includedir}/pgtypes_date.h +%{_includedir}/pgtypes_error.h +%{_includedir}/pgtypes_interval.h +%{_includedir}/pgtypes_numeric.h +%{_includedir}/pgtypes_timestamp.h %dir %{_includedir}/postgresql/internal %{_includedir}/postgresql/internal/c.h %{_includedir}/postgresql/internal/libpq-int.h @@ -994,7 +977,9 @@ fi %files static %defattr(644,root,root,755) %{_libdir}/libecpg.a +%{_libdir}/libecpg_compat.a %{_libdir}/libpq.a +%{_libdir}/libpgtypes.a %files clients %defattr(644,root,root,755) @@ -1011,13 +996,7 @@ fi %{_mandir}/man1/vacuumdb.1* %{_mandir}/manl/*.l* -%files -n python-postgresql -%defattr(644,root,root,755) -%doc src/interfaces/python/{README*,ChangeLog} -%{py_sitedir}/*.pyc -%{py_sitedir}/*.pyo -%attr(755,root,root) %{py_sitedir}/*.so - +%if %{with tcl} %files tcl %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libpgtcl.so @@ -1034,6 +1013,7 @@ fi %files tcl-static %defattr(644,root,root,755) %{_libdir}/libpgtcl.a +%endif %files module-plpgsql %defattr(644,root,root,755) @@ -1047,10 +1027,12 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_pgmoduledir}/plpython.so +%if %{with tcl} %files module-pltcl %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/pltcl_* %attr(755,root,root) %{_pgmoduledir}/pltcl.so +%endif %files module-pgcrypto %defattr(644,root,root,755) -- 2.44.0