Add Requires: for -devel package

This makes sure that when you install postgresql95-devel you get the devel packages it depends on too.
2ndQuadrant · Jan 20, 2016 · 6052415 · 6052415
1 parent 380eaf7
commit 6052415
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 10 deletions.
diff --git a/rpm/redhat/9.5/postgresql/EL-5/postgresql-9.5.spec b/rpm/redhat/9.5/postgresql/EL-5/postgresql-9.5.spec
@@ -152,7 +152,9 @@ BuildRequires:	tcl-devel
 %endif
 
 BuildRequires:	readline-devel
-BuildRequires:	zlib-devel >= 1.0.4
+
+%define min_zlib_version 1.0.4
+BuildRequires:	zlib-devel >= %{min_zlib_version}
 
 %if %ssl
 BuildRequires:	openssl-devel
@@ -164,7 +166,8 @@ BuildRequires:	e2fsprogs-devel
 %endif
 
 %if %nls
-BuildRequires:	gettext >= 0.10.35
+%define min_gettext_version 0.10.35
+BuildRequires:	gettext >= %{min_gettext_version}
 %endif
 
 %if %xml
@@ -307,6 +310,25 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Provides:	postgresql-devel
 
+# These requires declarations should match the BuildRequires for each part of
+# the package so that RPMs that declare a BuildRequires on postgresql-devel get
+# all its dependencies transitively as well.
+%if %ssl
+Requires:  openssl-devel
+%endif
+%if %nls
+Requires:  gettext >= %{min_gettext_version}
+%endif
+%if %xml
+Requires:  libxml2-devel libxslt-devel
+%endif
+%if %pam
+Requires:  pam-devel
+%endif
+Requires:  readline-devel
+Requires:  zlib-devel >= %{min_zlib_version}
+
+
 %description devel
 The postgresql%{packageversion}-devel package contains the header files and libraries
 needed to compile C or C++ applications which will directly interact

diff --git a/rpm/redhat/9.5/postgresql/EL-6/postgresql-9.5.spec b/rpm/redhat/9.5/postgresql/EL-6/postgresql-9.5.spec
@@ -152,7 +152,9 @@ BuildRequires:	tcl-devel
 %endif
 
 BuildRequires:	readline-devel
-BuildRequires:	zlib-devel >= 1.0.4
+
+%define min_zlib_version 1.0.4
+BuildRequires:	zlib-devel >= %{min_zlib_version}
 
 %if %ssl
 BuildRequires:	openssl-devel
@@ -164,7 +166,8 @@ BuildRequires:	e2fsprogs-devel
 %endif
 
 %if %nls
-BuildRequires:	gettext >= 0.10.35
+%define min_gettext_version 0.10.35
+BuildRequires:	gettext >= %{min_gettext_version}
 %endif
 
 %if %xml
@@ -307,6 +310,25 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Provides:	postgresql-devel
 
+# These requires declarations should match the BuildRequires for each part of
+# the package so that RPMs that declare a BuildRequires on postgresql-devel get
+# all its dependencies transitively as well.
+%if %ssl
+Requires:  openssl-devel
+%endif
+%if %nls
+Requires:  gettext >= %{min_gettext_version}
+%endif
+%if %xml
+Requires:  libxml2-devel libxslt-devel
+%endif
+%if %pam
+Requires:  pam-devel
+%endif
+Requires:  readline-devel
+Requires:  zlib-devel >= %{min_zlib_version}
+
+
 %description devel
 The postgresql%{packageversion}-devel package contains the header files and libraries
 needed to compile C or C++ applications which will directly interact

diff --git a/rpm/redhat/9.5/postgresql/EL-7/postgresql-9.5.spec b/rpm/redhat/9.5/postgresql/EL-7/postgresql-9.5.spec
@@ -152,7 +152,9 @@ BuildRequires:	tcl-devel
 %endif
 
 BuildRequires:	readline-devel
-BuildRequires:	zlib-devel >= 1.0.4
+
+%define min_zlib_version 1.0.4
+BuildRequires:	zlib-devel >= %{min_zlib_version}
 
 %if %ssl
 BuildRequires:	openssl-devel
@@ -164,7 +166,8 @@ BuildRequires:	e2fsprogs-devel
 %endif
 
 %if %nls
