X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=6cc0fe87ffd4bddb9fb95c4afbf9ffb2c0552d70;hb=e5cd810d1003fb9edafc2ec6fd59e4348fa14f21;hp=3306e812f93e585620d27a5703beb2c64e035a97;hpb=033304e995480cf81544eda98884bd84a4107f5e;p=packages%2Fpostgresql.git

diff --git a/postgresql.spec b/postgresql.spec
index 3306e81..6cc0fe8 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -83,11 +83,10 @@ BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
 Requires(triggerpostun):	/bin/id
 Requires(triggerpostun):	/usr/sbin/usermod
 Requires:	%{name}-clients >= %{version}-%{release}
+Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	postgresql-libs = %{version}-%{release}
 Requires:	rc-scripts >= 0.4.3.0
 Requires:	tzdata
@@ -171,6 +170,30 @@ PostgreSQL.
 PostgreSQL może być uruchomiony pod następującymi systemami: Solaris,
 SunOS, HPUX, AIX, Linux, Irix, FreeBSD i innymi systemami uniksowymi.
 
+%package -n postgresql-common
+Summary:	Common PostgreSQL files and directories
+Summary(pl.UTF-8):	PostgreSQL - wspólne pliki i katalogi
+Group:		Applicataion/Databases
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+
+%description -n postgresql-common
+Common PostgreSQL files and directories.
+
+%description -n postgresql-common -l pl.UTF-8
+PostgreSQL - wspólne pliki i katalogi.
+
+%package dirs
+Summary:	Common directories for PostgresSQL %{pgver}
+Summary(pl.UTF-8):	Wspólne pliki i katalogi dla PostgreSQL %{pgver}
+Group:		Applicataion/Databases
+
+%description dirs
+Common directories for PostgresSQL %{pgver}
+
+%description dirs -l pl.UTF-8
+Wspólne pliki i katalogi dla PostgreSQL %{pgver}
+
 %package -n postgresql-devel
 Summary:	PostgreSQL development header files and libraries
 Summary(de.UTF-8):	PostgreSQL-Entwicklungs-Header-Dateien und Libraries
@@ -182,6 +205,7 @@ Summary(ru.UTF-8):	PostgreSQL - хедеры и библиотеки разра
 Summary(tr.UTF-8):	PostgreSQL başlık dosyaları ve kitaplıklar
 Summary(uk.UTF-8):	PostgreSQL - хедери та бібліотеки програміста
 Group:		Development/Libraries
+Requires:	alternatives
 Requires:	postgresql-libs = %{version}-%{release}
 
 %description -n postgresql-devel
@@ -217,6 +241,7 @@ Summary(ru.UTF-8):	Клиентские программы, необходимы
 Summary(uk.UTF-8):	Клієнтські програми, необхідні для доступу до сервера PostgreSQL
 Group:		Applications/Databases
 Requires:	alternatives
+Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	postgresql-libs = %{version}-%{release}
 
 %description clients
@@ -251,6 +276,7 @@ Summary(pl.UTF-8):	Biblioteki dzielone programu PostgreSQL
 Summary(pt_BR.UTF-8):	Biblioteca compartilhada do PostgreSQL
 Summary(zh_CN.UTF-8):	PostgreSQL 客户所需要的共享库
 Group:		Libraries
+Requires:	postgresql-common = %{version}-%{release}
 
 %description -n postgresql-libs
 PostgreSQL shared libraries.
@@ -262,6 +288,7 @@ Biblioteki dzielone programu PostgreSQL.
 Summary:	Embedded SQL in C interface
 Summary(pl.UTF-8):	Interfejs wbudowanego SQL-a w język C
 Group:		Libraries
+Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	postgresql-libs = %{version}-%{release}
 Requires:	postgresql-ecpg-libs = %{version}-%{release}
 
@@ -708,8 +735,6 @@ if [ "$foundold" = "1" ]; then
 	echo
 	exit 1
 fi
-%groupadd -g 88 -r postgres
-%useradd -M -o -r -u 88 -d /home/services/postgres -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
 
 %triggerpostun -- %{name} < 7.2-2
 if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then
@@ -726,7 +751,11 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del postgresql10
 fi
 
-%post clients
+%pre	-n postgresql-common
+%groupadd -g 88 -r postgres
+%useradd -M -o -r -u 88 -d /home/services/postgres -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
+
+%post	clients
 update-alternatives \
 	--install %{_bindir}/clusterdb clusterdb %{pgsqllibdir}/bin/clusterdb %{pgver}%{pgminver} \
 	--slave %{_mandir}/man1/clusterdb.1 clusterdb.1 %{pgsqldatadir}/man/man1/clusterdb.1* || :
@@ -767,7 +796,7 @@ update-alternatives \
 	--install %{_bindir}/vacuumdb vacuumdb %{pgsqllibdir}/bin/vacuumdb %{pgver}%{pgminver} \
 	--slave %{_mandir}/man1/vacuumdb.1 vacuumdb.1 %{pgsqldatadir}/man/man1/vacuumdb.1* || :
 
-%postun clients
+%postun	clients
 if [ $1 -eq 0 ]; then
 	update-alternatives --remove clusterdb %{pgsqllibdir}/bin/clusterdb || :
 	update-alternatives --remove createdb %{pgsqllibdir}/bin/createdb || :
@@ -784,6 +813,15 @@ if [ $1 -eq 0 ]; then
 	update-alternatives --remove vacuumdb %{pgsqllibdir}/bin/vacuumdb || :
 fi
 
+%post	-n postgresql-devel
+update-alternatives \
+	--install %{_bindir}/pg_config pg_config %{pgsqllibdir}/bin/pg_config %{pgver}%{pgminver} \
+	--slave %{_mandir}/man1/pg_config.1 pg_config.1 %{pgsqldatadir}/man/man1/pg_config.1* || :
+
+%postun	-n postgresql-devel
+	update-alternatives --remove pg_config %{pgsqllibdir}/bin/pg_config || :
+
+
 %post	-n postgresql-libs -p /sbin/ldconfig
 %postun	-n postgresql-libs -p /sbin/ldconfig
 
@@ -829,7 +867,6 @@ fi
 %{extensiondir}/plpgsql--*.sql
 %{extensiondir}/plpgsql.control
 
-%dir %{pgsqldatadir}
 %{pgsqldatadir}/*.bki
 %{pgsqldatadir}/*.sample
 %{pgsqldatadir}/*.description
@@ -861,6 +898,22 @@ fi
 %{pgsqldatadir}/man/man1/postgres.1*
 %{pgsqldatadir}/man/man1/postmaster.1*
 
+%files -n postgresql-common
+%defattr(644,root,root,755)
+%dir %{_libdir}/postgresql
+%dir %{_datadir}/postgresql
+
+%files dirs
+%defattr(644,root,root,755)
+%dir %{pgsqllibdir}
+%dir %{pgsqllibdir}/bin
+%dir %{pgsqllibdir}/lib
+%dir %{pgsqldatadir}
+%dir %{pgsqldatadir}/man
+%dir %{pgsqldatadir}/man/man1
+%dir %{pgsqldatadir}/man/man3
+%dir %{pgsqldatadir}/man/man7
+
 %files doc
 %defattr(644,root,root,755)
 %doc doc/src/sgml/html howto