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

diff --git a/postgresql.spec b/postgresql.spec
index 6cc0fe8..c0f9241 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -90,6 +90,7 @@ Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	postgresql-libs = %{version}-%{release}
 Requires:	rc-scripts >= 0.4.3.0
 Requires:	tzdata
+Obsoletes:	postgresql
 Obsoletes:	postgresql-module-plpgsql
 Obsoletes:	postgresql-module-tsearch2
 Obsoletes:	postgresql-server
@@ -223,6 +224,7 @@ Summary(pl.UTF-8):	PostgreSQL - pliki nagłówkowe dla backendu
 Group:		Development/Libraries
 Requires:	postgresql-devel = %{version}-%{release}
 Requires:	postgresql-libs = %{version}-%{release}
+Obsoletes:	postgresql-backend-devel
 
 %description backend-devel
 This package contains header files required to compile functions that
@@ -243,6 +245,7 @@ Group:		Applications/Databases
 Requires:	alternatives
 Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	postgresql-libs = %{version}-%{release}
+Obsoletes:	postgresql-clients
 
 %description clients
 This package includes only the clients needed to access an PostgreSQL
@@ -260,6 +263,7 @@ poleceń. Serwer znajduje się w głównym pakiecie.
 Summary:	Documentation for PostgreSQL
 Summary(pl.UTF-8):	Dodatkowa dokumantacja dla PostgreSQL
 Group:		Applications/Databases
+Obsoletes:	postgresql-doc
 
 %description doc
 This package includes documentation and HOWTO for programmer, admin
@@ -291,6 +295,7 @@ Group:		Libraries
 Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	postgresql-libs = %{version}-%{release}
 Requires:	postgresql-ecpg-libs = %{version}-%{release}
+Obsoletes:	postgresql-ecpg
 
 %description ecpg
 Embedded SQL in C interface.
@@ -362,6 +367,7 @@ Summary:	PL/perl - PostgreSQL procedural language
 Summary(pl.UTF-8):	PL/perl - język proceduralny bazy danych PostgreSQL
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	postgresql-module-plperl
 
 %description module-plperl
 From PostgreSQL documentation:
@@ -397,6 +403,7 @@ Summary(pl.UTF-8):	PL/Python - język proceduralny bazy danych PostgreSQL
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
 %pyrequires_eq	python
+Obsoletes:	postgresql-module-plpython
 
 %description module-plpython
 From PostgreSQL documentation:
@@ -432,6 +439,7 @@ Summary(pl.UTF-8):	PL/Tcl - język proceduralny bazy danych PostgreSQL
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
 Requires:	tcl(Pgtcl)
+Obsoletes:	postgresql-module-pltcl
 
 %description module-pltcl
 From PostgreSQL documentation:
@@ -466,6 +474,7 @@ Summary:	dblink module for PostgreSQL
 Summary(pl.UTF-8):	Moduł dblink dla PostgreSQL-a
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	postgresql-module-dblink
 
 %description module-dblink
 dblink module for PostgreSQL provides functions returning results from
@@ -480,6 +489,7 @@ Summary:	Large Objects module for PostgreSQL
 Summary(pl.UTF-8):	Moduł Large Objects dla PostgreSQL-a
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	postgresql-module-lo
 
 %description module-lo
 Large Objects module for PostgreSQL adds a new data type 'lo', some
@@ -495,6 +505,7 @@ Summary:	Trigram matching for PostgreSQL
 Summary(pl.UTF-8):	Dopasowanie trigramowe dla PostgreSQL-a
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	postgresql-module-pg_trgm
 
 %description module-pg_trgm
 This module provides functions and index classes for determining the
@@ -509,6 +520,7 @@ Summary:	Cryptographic functions for PostgreSQL
 Summary(pl.UTF-8):	Funkcje kryptograficzne dla PostgreSQL-a
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	postgresql-module-pgcrypto
 
 %description module-pgcrypto
 Cryptographic functions for PostgreSQL.
@@ -522,6 +534,7 @@ Summary(pl.UTF-8):	Zewnętrzny moduł bezpieczeństwa PostgreSQL-a wykorzystują
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
 Requires:	libselinux >= 2.1.10
+Obsoletes:	postgresql-module-sepgsql
 
 %description module-sepgsql
 PostgreSQL external security provider using SELinux.
@@ -534,6 +547,7 @@ Summary:	crosstab functions for PostgreSQL
 Summary(pl.UTF-8):	Funkcje crosstab dla PostgreSQL-a
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	postgresql-module-tablefunc
 
 %description module-tablefunc
 crosstab functions for PostgreSQL.
@@ -547,6 +561,7 @@ Summary(pl.UTF-8):	Funkcje do obsługi XML-a dla PostgreSQL-a
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
 Requires:	libxml2 >= 1:2.6.23
+Obsoletes:	postgresql-module-xml2
 
 %description module-xml2
 Module with XML functions provides both XPath querying and XSLT
@@ -563,6 +578,7 @@ Summary:	Miscellaneous PostgreSQL contrib modules
 Summary(pl.UTF-8):	Różne moduły dołączone do PostgreSQL-a
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	postgresql-contrib
 
 %description contrib
 Miscellaneous PostgreSQL contrib modules.
@@ -642,8 +658,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
 	$RPM_BUILD_ROOT/var/{lib/pgsql,log} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
-	$RPM_BUILD_ROOT%{_mandir} \
-	$RPM_BUILD_ROOT/home/services/postgres
+	$RPM_BUILD_ROOT%{_mandir}
 
 install src/tutorial/*.sql $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -741,6 +756,11 @@ if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then
 	/usr/sbin/usermod -d /home/services/postgres postgres
 fi
 
+%triggerpostun -- %{name} < 10.2-2
+if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then
+	/usr/sbin/usermod -d /var/lib/pgsql postgres
+fi
+
 %post
 /sbin/chkconfig --add postgresql10
 %service postgresql10 restart "postgresql10 server"
@@ -753,7 +773,7 @@ fi
 
 %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
+%useradd -M -o -r -u 88 -d /var/lib/pgsql -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
 
 %post	clients
 update-alternatives \
@@ -878,8 +898,6 @@ update-alternatives \
 
 %dir %{pgsqldatadir}/contrib
 
-%attr(700,postgres,postgres) /home/services/postgres
-%attr(700,postgres,postgres) %dir /var/lib/pgsql
 %attr(640,postgres,postgres) %config(noreplace) %verify(not md5 mtime size) /var/log/pgsql
 
 %{pgsqldatadir}/man/man1/initdb.1*
@@ -902,6 +920,7 @@ update-alternatives \
 %defattr(644,root,root,755)
 %dir %{_libdir}/postgresql
 %dir %{_datadir}/postgresql
+%attr(700,postgres,postgres) %dir /var/lib/pgsql
 
 %files dirs
 %defattr(644,root,root,755)