- pgaccess: added "." -> lib symlink instead of patching N files

- added missing modules/ and sql/ to postgresql subpackage

Changed files:
    postgresql.spec -> 1.66

diff --git a/postgresql.spec b/postgresql.spec
index b55cbc4d5c4ae4db7fe4f2b0787c5f944f233ccd..d3c7563bfa02fa932b84d169420fdd988352f2c8 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -20,7 +20,6 @@ Patch2:               %{name}-perl.patch
 Patch3:                %{name}-python.patch
 Patch4:                %{name}-no_libnsl.patch
 Patch5:                %{name}-pgaccess-typo.patch
-Patch6:                %{name}-pgaccess-modpath.patch
 URL:           http://www.postgresql.org/
 Prereq:                /sbin/chkconfig
 Requires:      rc-scripts
@@ -529,7 +528,6 @@ proceduralnego PL/TCL dla swojej bazy danych.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 # Erase all CVS dir
 rm -fR `find contrib/ -type d -name CVS`
@@ -582,6 +580,9 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig} \
 %{__make} -C doc install DESTDIR=$RPM_BUILD_ROOT
 touch $RPM_BUILD_ROOT/var/log/pgsql
 
+# pgaccess 
+ln -sf . $RPM_BUILD_ROOT%{_libdir}/pgaccess/lib
+
 # for datetime functions
 %{__make} -C contrib/datetime install LIBDIR=$RPM_BUILD_ROOT%{_libdir}/pgsql
 
@@ -679,6 +680,8 @@ rm -f /tmp/tmp_perl_info
 %attr(755,root,root) %{_bindir}/droplang
 
 %dir %{_libdir}/pgsql
+%dir %{_libdir}/pgsql/modules
+%dir %{_libdir}/pgsql/sql
 %{_libdir}/pgsql/*.source 
 %{_libdir}/pgsql/*.sample
 %{_libdir}/pgsql/*.description