Move pg_config from -server to -devel to fix build of certain client software

OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=45
2011-02-16 19:13:51 +00:00
parent 95dee05935
commit 1699be4f2a
5 changed files with 41 additions and 8 deletions
--- a/postgresql-libs.changes
+++ b/postgresql-libs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 16 19:10:54 UTC 2011 - max@novell.com
+
+- Move pg_config from -server to -devel to fix build of certain
+  client apps and language bindings, but using pg_config on the
+  client side is still considered broken, because it tells what
+  got linked into the server binary not what got linked into libpq.
+
 -------------------------------------------------------------------
 Tue Feb  8 18:23:22 UTC 2011 - max@novell.com

--- a/postgresql-libs.spec
+++ b/postgresql-libs.spec
@@ -152,20 +152,23 @@ export CFLAGS="%optflags $SP"
 make -C src/backend %{?jobs:-j%jobs} libpq-recursive
 make -C src/interfaces %{?jobs:-j%jobs}
 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
 install -d %buildroot%_mandir/man1
-install doc/src/sgml/man1/ecpg.1 %buildroot%_mandir/man1
+install doc/src/sgml/man1/{ecpg,pg_config}.1 %buildroot%_mandir/man1
 # Don't ship static libraries, libpgport.a is needed, though.
 rm -f $(ls %buildroot/%_libdir/*.a | grep -F -v libpgport.a)

 %find_lang libpq5-%{pg_minor_version} %libpq.lang
 %find_lang ecpglib6-%{pg_minor_version} %libecpg.lang
 %find_lang ecpg-%{pg_minor_version} %_name-devel.lang 
+%find_lang pg_config-%{pg_minor_version} %_name-devel.lang 
 %post -n %libpq -p /sbin/ldconfig
 %postun -n %libpq -p /sbin/ldconfig
 %post -n %libecpg -p /sbin/ldconfig
@@ -187,6 +190,8 @@ rm -f %my_provides
 %files -n %_name-devel -f %_name-devel.lang
 %defattr(-,root,root)
 %doc %_mandir/man1/ecpg.1*
+%_bindir/pg_config
+%doc %_mandir/man1/pg_config.1*
 %_bindir/ecpg
 %_libdir/libpgport.a
 %_libdir/lib*.so
--- a/postgresql.changes
+++ b/postgresql.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 16 19:10:54 UTC 2011 - max@novell.com
+
+- Move pg_config from -server to -devel to fix build of certain
+  client apps and language bindings, but using pg_config on the
+  client side is still considered broken, because it tells what
+  got linked into the server binary not what got linked into libpq.
+
 -------------------------------------------------------------------
 Tue Feb  8 18:23:22 UTC 2011 - max@novell.com

--- a/postgresql.spec
+++ b/postgresql.spec
@@ -302,10 +302,12 @@ 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
 # Don't ship static libraries, libpgport.a is needed, though.
 rm -f $(ls %buildroot/%_libdir/*.a | grep -F -v libpgport.a)
@@ -346,8 +348,9 @@ done
 %find_lang libpq5-%{pg_minor_version} %libpq.lang
 %find_lang ecpglib6-%{pg_minor_version} %libecpg.lang
 %find_lang ecpg-%{pg_minor_version} %_name-devel.lang 
+%find_lang pg_config-%{pg_minor_version} %_name-devel.lang 
 %endif
-for serverapp in initdb postgres pg_controldata pg_ctl pg_resetxlog plpgsql pg_config;do
+for serverapp in initdb postgres pg_controldata pg_ctl pg_resetxlog plpgsql;do
 %find_lang $serverapp-%{pg_minor_version}  %{name}-server.lang
 done
 for pl in plperl plpython pltcl; do
@@ -444,6 +447,8 @@ rm -f %my_provides
 %_libdir/postgresql/plpgsql.so
 %_libdir/postgresql/dict_snowball.so
 %_datadir/postgresql/tsearch_data
+%exclude %_datadir/postgresql/tsearch_data/unaccent.rules
+%exclude %_datadir/postgresql/tsearch_data/xsyn_sample.rules
 %_bindir/initdb
 %doc %_mandir/man1/initdb.1*
 %_bindir/pg_ctl
@@ -457,8 +462,6 @@ rm -f %my_provides
 %_bindir/postmaster
 %doc %_mandir/man1/postmaster.1*
 %dir %_datadir/postgresql
-%_bindir/pg_config
-%doc %_mandir/man1/pg_config.1*
 %_datadir/postgresql/timezone*
 %_datadir/postgresql/*.*
 %exclude %_datadir/postgresql/*.pltcl
@@ -499,6 +502,8 @@ rm -f %my_provides
 %files -n %_name-devel -f %_name-devel.lang
 %defattr(-,root,root)
 %doc %_mandir/man1/ecpg.1*
+%_bindir/pg_config
+%doc %_mandir/man1/pg_config.1*
 %_bindir/ecpg
 %_libdir/libpgport.a
 %_libdir/lib*.so
--- a/postgresql.spec.in
+++ b/postgresql.spec.in
@@ -293,6 +293,7 @@ IF_LIBS
 make -C src/backend %{?jobs:-j%jobs} libpq-recursive
 make -C src/interfaces %{?jobs:-j%jobs}
 make -C src/port %{?jobs:-j%jobs} libpgport.a
+make -C src/bin/pg_config %{?jobs:-j%jobs} pg_config
 FI_LIBS
 IF_POSTGRES
 make %{?jobs:-j%jobs} world
@@ -324,10 +325,12 @@ 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
@@ -335,8 +338,9 @@ 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
 install -d %buildroot%_mandir/man1
-install doc/src/sgml/man1/ecpg.1 %buildroot%_mandir/man1
+install doc/src/sgml/man1/{ecpg,pg_config}.1 %buildroot%_mandir/man1
 FI_LIBS
 # Don't ship static libraries, libpgport.a is needed, though.
 rm -f $(ls %buildroot/%_libdir/*.a | grep -F -v libpgport.a)
@@ -379,9 +383,10 @@ FI_POSTGRES
 %find_lang libpq5-%{pg_minor_version} %libpq.lang
 %find_lang ecpglib6-%{pg_minor_version} %libecpg.lang
 %find_lang ecpg-%{pg_minor_version} %_name-devel.lang 
+%find_lang pg_config-%{pg_minor_version} %_name-devel.lang 
 IF_POSTGRES
 %endif
-for serverapp in initdb postgres pg_controldata pg_ctl pg_resetxlog plpgsql pg_config;do
+for serverapp in initdb postgres pg_controldata pg_ctl pg_resetxlog plpgsql;do
 %find_lang $serverapp-%{pg_minor_version}  %{name}-server.lang
 done
 for pl in plperl plpython pltcl; do
@@ -480,6 +485,8 @@ IF_POSTGRES
 %_libdir/postgresql/plpgsql.so
 %_libdir/postgresql/dict_snowball.so
 %_datadir/postgresql/tsearch_data
+%exclude %_datadir/postgresql/tsearch_data/unaccent.rules
+%exclude %_datadir/postgresql/tsearch_data/xsyn_sample.rules
 %_bindir/initdb
 %doc %_mandir/man1/initdb.1*
 %_bindir/pg_ctl
@@ -493,8 +500,6 @@ IF_POSTGRES
 %_bindir/postmaster
 %doc %_mandir/man1/postmaster.1*
 %dir %_datadir/postgresql
-%_bindir/pg_config
-%doc %_mandir/man1/pg_config.1*
 %_datadir/postgresql/timezone*
 %_datadir/postgresql/*.*
 %exclude %_datadir/postgresql/*.pltcl
@@ -536,6 +541,8 @@ FI_POSTGRES
 %files -n %_name-devel -f %_name-devel.lang
 %defattr(-,root,root)
 %doc %_mandir/man1/ecpg.1*
+%_bindir/pg_config
+%doc %_mandir/man1/pg_config.1*
 %_bindir/ecpg
 %_libdir/libpgport.a
 %_libdir/lib*.so