postgresql-9.0.3

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3412 ec354946-7b23-47d6-9f5a-488ba84defc7

p/postgresql/postgresql-vl.spec

@@ -6,7 +6,7 @@
 %{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
 
 %define tcl 1
-%define jdbc 1
+##define jdbc 1
 %define test 0
 %define pltcl 1
 %define pls 1
@@ -15,14 +15,13 @@
 %define nls 1
 %define pam 1
 
-%define pgver 8.4
-%define jdbc2ver 606
-%define jdbcver 702
+%define pgver 9.0
+##define jdbcver 9.0
 
 Summary: PostgreSQL client programs and libraries.
 Summary(ja): PostgreSQL のクライアントプログラム群およびライブラリ
 Name: postgresql
-Version: %{pgver}.7
+Version: %{pgver}.3
 Release: 1%{?_dist_release}
 # Conventions for PostgreSQL Global Development Group RPM releases:
 #
@@ -50,10 +49,6 @@ Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t
 Source3: postgresql.init
 Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.md5
 Source6: README.rpm-dist
-Source10: http://jdbc.postgresql.org/download/postgresql-8.3-%{jdbc2ver}.jdbc2.jar
-Source11: http://jdbc.postgresql.org/download/postgresql-8.3-%{jdbc2ver}.jdbc2ee.jar
-Source12: http://jdbc.postgresql.org/download/postgresql-%{pgver}-%{jdbcver}.jdbc3.jar
-Source13: http://jdbc.postgresql.org/download/postgresql-%{pgver}-%{jdbcver}.jdbc4.jar
 Source15: postgresql-bashprofile
 Patch2: postgresql-8.3.3-nls.patch
 Patch3: postgresql-7.4-ecpg-patch
@@ -90,6 +85,9 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: postgresql-clients
 Obsoletes: postgresql-python
 Obsoletes: postgresql7
+Conflicts: postgresql8
+Conflicts: postgresql8-jdbc
+Conflicts: postgresql-jdbc < %{pgver}
 
 %if %pls
 Obsoletes: postgresql7-plperl
@@ -161,6 +159,7 @@ Summary: The shared libraries required for any PostgreSQL clients.
 Summary(ja): PostgreSQL クライアントに必要な共有ライブラリ
 Group: System Environment/Libraries
 Obsoletes: postgresql7-libs
+Conflicts: postgresql8-libs
 
 %description libs
 The postgresql-libs package provides the essential shared libraries for any 
@@ -181,6 +180,7 @@ Group: Applications/Databases
 Requires: /usr/sbin/useradd /sbin/chkconfig 
 Requires: %{name} = %{version}
 Obsoletes: postgresql7-server
+Conflicts: postgresql8-server
 
 %description server
 The postgresql-server package includes the programs needed to create
@@ -209,6 +209,7 @@ Summary: Extra documentation for PostgreSQL
 Summary(ja): PostgreSQL に関するその他の文書
 Group: Applications/Documentation
 Obsoletes: postgresql7-docs
+Conflicts: postgresql8-docs
 
 %description docs
 The postgresql-docs package includes the SGML source for the documentation
@@ -222,6 +223,7 @@ Summary(ja): PostgreSQL と一緒に配布される、寄贈されたソース
 Group: Applications/Databases
 Requires: %{name} = %{version} perl-DBD-Pg
 Obsoletes: postgresql7-contrib
+Conflicts: postgresql8-contrib
 
 %description contrib
 The postgresql-contrib package contains contributed packages that are
@@ -233,6 +235,7 @@ Summary(ja): PostgreSQL の開発用ヘッダファイルとライブラリ群
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}
 Obsoletes: postgresql7-devel
+Conflicts: postgresql8-devel
 
 %description devel
 The postgresql-devel package contains the header files and libraries
@@ -260,6 +263,7 @@ Summary(ja): PostgreSQL 用の手続き言語 PL
 Group: Applications/Databases
 Requires: %{name} = %{version}
 Obsoletes: postgresql7-pl
+Conflicts: postgresql8-pl
 
 %description pl
 PostgreSQL is an advanced Object-Relational database management
@@ -275,6 +279,7 @@ Summary(ja): PostgreSQL の Tcl クライアントライブラリ
 Group: Applications/Databases
 Requires: tcl >= 8.0
 Obsoletes: postgresql7-tcl
+Conflicts: postgresql8-tcl
 
 %description tcl
 PostgreSQL is an advanced Object-Relational database management
@@ -282,19 +287,19 @@ system.  The postgresql-tcl package contains the libpgtcl client library,
 the pg-enhanced pgtclsh,and the pg-enhanced tksh, if so configured at buildtime.
 %endif
 
