Ralf S. Engelschall пре 20 година
родитељ
комит
07ddf095eb
1 измењених фајлова са 21 додато и 4 уклоњено
  1. 21 4
      postgresql/postgresql.spec

+ 21 - 4
postgresql/postgresql.spec

@@ -30,7 +30,7 @@
 %define       V_libpqxx         2.5.5
 %define       V_pgperl          2.0.2
 %define       V_psqlodbc        08.00.0102
-%define       V_slony1          1.1.0
+%define       V_slony1          1.1.1
 %define       V_pgpool          2.6.3
 %define       V_pgcluster       1.3.0c
 
@@ -45,7 +45,7 @@ Class:        BASE
 Group:        Database
 License:      GPL
 Version:      %{V_postgresql}
-Release:      20050927
+Release:      20051001
 
 #   package options
 %option       with_server    yes
@@ -325,15 +325,25 @@ AutoReqProv:  no
     #   build Slony-1 replication engine
 %if "%{with_slony1}" == "yes"
     ( cd slony1-%{V_slony1}
+      ln  ../src/pl/plpgsql/src/libplpgsql.so \
+          ../src/pl/plpgsql/src/plpgsql.so
       %{l_shtool} subst \
           -e 's;-lpq;-lpq -lssl -lcrypto -lcrypt;' \
           src/slon/Makefile src/slonik/Makefile
       export CC="%{l_cc}"
       export CFLAGS="%{l_cflags -O}"
       export CPPFLAGS="%{l_cppflags}"
+      export LDFLAGS="%{l_ldflags}"
+      export LIBS="-lssl -lcrypto -lcrypt"
       ./configure \
           --prefix=%{l_prefix} \
-          --with-pgsourcetree=`pwd`/..
+          --sysconfdir=%{l_prefix}/etc/postgresql \
+          --with-pgconfigdir=../src/bin/pg_config \
+          --with-pgincludedir=../src/include \
+          --with-pgincludeserverdir=../src/interfaces/libpq \
+          --with-pglibdir=../src/interfaces/libpq \
+          --with-pgpkglibdir=../src/pl/plpgsql/src \
+          --with-pgsharedir=../src/backend/utils/misc
       %{l_make} %{l_mflags -O}
     ) || exit $?
 %endif
@@ -456,7 +466,14 @@ AutoReqProv:  no
     #   install Slony-1 replication engine
 %if "%{with_slony1}" == "yes"
     ( cd slony1-%{V_slony1}
-      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+      %{l_make} %{l_mflags} install \
+          DESTDIR=$RPM_BUILD_ROOT \
+          pgconfigdir=%{l_prefix}/bin \
+          pgincludedir=%{l_prefix}/include/postgresql \
+          pgincludeserverdir=%{l_prefix}/include/postgresql/libpq \
+          pglibdir=%{l_prefix}/lib/postgresql \
+          pgpkglibdir=%{l_prefix}/lib/postgresql \
+          pgsharedir=%{l_prefix}/share/postgresql
       rm -f $RPM_BUILD_ROOT%{l_prefix}/share/postgresql/slony1*v7[34].sql
       rm -f $RPM_BUILD_ROOT%{l_prefix}/share/postgresql/xxid.v73.sql
       mv $RPM_BUILD_ROOT%{l_prefix}/share/postgresql/xxid.v74.sql \