- release++

[packages/postgresql.git] / postgresql.spec

diff --git a/postgresql.spec b/postgresql.spec
index ffcb9a109bbc78e4ffe718be2dfb462dcdaafafe..fe3d26794517f48d279944ba155458ef2541c2ba 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -6,7 +6,7 @@ Summary(pl):    PostgreSQL system bazodanowy
 Summary(tr):   Veri Tabaný Yönetim Sistemi
 Name:          postgresql
 Version:       6.5.3
-Release:       1
+Release:       5
 Copyright:     BSD
 Group:         Applications/Databases
 Group(pl):     Aplikacje/Bazy Danych
@@ -20,7 +20,13 @@ Patch2:              postgresql-perl.patch
 URL:           http://www.postgresql.org/
 Prereq:                /sbin/chkconfig
 Requires:      rc-scripts
-Buildroot:     /tmp/%{name}-%{version}-root
+BuildRequires: tcl-devel
+BuildRequires: tk-devel
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel >= 5.0
+BuildRequires: rpm-perlprov
+BuildRequires: XFree86-devel
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Requires:      %{name}-libs = %{version}
 
 %define                _sysconfdir     /etc
@@ -134,7 +140,7 @@ Summary(pl):        PostgreSQL - pliki nag
 Summary(tr):   PostgreSQL baþlýk dosyalarý ve kitaplýklar
 Group:         Development/Libraries
 Group(pl):     Programowanie/Biblioteki
-#Requires:     %{name}-clients = %{version}
+Requires:      %{name}-libs = %{version}
 
 %description devel
 This package contains header files and libraries required to compile
@@ -350,34 +356,21 @@ make all PGDOCS=unpacked -C doc
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
         $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/pgsql,%{_mandir},%{_includedir}/pgsql} \
-        $RPM_BUILD_ROOT/var/state/pgsql
-               
+        $RPM_BUILD_ROOT/var/lib/pgsql
+
+# PREFIX (hack for perl)
 ( cd src
   make DESTDIR=$RPM_BUILD_ROOT install
   make DESTDIR=$RPM_BUILD_ROOT install-man
 )
 
 # For Perl interface
-#( cd src/interfaces/perl5
-#
-#  install -d $RPM_BUILD_ROOT/%{perl_sitearch}
-#  perl Makefile.PL
-#  make PREFIX=$RPM_BUILD_ROOT/usr install
-
-  ( cd $RPM_BUILD_ROOT%{perl_sitearch}/auto/Pg
-    mv .packlist .packlist.old
-    sed -e "s|$RPM_BUILD_ROOT/|/|g" -e "s|./||" < .packlist.old > .packlist
-    rm -f .packlist.old
-  )
-#  LOCAL="$RPM_BUILD_ROOT/$PERLVER/perllocal.pod"
-#  mv $LOCAL $LOCAL.old
-#  sed -e "s|$RPM_BUILD_ROOT/|/|g" < $LOCAL.old > $LOCAL.pg
-#  rm -f $LOCAL.old
-#)
-#find $RPM_BUILD_ROOT%{_libdir}/perl5 -type f -print | \
-#      sed -e "s|$RPM_BUILD_ROOT/|/|g" | grep -v "perllocal.pod$" > perlfiles.list
-#find $RPM_BUILD_ROOT%{_libdir}/perl5 -type d -name Pg -print | \
-#      sed -e "s|$RPM_BUILD_ROOT/|%dir /|g" >> perlfiles.list
+
+( cd $RPM_BUILD_ROOT%{perl_sitearch}/auto/Pg
+  mv .packlist .packlist.old
+  sed -e "s|$RPM_BUILD_ROOT/|/|g" -e "s|./||" < .packlist.old > .packlist
+  rm -f .packlist.old
+)
 
 # Move all includes beneath %{_includedir}/pgsql.
 ( cd $RPM_BUILD_ROOT%{_includedir}
@@ -404,24 +397,27 @@ install -d howto
   tar xzf $RPM_SOURCE_DIR/pgsql-Database-HOWTO-html.tar.gz
 )
 
+# Install all header files. They are required
+# by executor/spi.h and commands/trigger.h
+
+( cd src/include
+  cp -rf * $RPM_BUILD_ROOT%{_includedir}/pgsql
+)
+
 strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/*
 
 %pre
-/usr/sbin/groupadd -g 88 -r -f postgres 1>&2 || :
-/usr/sbin/useradd -M -o -r -u 88 -d /var/state/pgsql -s /bin/bash \
-       -g postgres -c "PostgreSQL Server" postgres 1>&2 || :
+getgid postgres >/dev/null 2>&1 || /usr/sbin/groupadd -g 88 -r -f postgres
+id postgres >/dev/null 2>&1 || /usr/sbin/useradd -M -o -r -u 88 \
+       -d /var/lib/pgsql -s /bin/sh -g postgres \
+       -c "PostgreSQL Server" postgres
+)
 
 %post
 /sbin/chkconfig --add postgresql
 
-# Create sample database
-if [ ! -f /var/state/pgsql/PG_VERSION ]; then
-       su postgres -c "LD_LIBRARY_PATH=%{_libdir} \
-               %{_bindir}/initdb --pgdata=/var/state/pgsql \
-               --pglib=%{_libdir}/pgsql"
-fi
 if [ -r /var/lock/subsys/postmaster ]; then
        /etc/rc.d/init.d/postgresql restart >&2
 else
@@ -448,17 +444,6 @@ fi
 %post   odbc -p /sbin/ldconfig
 %postun odbc -p /sbin/ldconfig
 
-#%post perl
-#POD=`find %{_libdir} -name perllocal.pod.pg`
-#DIR=`dirname $POD`
-#if [ -f $DIR/perllocal.pod ]; then
-#      mv $DIR/perllocal.pod $DIR/perllocal.pod.prepg
-#      cat $DIR/perllocal.pod.pg $DIR/perllocal.pod.prepg > $DIR/perllocal.pod
-#else
-#      cp $DIR/perllocal.pod.pg $DIR/perllocal.pod
-#fi
-#rm -f $DIR/perllocal.pod.pg
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -f /tmp/tmp_perl_info
@@ -507,7 +492,7 @@ rm -f /tmp/tmp_perl_info
 %{_mandir}/man1/ipcclean.1*
 %{_mandir}/man5/*.5*
 
-%attr(750,postgres,postgres) %dir /var/state/pgsql
+%attr(750,postgres,postgres) %dir /var/lib/pgsql
 
 %files libs
 %defattr(644,root,root,755)