1. photon
  2. Commit 62bb9eee827b477561e300fcbe8e4a62465c3115
Browse code

postgresql: add client sub package

Installing postgresql package should bring both client and server
binaries.

Change-Id: I4f4f0687fb9d09c10de71673a5b85040f264b09e
Signed-off-by: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/23701
Reviewed-by: Vamsi Krishna Brahmajosyula <vamsi-krishna.brahmajosyula@broadcom.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>

Shreenidhi Shedi authored on 2024/04/09 14:48:15
Showing 6 changed files
SPECS/postgresql/postgresql.service
History View file @ 62bb9ee
... ... 
@@ -23,7 +23,7 @@ EnvironmentFile=/etc/sysconfig/%PGNAME%.conf
23 23 
 # Even though the $PGDATA variable is exported (postgres would accept that)
24 24 
 # use the -D option here so PGDATA content is printed by /bin/ps and by
25 25 
 # 'systemctl status'.
26 
-ExecStart=%PG_BINDIR% -D "${PGDATA}"
26 
+ExecStart=%PG_BINDIR%/postgres -D "${PGDATA}"
27 27 
 ExecReload=/bin/kill -HUP $MAINPID
28 28 
 KillMode=mixed
29 29 
 KillSignal=SIGINT
SPECS/postgresql/postgresql13.spec
History View file @ 62bb9ee
... ... 
@@ -13,7 +13,7 @@
13 13 
 Summary:        PostgreSQL database engine
14 14 
 Name:           postgresql13
15 15 
 Version:        13.14
16 
-Release:        5%{?dist}
16 
+Release:        6%{?dist}
17 17 
 License:        PostgreSQL
18 18 
 URL:            www.postgresql.org
19 19 
 Group:          Applications/Databases
... ... 
@@ -54,17 +54,8 @@ BuildRequires: tzdata
54 54 
 BuildRequires: util-linux-libs
55 55 
 BuildRequires: zlib-devel
56 56
57 
-Requires: krb5
58 
-Requires: icu
59 
-Requires: libedit
60 
-Requires: libxml2
61 
-Requires: openldap
62 
-Requires: openssl
63 
-Requires: readline
64 
-Requires: systemd
65 
-Requires: tzdata
66 
-Requires: zlib
67 
-Requires: %{name}-libs = %{version}-%{release}
57 
+Requires: %{name}-client = %{version}-%{release}
58 
+Requires: %{name}-server = %{version}-%{release}
68 59
69 60 
 %description
70 61 
 PostgreSQL is an advanced Object-Relational database management system (DBMS).
... ... 
@@ -78,6 +69,24 @@ If you want to manipulate a PostgreSQL database on a local or remote PostgreSQL
78 78 
 server, you need this package. You also need to install this package
79 79 
 if you're installing the postgresql13-server package.
80 80
81 
+%package client
82 
+Summary:  Postgresql client binaries
83 
+Requires: krb5
84 
+Requires: icu
85 
+Requires: libedit
86 
+Requires: libxml2
87 
+Requires: lz4
88 
+Requires: readline
89 
+Requires: systemd
90 
+Requires: tzdata
91 
+Requires: zlib
92 
+Requires: %{name}-libs = %{version}-%{release}
93 
+
94 
+Conflicts: %{name} < 13.14-6%{?dist}
95 
+
96 
+%description client
97 
+%{summary}
98 
+
81 99 
 %package libs
82 100 
 Summary:    The shared libraries required for any PostgreSQL clients
83 101 
 Group:      Applications/Databases
... ... 
@@ -302,7 +311,7 @@ run_test_path "src/test/subscription"
302 302 
 %post
303 303 
 /sbin/ldconfig
304 304
305 
-%posttrans
305 
+%posttrans client
306 306 
 alternatives --install %{_bindir}/clusterdb clusterdb %{_pgbindir}/clusterdb %{alter_weight} \
307 307 
     --slave %{_bindir}/createdb createdb %{_pgbindir}/createdb \
308 308 
     --slave %{_bindir}/createuser createuser %{_pgbindir}/createuser \
