- updated to 8.4.0; NOTE: consider postgresql82 / postgresql83 and turning postgresql...

Changed files:
    postgresql.spec -> 1.420

diff --git a/postgresql.spec b/postgresql.spec
index 0efab8d5adcfffe59b9dd0910a32efc9d3ba590f..dd74d318b1158af22741c12d47784182e818424d 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -9,6 +9,7 @@
 %bcond_with    absolute_dbpaths        # enable absolute paths to create database
                                        # (disabled by default because it is a security risk)
 #
+
 Summary:       PostgreSQL Data Base Management System
 Summary(de.UTF-8):     PostgreSQL Datenbankverwaltungssystem
 Summary(es.UTF-8):     Gestor de Banco de Datos PostgreSQL
@@ -20,12 +21,12 @@ Summary(tr.UTF-8):  Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):     PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):  PostgreSQL 客户端程序和库文件
 Name:          postgresql
-Version:       8.3.7
-Release:       3
+Version:       8.4.0
+Release:       0.1
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 7b7e91a2221e55fe1b167e663217a96d
+# Source0-md5: 1f172d5f60326e972837f58fa5acd130
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -846,12 +847,16 @@ tar zxf %{SOURCE2} -C howto
 %endif
 
 # find locales
-for f in libpq pg_controldata pg_dump pg_resetxlog pgscripts postgres psql initdb pg_ctl pg_config; do
-       %find_lang $f
+for f in libpq5 pg_controldata pg_dump pg_resetxlog pgscripts postgres psql initdb pg_ctl pg_config plpgsql ecpg ecpglib6 plperl plpgsql plpython pltcl; do
+       %find_lang $f-8.4
 done
 # merge locales
-cat pgscripts.lang pg_resetxlog.lang postgres.lang pg_controldata.lang > main.lang
-cat pg_dump.lang psql.lang initdb.lang pg_ctl.lang > clients.lang
+cat pgscripts-8.4.lang pg_resetxlog-8.4.lang \
+    postgres-8.4.lang pg_controldata-8.4.lang \
+    > main-8.4.lang
+cat pg_dump-8.4.lang psql-8.4.lang initdb-8.4.lang \
+    pg_ctl-8.4.lang > clients-8.4.lang
+cat ecpg-8.4.lang ecpglib6-8.4.lang > ecpg.lang
 
 # Remove Contrib documentation. We use macro %doc
 rm -rf $RPM_BUILD_ROOT/contrib
@@ -874,7 +879,7 @@ fi
 foundold=0
 for pgdir in $PG_DB_CLUSTERS; do
        if [ -f $pgdir/PG_VERSION ]; then
-               if [ $(cat $pgdir/PG_VERSION) != '8.3' ]; then
+               if [ $(cat $pgdir/PG_VERSION) != '8.4' ]; then
                        echo "Found database(s) in older, incompatible format in cluster $pgdir."
                        foundold=1
                fi
@@ -923,14 +928,14 @@ fi
 %post  ecpg -p /sbin/ldconfig
 %postun        ecpg -p /sbin/ldconfig
 
-%files -f main.lang
+%files -f main-8.4.lang
 %defattr(644,root,root,755)
 %doc COPYRIGHT README HISTORY doc/{FAQ*,README*,bug.template}
 %attr(754,root,root) /etc/rc.d/init.d/postgresql
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql
 
 %attr(755,root,root) %{_bindir}/initdb
-%attr(755,root,root) %{_bindir}/ipcclean
+#%attr(755,root,root) %{_bindir}/ipcclean
 %attr(755,root,root) %{_bindir}/pg_controldata
 %attr(755,root,root) %{_bindir}/pg_ctl
 %attr(755,root,root) %{_bindir}/pg_resetxlog
@@ -960,7 +965,7 @@ fi
 %attr(640,postgres,postgres) %config(noreplace) %verify(not md5 mtime size) /var/log/pgsql
 
 %{_mandir}/man1/initdb.1*
-%{_mandir}/man1/ipcclean.1*
+#%{_mandir}/man1/ipcclean.1*
 %{_mandir}/man1/pg_controldata.1*
 %{_mandir}/man1/pg_ctl.1*
 %{_mandir}/man1/pg_resetxlog.1*
@@ -972,13 +977,13 @@ fi
 %doc doc/unpacked/* doc/src/FAQ howto
 %{_examplesdir}/%{name}-%{version}
 
-%files libs -f libpq.lang
+%files libs -f libpq5-8.4.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpq.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpq.so.5
 %dir %{_pgmoduledir}
 
-%files ecpg
+%files ecpg -f ecpg.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ecpg
 %attr(755,root,root) %{_libdir}/libecpg.so.*.*
@@ -996,11 +1001,12 @@ fi
 %attr(755,root,root) %{_libdir}/libpgtypes.so
 %{_includedir}/ecpg*
 
-%files devel -f pg_config.lang
+%files devel -f pg_config-8.4.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pg_config
 %attr(755,root,root) %{_libdir}/libpq.so
 %dir %{_includedir}/postgresql
+%{_includedir}/libpq-events.h
 %{_includedir}/libpq-fe.h
 %{_includedir}/pg_config.h
 %{_includedir}/pg_config_manual.h
@@ -1031,7 +1037,7 @@ fi
 %{_libdir}/libpgtypes.a
 %{_libdir}/libpgport.a
 
-%files clients -f clients.lang
+%files clients -f clients-8.4.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/clusterdb
 %attr(755,root,root) %{_bindir}/createdb
@@ -1062,24 +1068,24 @@ fi
 %{_mandir}/man1/vacuumdb.1*
 %{_mandir}/man7/*.7*
 
-%files module-plpgsql
+%files module-plpgsql -f plpgsql-8.4.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pgmoduledir}/plpgsql.so
 
 %if %{with perl}
-%files module-plperl
+%files module-plperl -f plperl-8.4.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pgmoduledir}/plperl.so
 %endif
 
 %if %{with python}
-%files module-plpython
+%files module-plpython -f plpython-8.4.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pgmoduledir}/plpython.so
 %endif
 
 %if %{with tcl}
-%files module-pltcl
+%files module-pltcl -f pltcl-8.4.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pltcl_*
 %attr(755,root,root) %{_pgmoduledir}/pltcl.so
@@ -1128,7 +1134,7 @@ fi
 %attr(755,root,root) %{_pgmoduledir}/chkpass.so
 %attr(755,root,root) %{_pgmoduledir}/fuzzystrmatch.so
 %attr(755,root,root) %{_pgmoduledir}/hstore.so
-%attr(755,root,root) %{_pgmoduledir}/int_aggregate.so
+#%attr(755,root,root) %{_pgmoduledir}/int_aggregate.so
 %attr(755,root,root) %{_pgmoduledir}/isn.so
 %attr(755,root,root) %{_pgmoduledir}/ltree.so
 %attr(755,root,root) %{_pgmoduledir}/pageinspect.so