Fix build of external server extensions

OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=46

postgresql-libs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 17 11:38:42 UTC 2011 - max@novell.com
+
+- Move all of pgxs into the devel package to fix build of server
+  extensions.
+
 -------------------------------------------------------------------
 Wed Feb 16 19:10:54 UTC 2011 - max@novell.com
 

postgresql-libs.spec

@@ -155,13 +155,24 @@ make -C src/port %{?jobs:-j%jobs} libpgport.a
 make -C src/bin/pg_config %{?jobs:-j%jobs} pg_config
 
 %install
-for dir in interfaces include port; do
-    make -C src/$dir DESTDIR=%buildroot install
-done
-make -C src DESTDIR=%buildroot install-local
-make -C src/bin/pg_config DESTDIR=%buildroot install
+SUBINSTALL=install
 install -d %buildroot%_mandir/man1
 install doc/src/sgml/man1/{ecpg,pg_config}.1 %buildroot%_mandir/man1
+if test -n "$SUBINSTALL"; then
+# Install them for postgresql-libs and uninstall them for postgresql
+make -C src DESTDIR=%buildroot $SUBINSTALL-local
+for dir in \
+        config \
+        src/bin/pg_config \
+        src/interfaces \
+        src/include \
+        src/makefiles \
+        src/port \
+        src/test/regress
+do
+        make -C $dir DESTDIR=%buildroot $SUBINSTALL
+done
+fi
 # Don't ship static libraries, libpgport.a is needed, though.
 rm -f $(ls %buildroot/%_libdir/*.a | grep -F -v libpgport.a)
 

postgresql.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 17 11:38:42 UTC 2011 - max@novell.com
+
+- Move all of pgxs into the devel package to fix build of server
+  extensions.
+
 -------------------------------------------------------------------
 Wed Feb 16 19:10:54 UTC 2011 - max@novell.com
 

postgresql.spec

@@ -296,19 +296,26 @@ make check || {
 
 %install
 make DESTDIR=%buildroot install install-docs
+SUBINSTALL=uninstall
 %if !%buildall
-make -C src/interfaces DESTDIR=%buildroot uninstall
-make -C src/include DESTDIR=%buildroot uninstall
-make -C src/port DESTDIR=%buildroot uninstall
-make -C src/makefiles DESTDIR=%buildroot uninstall
-make -C src DESTDIR=%buildroot uninstall-local
-make -C src/bin/pg_config DESTDIR=%buildroot uninstall
-# We don't want to package these
-rm -f %buildroot%_libdir/postgresql/pgxs/config/install-sh
-rm -f %buildroot%_libdir/postgresql/pgxs/src/test/regress/pg_regress
 rm -f %buildroot%_mandir/*/ecpg*
 rm -f %buildroot%_mandir/*/pg_config*
 %endif
+if test -n "$SUBINSTALL"; then
+# Install them for postgresql-libs and uninstall them for postgresql
+make -C src DESTDIR=%buildroot $SUBINSTALL-local
+for dir in \
+        config \
+        src/bin/pg_config \
+        src/interfaces \
+        src/include \
+        src/makefiles \
+        src/port \
+        src/test/regress
+do
+        make -C $dir DESTDIR=%buildroot $SUBINSTALL
+done
+fi
 # Don't ship static libraries, libpgport.a is needed, though.
 rm -f $(ls %buildroot/%_libdir/*.a | grep -F -v libpgport.a)
 

postgresql.spec.in

@@ -319,29 +319,32 @@ FI_POSTGRES
 %install
 IF_POSTGRES
 make DESTDIR=%buildroot install install-docs
+SUBINSTALL=uninstall
 %if !%buildall
-make -C src/interfaces DESTDIR=%buildroot uninstall
-make -C src/include DESTDIR=%buildroot uninstall
-make -C src/port DESTDIR=%buildroot uninstall
-make -C src/makefiles DESTDIR=%buildroot uninstall
-make -C src DESTDIR=%buildroot uninstall-local
-make -C src/bin/pg_config DESTDIR=%buildroot uninstall
-# We don't want to package these
-rm -f %buildroot%_libdir/postgresql/pgxs/config/install-sh
-rm -f %buildroot%_libdir/postgresql/pgxs/src/test/regress/pg_regress
 rm -f %buildroot%_mandir/*/ecpg*
 rm -f %buildroot%_mandir/*/pg_config*
 %endif
 FI_POSTGRES
 IF_LIBS
-for dir in interfaces include port; do
-    make -C src/$dir DESTDIR=%buildroot install
-done
-make -C src DESTDIR=%buildroot install-local
-make -C src/bin/pg_config DESTDIR=%buildroot install
+SUBINSTALL=install
 install -d %buildroot%_mandir/man1
 install doc/src/sgml/man1/{ecpg,pg_config}.1 %buildroot%_mandir/man1
 FI_LIBS
+if test -n "$SUBINSTALL"; then
+# Install them for postgresql-libs and uninstall them for postgresql
+make -C src DESTDIR=%buildroot $SUBINSTALL-local
+for dir in \
+        config \
+        src/bin/pg_config \
+        src/interfaces \
+        src/include \
+        src/makefiles \
+        src/port \
+        src/test/regress
+do
+        make -C $dir DESTDIR=%buildroot $SUBINSTALL
+done
+fi
 # Don't ship static libraries, libpgport.a is needed, though.
 rm -f $(ls %buildroot/%_libdir/*.a | grep -F -v libpgport.a)