... ... 
@@ -323,7 +332,7 @@ alternatives --install %{_bindir}/clusterdb clusterdb %{_pgbindir}/clusterdb %{a
323 323
324 324 
 /sbin/ldconfig
325 325
326 
-%postun
326 
+%postun client
327 327 
 alternatives --remove clusterdb %{_pgbindir}/clusterdb
328 328 
 /sbin/ldconfig
329 329
... ... 
@@ -398,6 +407,9 @@ rm -rf %{buildroot}/*
398 398
399 399 
 %files
400 400 
 %defattr(-,root,root)
401 
+
402 
+%files client
403 
+%defattr(-,root,root)
401 404 
 %{_pgbindir}/clusterdb
402 405 
 %{_pgbindir}/createdb
403 406 
 %{_pgbindir}/createuser
... ... 
@@ -667,6 +679,8 @@ rm -rf %{buildroot}/*
667 667 
 %{_pglibdir}/plpython3.so
668 668
669 669 
 %changelog
670 
+* Tue Apr 09 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 13.14-6
671 
+- Introduce client subpackage, make main package a meta package
670 672 
 * Thu Mar 28 2024 Ashwin Dayanand Kamat <ashwin.kamat@broadcom.com> 13.14-5
671 673 
 - Bump version as a part of libxml2 upgrade
672 674 
 * Tue Mar 19 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 13.14-4
SPECS/postgresql/postgresql14.spec
History View file @ 62bb9ee
... ... 
@@ -13,7 +13,7 @@
13 13 
 Summary:        PostgreSQL database engine
14 14 
 Name:           postgresql14
15 15 
 Version:        14.11
16 
-Release:        5%{?dist}
16 
+Release:        6%{?dist}
17 17 
 License:        PostgreSQL
18 18 
 URL:            www.postgresql.org
19 19 
 Group:          Applications/Databases
... ... 
@@ -55,15 +55,8 @@ BuildRequires: tzdata
55 55 
 BuildRequires: util-linux-libs
56 56 
 BuildRequires: zlib-devel
57 57
58 
-Requires: icu
59 
-Requires: libedit
60 
-Requires: libxml2
61 
-Requires: lz4
62 
-Requires: readline
63 
-Requires: systemd
64 
-Requires: tzdata
65 
-Requires: zlib
66 
-Requires: %{name}-libs = %{version}-%{release}
58 
+Requires: %{name}-client = %{version}-%{release}
59 
+Requires: %{name}-server = %{version}-%{release}
67 60
68 61 
 %description
69 62 
 PostgreSQL is an advanced Object-Relational database management system (DBMS).
... ... 
@@ -77,6 +70,24 @@ If you want to manipulate a PostgreSQL database on a local or remote PostgreSQL
77 77 
 server, you need this package. You also need to install this package
78 78 
 if you're installing the postgresql-server package.
79 79
80 
+%package client
81 
+Summary:  Postgresql client binaries
82 
+Requires: krb5
83 
+Requires: icu
84 
+Requires: libedit
85 
+Requires: libxml2
86 
+Requires: lz4
87 
+Requires: readline
88 
+Requires: systemd
89 
+Requires: tzdata
90 
+Requires: zlib
91 
+Requires: %{name}-libs = %{version}-%{release}
92 
+
93 
+Conflicts: %{name} < 14.11-6%{?dist}
94 
+
95 
+%description client
96 
+%{summary}
97 
+
80 98 
 %package libs
81 99 
 Summary:    The shared libraries required for any PostgreSQL clients
82 100 
 Group:      Applications/Databases
... ... 
@@ -313,7 +324,7 @@ run_test_path "src/test/subscription"
313 313 
 %post
314 314 
 /sbin/ldconfig
315 315
316 
-%posttrans
316 
+%posttrans client
317 317 
 alternatives --install %{_bindir}/clusterdb clusterdb %{_pgbindir}/clusterdb %{alter_weight} \
318 318 
     --slave %{_bindir}/createdb createdb %{_pgbindir}/createdb \
319 319 
     --slave %{_bindir}/createuser createuser %{_pgbindir}/createuser \
... ... 
@@ -334,7 +345,7 @@ alternatives --install %{_bindir}/clusterdb clusterdb %{_pgbindir}/clusterdb %{a
334 334
335 335 
 /sbin/ldconfig
336 336
337 
-%postun
337 
+%postun client
338 338 
 alternatives --remove clusterdb %{_pgbindir}/clusterdb
339 339 
 /sbin/ldconfig
340 340
... ... 
@@ -408,6 +419,9 @@ rm -rf %{buildroot}/*
408 408
409 409 
 %files
410 410 
 %defattr(-,root,root)
411 
+
412 
+%files client
413 
+%defattr(-,root,root)
411 414 
 %{_pgbindir}/clusterdb
412 415 
 %{_pgbindir}/createdb
413 416 
 %{_pgbindir}/createuser
... ... 
@@ -682,6 +696,8 @@ rm -rf %{buildroot}/*
682 682 
 %{_pglibdir}/plpython3.so
683 683
684 684 
 %changelog
685 
+* Tue Apr 09 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 14.11-6
686 
+- Introduce client subpackage, make main package a meta package
685 687 
 * Thu Mar 28 2024 Ashwin Dayanand Kamat <ashwin.kamat@broadcom.com> 14.11-5
686 688 
 - Bump version as a part of libxml2 upgrade
687 689 
 * Tue Mar 19 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 14.11-4
SPECS/postgresql/postgresql15.spec
History View file @ 62bb9ee
... ... 
@@ -13,7 +13,7 @@
13 13 
 Summary:        PostgreSQL database engine
14 14 
 Name:           postgresql15
15 15 
 Version:        15.6
16 
-Release:        5%{?dist}
16 
+Release:        6%{?dist}
17 17 
 License:        PostgreSQL
18 18 
 URL:            www.postgresql.org
19 19 
 Group:          Applications/Databases
... ... 
@@ -55,15 +55,8 @@ BuildRequires: tzdata
55 55 
 BuildRequires: util-linux-libs
56 56 
 BuildRequires: zlib-devel
57 57
58 
-Requires: icu
59 
-Requires: libedit
60 
-Requires: libxml2
61 
-Requires: lz4
62 
-Requires: readline
63 
-Requires: systemd
64 
-Requires: tzdata
65 
-Requires: zlib
66 
-Requires: %{name}-libs = %{version}-%{release}
58 
+Requires: %{name}-client = %{version}-%{release}
59 
+Requires: %{name}-server = %{version}-%{release}
67 60
68 61 
 %description
69 62 
 PostgreSQL is an advanced Object-Relational database management system (DBMS).
... ... 
@@ -77,6 +70,24 @@ If you want to manipulate a PostgreSQL database on a local or remote PostgreSQL
77 77 
 server, you need this package. You also need to install this package
78 78 
 if you're installing the postgresql-server package.
79 79
80 
+%package client
81 
+Summary:  Postgresql client binaries
82 
+Requires: krb5
83 
+Requires: icu
84 
+Requires: libedit
85 
+Requires: libxml2
86 
+Requires: lz4
87 
+Requires: readline
88 
+Requires: systemd
89 
+Requires: tzdata
90 
+Requires: zlib
91 
+Requires: %{name}-libs = %{version}-%{release}
92 
+
93 
+Conflicts: %{name} < 15.6-6%{?dist}
94 
+
95 
+%description client
96 
+%{summary}
97 
+
80 98 
 %package libs
81 99 
 Summary:    The shared libraries required for any PostgreSQL clients
82 100 
 Group:      Applications/Databases
... ... 
@@ -313,7 +324,7 @@ run_test_path "src/test/subscription"
313 313 
 %post
314 314 
 /sbin/ldconfig
315 315
316 
-%posttrans
316 
+%posttrans client
317 317 
 alternatives --install %{_bindir}/clusterdb clusterdb %{_pgbindir}/clusterdb %{alter_weight} \
318 318 
     --slave %{_bindir}/createdb createdb %{_pgbindir}/createdb \
319 319 
     --slave %{_bindir}/createuser createuser %{_pgbindir}/createuser \
... ... 
@@ -334,7 +345,7 @@ alternatives --install %{_bindir}/clusterdb clusterdb %{_pgbindir}/clusterdb %{a
334 334
335 335 
 /sbin/ldconfig
336 336
337 
-%postun
337 
+%postun client
338 338 
 alternatives --remove clusterdb %{_pgbindir}/clusterdb
339 339 
 /sbin/ldconfig
340 340
... ... 
@@ -408,6 +419,9 @@ rm -rf %{buildroot}/*
408 408
409 409 
 %files
410 410 
 %defattr(-,root,root)
411 
+
412 
+%files client
413 
+%defattr(-,root,root)
411 414 
 %{_pgbindir}/clusterdb
412 415 
 %{_pgbindir}/createdb
413 416 
 %{_pgbindir}/createuser
... ... 
@@ -686,6 +700,8 @@ rm -rf %{buildroot}/*
686 686 
 %{_pglibdir}/plpython3.so
687 687
688 688 
 %changelog
689 
+* Tue Apr 09 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 15.6-6
690 
+- Introduce client subpackage, make main package a meta package
689 691 
 * Thu Mar 28 2024 Ashwin Dayanand Kamat <ashwin.kamat@broadcom.com> 15.6-5
690 692 
 - Bump version as a part of libxml2 upgrade
691 693 
 * Tue Mar 19 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 15.6-4
SPECS/postgresql/postgresql16.spec
History View file @ 62bb9ee
... ... 
@@ -13,7 +13,7 @@
13 13 
 Summary:        PostgreSQL database engine
14 14 
 Name:           postgresql16
15 15 
 Version:        16.2
16 
-Release:        5%{?dist}
16 
+Release:        6%{?dist}
17 17 
 License:        PostgreSQL
18 18 
 URL:            www.postgresql.org
19 19 
 Group:          Applications/Databases
... ... 
@@ -56,15 +56,8 @@ BuildRequires: tzdata
56 56 
 BuildRequires: util-linux-libs
57 57 
 BuildRequires: zlib-devel
58 58
59 
-Requires: icu
60 
-Requires: libedit
61 
-Requires: libxml2
62 
-Requires: lz4
63 
-Requires: readline
64 
-Requires: systemd
65 
-Requires: tzdata
66 
-Requires: zlib
67 
-Requires: %{name}-libs = %{version}-%{release}
59 
+Requires: %{name}-client = %{version}-%{release}
60 
+Requires: %{name}-server = %{version}-%{release}
68 61
69 62 
 %description
70 63 
 PostgreSQL is an advanced Object-Relational database management system (DBMS).
... ... 
@@ -78,6 +71,24 @@ If you want to manipulate a PostgreSQL database on a local or remote PostgreSQL
78 78 
 server, you need this package. You also need to install this package
79 79 
 if you're installing the postgresql-server package.
80 80
81 
+%package client
82 
+Summary:  Postgresql client binaries
83 
+Requires: krb5
84 
+Requires: icu
85 
+Requires: libedit
86 
+Requires: libxml2
87 
+Requires: lz4
88 
+Requires: readline
89 
+Requires: systemd
90 
+Requires: tzdata
91 
+Requires: zlib
92 
+Requires: %{name}-libs = %{version}-%{release}
93 
+
94 
+Conflicts: %{name} < 16.2-6%{?dist}
95 
+
96 
+%description client
97 
+%{summary}
98 
+
81 99 
 %package libs
82 100 
 Summary:    The shared libraries required for any PostgreSQL clients
83 101 
 Group:      Applications/Databases
... ... 
@@ -314,7 +325,7 @@ run_test_path "src/test/subscription"
314 314 
 %post
315 315 
 /sbin/ldconfig
316 316
317 
-%posttrans
317 
+%posttrans client
318 318 
 alternatives --install %{_bindir}/clusterdb clusterdb %{_pgbindir}/clusterdb %{alter_weight} \
319 319 
     --slave %{_bindir}/createdb createdb %{_pgbindir}/createdb \
320 320 
     --slave %{_bindir}/createuser createuser %{_pgbindir}/createuser \
... ... 
@@ -335,7 +346,7 @@ alternatives --install %{_bindir}/clusterdb clusterdb %{_pgbindir}/clusterdb %{a
335 335
336 336 
 /sbin/ldconfig
337 337
338 
-%postun
338 
+%postun client
339 339 
 alternatives --remove clusterdb %{_pgbindir}/clusterdb
340 340 
 /sbin/ldconfig
341 341
... ... 
@@ -408,6 +419,9 @@ rm -rf %{buildroot}/*
408 408
409 409 
 %files
410 410 
 %defattr(-,root,root)
411 
+
412 
+%files client
413 
+%defattr(-,root,root)
411 414 
 %{_pgbindir}/clusterdb
412 415 
 %{_pgbindir}/createdb
413 416 
 %{_pgbindir}/createuser
... ... 
@@ -684,6 +698,8 @@ rm -rf %{buildroot}/*
684 684 
 %{_pglibdir}/plpython3.so
685 685
686 686 
 %changelog
687 
+* Tue Apr 09 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 16.2-6
688 
+- Introduce client subpackage, make main package a meta package
687 689 
 * Thu Mar 28 2024 Ashwin Dayanand Kamat <ashwin.kamat@broadcom.com> 16.2-5
688 690 
 - Bump version as a part of libxml2 upgrade
689 691 
 * Tue Mar 19 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 16.2-4
SPECS/postgresql/systemd-unit-instructions
History View file @ 62bb9ee
... ... 
@@ -4,7 +4,7 @@ mkdir -p %{buildroot}{%{_tmpfilesdir},%{_unitdir},%{_libexecdir}} \
4 4 
 install -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
5 5
6 6 
 sed -i -e "s/%PGNAME%/%{name}/g" %{SOURCE2}
7 
-sed -i -e "s|%PG_BINDIR%|%{_pgbindir}/postgres|g" %{SOURCE2}
7 
+sed -i -e "s|%PG_BINDIR%|%{_pgbindir}|g" %{SOURCE2}
8 8 
 cp %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
9 9
10 10 
 sed -i -e "s/%PGMAJVER%/%{pgmajorversion}/g" %{SOURCE3}