-#----------
-%if %jdbc
-%package jdbc
-Summary: Files needed for Java programs to access a PostgreSQL database.
-Summary(ja): PostgreSQL データベースにアクセスする Java プログラムのために必要なファイル群
-Group: Applications/Databases
-Obsoletes: postgresql7-jdbc
-
-%description jdbc
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-jdbc package includes the .jar file needed for
-Java programs to access a PostgreSQL database.
-%endif
+## #----------
+## %if %jdbc
+## %package jdbc
+## Summary: Files needed for Java programs to access a PostgreSQL database.
+## Summary(ja): PostgreSQL データベースにアクセスする Java プログラムのために必要なファイル群
+## Group: Applications/Databases
+## Obsoletes: postgresql7-jdbc
+## 
+## %description jdbc
+## PostgreSQL is an advanced Object-Relational database management
+## system. The postgresql-jdbc package includes the .jar file needed for
+## Java programs to access a PostgreSQL database.
+## %endif
 
 #------------
 %if %test
@@ -304,6 +309,7 @@ Summary(ja): PostgreSQL と共に配布されるテストスート
 Group: Applications/Databases
 Requires: postgresql = %{version}
 Obsoletes: postgresql7-test
+Conflicts: postgresql8-test
 
 %description test
 PostgreSQL is an advanced Object-Relational database management
@@ -381,16 +387,16 @@ make -C contrib DESTDIR=$RPM_BUILD_ROOT install
 install -m644 src/Makefile.global $RPM_BUILD_ROOT%{_includedir}/pgsql
 install -m644 src/Makefile.shlib $RPM_BUILD_ROOT%{_includedir}/pgsql
 
-%if %jdbc
-	# Java/JDBC
-	# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
-
-	# JDBC jars 
-	install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/pgsql
-	install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/pgsql
-	install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/pgsql
-	install -m 755 %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/pgsql
-%endif
+## %if %jdbc
+##	# Java/JDBC
+##	# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
+##
+##	# JDBC jars 
+##	install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/pgsql
+##	install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/pgsql
+##	install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/pgsql
+##	install -m 755 %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/pgsql
+## %endif
 
 # initscript
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -424,10 +430,18 @@ install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
 %endif
 
 # Fix some more documentation
-# gzip doc/internals.ps
+##gzip doc/internals.ps
 cp %{SOURCE6} README.rpm-dist
-cp -pr $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
-rm -rf $RPM_BUILD_ROOT%{_docdir}/postgresql/html
+##cp -pr $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
+##rm -rf $RPM_BUILD_ROOT%{_docdir}/postgresql/html
+
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man7
+install -m 644 ./doc/src/sgml/man1/* $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m 644 ./doc/src/sgml/man3/* $RPM_BUILD_ROOT/%{_mandir}/man3
+install -m 644 ./doc/src/sgml/man7/* $RPM_BUILD_ROOT/%{_mandir}/man7
+
 
 %find_lang initdb-%{pgver}
 %find_lang libpq5-%{pgver}
@@ -518,14 +532,13 @@ chown -R postgres.postgres %{_datadir}/pgsql/test >/dev/null 2>&1 || :
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# FILES section.
 
 %files -f main.lst
 %defattr(-,root,root)
 %doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* 
 %doc COPYRIGHT README HISTORY INSTALL doc/bug.template
 %doc README.rpm-dist
-%doc doc/html
+##doc doc/html
 %{_bindir}/clusterdb
 %{_bindir}/createdb
 %{_bindir}/createlang
@@ -533,8 +546,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/dropdb
 %{_bindir}/droplang
 %{_bindir}/dropuser
+%{_bindir}/pg_archivecleanup
 %{_bindir}/pg_dump
 %{_bindir}/pg_dumpall
+%{_bindir}/pg_upgrade
 %{_bindir}/pg_restore
 %{_bindir}/psql
 %{_bindir}/reindexdb
@@ -553,6 +568,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/psql.*
 %{_mandir}/man1/reindexdb.*
 %{_mandir}/man1/vacuumdb.*
+%{_mandir}/man3/*
 %{_mandir}/man7/*
 %{_localedir}/*/LC_MESSAGES/pgscripts-%{pgver}.mo
 
@@ -576,17 +592,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postgresql/cyrillic_and_mic.so
 %{_libdir}/postgresql/dblink.so
 %{_libdir}/postgresql/dict_int.so
-#%{_libdir}/postgresql/dict_snowball.so
 %{_libdir}/postgresql/dict_xsyn.so
 %{_libdir}/postgresql/earthdistance.so
 %{_libdir}/postgresql/euc_cn_and_mic.so
 %{_libdir}/postgresql/euc_jp_and_sjis.so
 %{_libdir}/postgresql/euc_kr_and_mic.so
 %{_libdir}/postgresql/euc_tw_and_big5.so