-BuildRequires:	gettext >= 0.10.35
+%define min_gettext_version 0.10.35
+BuildRequires:	gettext >= %{min_gettext_version}
 %endif
 
 %if %xml
@@ -307,6 +310,25 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Provides:	postgresql-devel
 
+# These requires declarations should match the BuildRequires for each part of
+# the package so that RPMs that declare a BuildRequires on postgresql-devel get
+# all its dependencies transitively as well.
+%if %ssl
+Requires:  openssl-devel
+%endif
+%if %nls
+Requires:  gettext >= %{min_gettext_version}
+%endif
+%if %xml
+Requires:  libxml2-devel libxslt-devel
+%endif
+%if %pam
+Requires:  pam-devel
+%endif
+Requires:  readline-devel
+Requires:  zlib-devel >= %{min_zlib_version}
+
+
 %description devel
 The postgresql%{packageversion}-devel package contains the header files and libraries
 needed to compile C or C++ applications which will directly interact

diff --git a/rpm/redhat/9.5/postgresql/F-22/postgresql-9.5.spec b/rpm/redhat/9.5/postgresql/F-22/postgresql-9.5.spec
@@ -152,7 +152,9 @@ BuildRequires:	tcl-devel
 %endif
 
 BuildRequires:	readline-devel
-BuildRequires:	zlib-devel >= 1.0.4
+
+%define min_zlib_version 1.0.4
+BuildRequires:	zlib-devel >= %{min_zlib_version}
 
 %if %ssl
 BuildRequires:	openssl-devel
@@ -164,7 +166,8 @@ BuildRequires:	e2fsprogs-devel
 %endif
 
 %if %nls
-BuildRequires:	gettext >= 0.10.35
+%define min_gettext_version 0.10.35
+BuildRequires:	gettext >= %{min_gettext_version}
 %endif
 
 %if %xml
@@ -307,6 +310,25 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Provides:	postgresql-devel
 
+# These requires declarations should match the BuildRequires for each part of
+# the package so that RPMs that declare a BuildRequires on postgresql-devel get
+# all its dependencies transitively as well.
+%if %ssl
+Requires:  openssl-devel
+%endif
+%if %nls
+Requires:  gettext >= %{min_gettext_version}
+%endif
+%if %xml
+Requires:  libxml2-devel libxslt-devel
+%endif
+%if %pam
+Requires:  pam-devel
+%endif
+Requires:  readline-devel
+Requires:  zlib-devel >= %{min_zlib_version}
+
+
 %description devel
 The postgresql%{packageversion}-devel package contains the header files and libraries
 needed to compile C or C++ applications which will directly interact

diff --git a/rpm/redhat/9.5/postgresql/F-23/postgresql-9.5.spec b/rpm/redhat/9.5/postgresql/F-23/postgresql-9.5.spec
@@ -152,7 +152,9 @@ BuildRequires:	tcl-devel
 %endif
 
 BuildRequires:	readline-devel
-BuildRequires:	zlib-devel >= 1.0.4
+
+%define min_zlib_version 1.0.4
+BuildRequires:	zlib-devel >= %{min_zlib_version}
 
 %if %ssl
 BuildRequires:	openssl-devel
@@ -164,7 +166,8 @@ BuildRequires:	e2fsprogs-devel
 %endif
 
 %if %nls
-BuildRequires:	gettext >= 0.10.35
+%define min_gettext_version 0.10.35
+BuildRequires:	gettext >= %{min_gettext_version}
 %endif
 
 %if %xml
@@ -307,6 +310,25 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Provides:	postgresql-devel
 
+# These requires declarations should match the BuildRequires for each part of
+# the package so that RPMs that declare a BuildRequires on postgresql-devel get
+# all its dependencies transitively as well.
+%if %ssl
+Requires:  openssl-devel
+%endif
+%if %nls
+Requires:  gettext >= %{min_gettext_version}
+%endif
+%if %xml
+Requires:  libxml2-devel libxslt-devel
+%endif
+%if %pam
+Requires:  pam-devel
+%endif
+Requires:  readline-devel
+Requires:  zlib-devel >= %{min_zlib_version}
+
+
 %description devel
 The postgresql%{packageversion}-devel package contains the header files and libraries
 needed to compile C or C++ applications which will directly interact