SPECS (POSTGRESQL_8_3): postgresql.spec - release *.2 - R: tzdata, ...

[radek]

Author: radek                        Date: Sat Nov 10 20:42:59 2007 GMT
Module: SPECS                         Tag: POSTGRESQL_8_3
---- Log message:
- release *.2
- R: tzdata, --with-system-tzdata (causes 1 failing test, so NFY)
- removed and O: postgresql-module-tsearch2 (has been merged to the core)

---- Files affected:
SPECS:
   postgresql.spec (1.390.2.5 -> 1.390.2.6) 

---- Diffs:

================================================================
Index: SPECS/postgresql.spec
diff -u SPECS/postgresql.spec:1.390.2.5 SPECS/postgresql.spec:1.390.2.6
--- SPECS/postgresql.spec:1.390.2.5	Mon Oct 29 22:15:28 2007
+++ SPECS/postgresql.spec	Sat Nov 10 21:42:53 2007
@@ -23,7 +23,7 @@
 Version:	8.3.0
 %define	_beta	beta2
 %define	_ver	8.3%{_beta}
-Release:	0.%{_beta}.1
+Release:	0.%{_beta}.2
 License:	BSD
 Group:		Applications/Databases
 Source0:	ftp://ftp.postgresql.org/pub/source/v8.3beta/%{name}-%{_ver}.tar.bz2
@@ -70,8 +70,10 @@
 Requires:	%{name}-clients = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-scripts
+Requires:	tzdata
 Obsoletes:	postgresql-server
 Obsoletes:	postgresql-test
+Obsoletes:	postgresql-module-tsearch2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pgmoduledir	%{_libdir}/postgresql
@@ -79,7 +81,7 @@
 
 %define		_ulibdir	/usr/lib
 
-%define	contrib_modules	adminpack btree_gist chkpass dblink hstore intagg intarray isn lo ltree oid2name pageinspect pgbench pg_buffercache pgcrypto pg_freespacemap pgrowlocks pgstattuple pg_trgm sslinfo tablefunc tsearch2 vacuumlo xml2
+%define	contrib_modules	adminpack btree_gist chkpass dblink hstore intagg intarray isn lo ltree oid2name pageinspect pgbench pg_buffercache pgcrypto pg_freespacemap pgrowlocks pgstattuple pg_trgm sslinfo tablefunc vacuumlo xml2
 
 %description
 PostgreSQL Data Base Management System (formerly known as Postgres,
@@ -707,22 +709,6 @@
 %description module-tablefunc -l pl.UTF-8
 Funkcje crosstab dla PostgreSQL-a.
 
-%package module-tsearch2
-Summary:	Full text extension for PostgreSQL
-Summary(pl.UTF-8):	Rozszerzenie pełnotekstowe dla PostgreSQL-a
-Group:		Applications/Databases
-Requires:	%{name} = %{version}-%{release}
-
-%description module-tsearch2
-Implementation of a new data type tsvector - a searchable data type
-with indexed access:
-http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/
-
-%description module-tsearch2 -l pl.UTF-8
-Implementacja nowego typu danych tsvector - typu danych podlegajÄ
cego
-przeszukiwaniu z dostępem poprzez indeksy:
-http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/
-
 %package module-pg_trgm
 Summary:	Trigram matching for PostgreSQL
 Summary(pl.UTF-8):	Dopasowanie trigramowe dla PostgreSQL-a
@@ -789,6 +775,7 @@
 	--disable-rpath \
 	--enable-depend \
 	--enable-integer-datetimes \
+	--with-system-tzdata=%{_datadir}/zoneinfo \
 	--enable-nls \
 	--enable-thread-safety \
 	%{?with_kerberos5:--with-krb5} \
@@ -950,8 +937,7 @@
 %{_datadir}/postgresql/*.shdescription
 %{_datadir}/postgresql/*.sql
 %{_datadir}/postgresql/*.txt
-%{_datadir}/postgresql/timezone
-%{_datadir}/postgresql/timezonesets
+%{_datadir}/postgresql/tsearch_data
 
 %attr(700,postgres,postgres) /home/services/postgres
 %attr(700,postgres,postgres) %dir /var/lib/pgsql
@@ -1104,17 +1090,6 @@
 %attr(755,root,root) %{_pgmoduledir}/tablefunc.so
 %{_pgsqldir}/*tablefunc.sql
 
-%files module-tsearch2
-%defattr(644,root,root,755)
-%doc contrib/tsearch2/README*
-%attr(755,root,root) %{_pgmoduledir}/tsearch2.so
-%attr(755,root,root) %{_pgmoduledir}/dict_snowball.so
-%{_pgsqldir}/*tsearch2.sql
-%{_pgsqldir}/russian.stop.utf8
-%{_pgsqldir}/thesaurus
-%{_pgsqldir}/*.stop
-%{_datadir}/postgresql/tsearch_data
-
 %files module-pg_trgm
 %defattr(644,root,root,755)
 %doc contrib/pg_trgm/README*
@@ -1181,6 +1156,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.390.2.6  2007/11/10 20:42:53  radek
+- release *.2
+- R: tzdata, --with-system-tzdata (causes 1 failing test, so NFY)
+- removed and O: postgresql-module-tsearch2 (has been merged to the core)
+
 Revision 1.390.2.5  2007/10/29 21:15:28  radek
 - 8.3 beta2 (NOTE: dump & restore needed when upgrading from beta1)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/postgresql.spec?r1=1.390.2.5&r2=1.390.2.6&f=u