+%{_libdir}/postgresql/euc2004_sjis2004.so
 %{_libdir}/postgresql/fuzzystrmatch.so
 %{_libdir}/postgresql/hstore.so
 %{_libdir}/postgresql/insert_username.so
-#%{_libdir}/postgresql/int_aggregate.so
+%{_libdir}/postgresql/libpqwalreceiver.so
 %{_libdir}/postgresql/isn.so
 %{_libdir}/postgresql/latin2_and_win1250.so
 %{_libdir}/postgresql/latin_and_mic.so
@@ -594,10 +610,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postgresql/ltree.so
 %{_libdir}/postgresql/moddatetime.so
 %{_libdir}/postgresql/pageinspect.so
+%{_libdir}/postgresql/passwordcheck.so
 %{_libdir}/postgresql/pg_buffercache.so
 %{_libdir}/postgresql/pg_freespacemap.so
 %{_libdir}/postgresql/pg_stat_statements.so
 %{_libdir}/postgresql/pg_trgm.so
+%{_libdir}/postgresql/pg_upgrade_support.so
 %{_libdir}/postgresql/pgcrypto.so
 %{_libdir}/postgresql/pgrowlocks.so
 %{_libdir}/postgresql/pgstattuple.so
@@ -609,6 +627,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postgresql/test_parser.so
 %{_libdir}/postgresql/timetravel.so
 %{_libdir}/postgresql/tsearch2.so
+%{_libdir}/postgresql/unaccent.so
 %{_libdir}/postgresql/utf8_and_ascii.so
 %{_libdir}/postgresql/utf8_and_big5.so
 %{_libdir}/postgresql/utf8_and_cyrillic.so
@@ -640,7 +659,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/postgresql
 %dir %{_sysconfdir}/sysconfig/pgsql
 %{_bindir}/initdb
-#%{_bindir}/ipcclean
 %{_bindir}/pg_controldata
 %{_bindir}/pg_ctl
 %{_bindir}/pg_resetxlog
@@ -648,15 +666,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/postgres
 %{_bindir}/postmaster
 %{_mandir}/man1/initdb.*
-#%{_mandir}/man1/ipcclean.*
+##{_mandir}/man1/ipcclean.*
 %{_mandir}/man1/pg_controldata.*
 %{_mandir}/man1/pg_ctl.*
 %{_mandir}/man1/pg_resetxlog.*
 %{_mandir}/man1/postgres.*
 %{_mandir}/man1/postmaster.*
 %{_libdir}/postgresql/*_and_*.so
-%{_libdir}/postgresql/plpgsql.so
 %{_libdir}/postgresql/dict_snowball.so
+%{_libdir}/postgresql/plpgsql.so
 %{_datadir}/pgsql/*.sql
 %{_datadir}/pgsql/postgres.bki
 %{_datadir}/pgsql/postgres.description
@@ -711,17 +729,20 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %if %plpython
 %{_libdir}/postgresql/plpython.so
+%{_libdir}/postgresql/plpython2.so
 %endif
 %endif
 
-%if %jdbc
-%files jdbc
-%defattr(-,root,root)
-%{_datadir}/pgsql/postgresql-8.3-%{jdbc2ver}.jdbc2.jar
-%{_datadir}/pgsql/postgresql-8.3-%{jdbc2ver}.jdbc2ee.jar
-%{_datadir}/pgsql/postgresql-%{pgver}-%{jdbcver}.jdbc3.jar
-%{_datadir}/pgsql/postgresql-%{pgver}-%{jdbcver}.jdbc4.jar
-%endif
+##%if %jdbc
+##%files jdbc
+##%defattr(-,root,root)
+## #%{_datadir}/pgsql/postgresql-%{pgver}-%{jdbcver}.jdbc2.jar
+## #%{_datadir}/pgsql/postgresql-%{pgver}-%{jdbcver}.jdbc2ee.jar
+## %{_datadir}/pgsql/postgresql-8.3-605.jdbc2.jar
+## %{_datadir}/pgsql/postgresql-8.3-605.jdbc2ee.jar
+## %{_datadir}/pgsql/postgresql-%{pgver}-%{jdbcver}.jdbc3.jar
+## %{_datadir}/pgsql/postgresql-%{pgver}-%{jdbcver}.jdbc4.jar
+##%endif
 
 %if %test
 %files test
@@ -731,6 +752,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Apr 12 2011 Shu KONNO <owa@bg.wakwak.com> 9.0.3-1
+- updated postgresql to 9.0.3
+- separated postgresql-jdbc package
+
 * Thu Feb 03 2011 Shu KONNO <owa@bg.wakwak.com> 8.4.7-1
 - updated postgresql to 8.4.7 (contains a variety of fixes)