fix %setup commands and remember that even the latest pgcluster patch is for 8.1

postgresql82/postgresql82.spec

@@ -22,6 +22,8 @@
 ##  SUCH DAMAGE.
 ##
 
+#   FIXME: rse: at least pgcluster patch still not ported to 8.2
+
 #   package versions
 %define       V_postgresql_base 8.2
 %define       V_postgresql_beta 3
@@ -30,8 +32,8 @@
 %define       V_pgperl          2.0.2
 %define       V_psqlodbc        08.02.0200
 %define       V_slony1          1.1.5
-%define       V_pgcluster       1.5.0rc9
-%define       V_pgcluster_dir   1123
+%define       V_pgcluster       1.5.0rc10
+%define       V_pgcluster_dir   1165
 %define       V_mysqlcompat     1.0b3
 %define       V_mysqlcompat_dir 548
 
@@ -46,7 +48,7 @@ Class:        BASE
 Group:        Database
 License:      GPL
 Version:      %{V_postgresql_base}b%{V_postgresql_beta}
-Release:      20061120
+Release:      20061121
 
 #   package options
 %option       with_server       yes
@@ -174,8 +176,8 @@ Conflicts:    postgresql
     %setup -q -n postgresql-%{V_postgresql_base}beta%{V_postgresql_beta}
     %patch -p0
 %if "%{with_cxx}" == "yes"
-    %setup -q -T -D -a 1
-    %setup -q -T -D -a 2
+    %setup -q -n postgresql-%{V_postgresql_base}beta%{V_postgresql_beta} -T -D -a 1
+    %setup -q -n postgresql-%{V_postgresql_base}beta%{V_postgresql_beta} -T -D -a 2
     case "%{l_platform -t}" in
         *-sunos* )
             %{l_shtool} subst \
@@ -196,22 +198,22 @@ Conflicts:    postgresql
         libpqxx-%{V_libpqxx}/configure
 %endif
 %if "%{with_perl}" == "yes"
-    %setup -q -T -D -a 3
+    %setup -q -n postgresql-%{V_postgresql_base}beta%{V_postgresql_beta} -T -D -a 3
 %endif
 %if "%{with_odbc}" == "yes"
-    %setup -q -T -D -a 4
+    %setup -q -n postgresql-%{V_postgresql_base}beta%{V_postgresql_beta} -T -D -a 4
 %endif
 %if "%{with_slony1}" == "yes"
-    %setup -q -T -D -a 5
+    %setup -q -n postgresql-%{V_postgresql_base}beta%{V_postgresql_beta} -T -D -a 5
 %endif
 %if "%{with_pgcluster}" == "yes"
-    %setup -q -T -D -a 6
+    %setup -q -n postgresql-%{V_postgresql_base}beta%{V_postgresql_beta} -T -D -a 6
     sed -e '/^diff.*libpq\.rc/,/^diff/d' pgcluster-*-patch |\
     sed -e 's;(char .)\(ptr .= readlen\);\1;' |\
     %{l_patch} -p1
 %endif
 %if "%{with_mysqlcompat}" == "yes"
-    %setup -q -T -D -a 7
+    %setup -q -n postgresql-%{V_postgresql_base}beta%{V_postgresql_beta} -T -D -a 7
 %endif
 %if "%{with_kerberos}" == "yes"
     %{l_shtool} subst \