_isa-ify inter-subpackage dependencies, per Packaging Guidelines.

This commit is contained in:
Tom Lane 2011-02-10 02:01:11 -05:00
parent 426a182de1
commit 2af4178aee

View File

@ -139,7 +139,7 @@ BuildRequires: systemtap-sdt-devel
%endif %endif
# main package requires -libs subpackage # main package requires -libs subpackage
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -175,8 +175,8 @@ PostgreSQL server.
%package server %package server
Summary: The programs needed to create and run a PostgreSQL server Summary: The programs needed to create and run a PostgreSQL server
Group: Applications/Databases Group: Applications/Databases
Requires: %{name} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/useradd
Requires(post): chkconfig Requires(post): chkconfig
Requires(preun): chkconfig Requires(preun): chkconfig
@ -199,7 +199,7 @@ to install the postgresql package.
%package docs %package docs
Summary: Extra documentation for PostgreSQL Summary: Extra documentation for PostgreSQL
Group: Applications/Databases Group: Applications/Databases
Requires: %{name} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description docs %description docs
The postgresql-docs package includes some additional documentation for The postgresql-docs package includes some additional documentation for
@ -210,8 +210,8 @@ and source files for the PostgreSQL tutorial.
%package contrib %package contrib
Summary: Contributed modules distributed with PostgreSQL Summary: Contributed modules distributed with PostgreSQL
Group: Applications/Databases Group: Applications/Databases
Requires: %{name} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description contrib %description contrib
The postgresql-contrib package contains contributed packages that are The postgresql-contrib package contains contributed packages that are
@ -221,8 +221,8 @@ included in the PostgreSQL distribution.
%package devel %package devel
Summary: PostgreSQL development header files and libraries Summary: PostgreSQL development header files and libraries
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel %description devel
The postgresql-devel package contains the header files and libraries The postgresql-devel package contains the header files and libraries
@ -236,8 +236,8 @@ develop applications which will interact with a PostgreSQL server.
%package upgrade %package upgrade
Summary: Support for upgrading from the previous major release of PostgreSQL Summary: Support for upgrading from the previous major release of PostgreSQL
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-server = %{version}-%{release} Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description upgrade %description upgrade
PostgreSQL is an advanced Object-Relational database management PostgreSQL is an advanced Object-Relational database management
@ -251,7 +251,7 @@ major version of PostgreSQL.
%package plperl %package plperl
Summary: The Perl procedural language for PostgreSQL Summary: The Perl procedural language for PostgreSQL
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-server = %{version}-%{release} Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description plperl %description plperl
@ -264,7 +264,7 @@ procedural language for the backend.
%package plpython %package plpython
Summary: The Python procedural language for PostgreSQL Summary: The Python procedural language for PostgreSQL
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-server = %{version}-%{release} Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description plpython %description plpython
PostgreSQL is an advanced Object-Relational database management PostgreSQL is an advanced Object-Relational database management
@ -276,7 +276,7 @@ procedural language for the backend.
%package pltcl %package pltcl
Summary: The Tcl procedural language for PostgreSQL Summary: The Tcl procedural language for PostgreSQL
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-server = %{version}-%{release} Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description pltcl %description pltcl
PostgreSQL is an advanced Object-Relational database management PostgreSQL is an advanced Object-Relational database management
@ -288,7 +288,7 @@ procedural language for the backend.
%package test %package test
Summary: The test suite distributed with PostgreSQL Summary: The test suite distributed with PostgreSQL
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-server = %{version}-%{release} Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description test %description test
PostgreSQL is an advanced Object-Relational database management PostgreSQL is an advanced Object-Relational database management