[cpp-linbuild] 03/15: Limit macro specifications to one per line for diff-ability
John W. O'Brien
john at saltant.com
Sun Jun 18 15:00:38 UTC 2023
This is an automated email from the git hooks/post-receive script.
obrienjw pushed a commit to branch main
in repository cpp-linbuild.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=8c2c76db532bb4ff78d97433cf1826b5f042a897
commit 8c2c76db532bb4ff78d97433cf1826b5f042a897
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Sun Jun 11 22:47:02 2023 +0000
Limit macro specifications to one per line for diff-ability
---
common/SPECS/log4shib.spec | 3 ++-
common/SPECS/opensaml.spec | 4 +++-
common/SPECS/shibboleth.spec | 19 +++++++++++++------
common/SPECS/shibresolver.spec | 3 ++-
common/SPECS/xerces-c.spec | 3 ++-
common/SPECS/xmltooling.spec | 9 +++++++--
6 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/common/SPECS/log4shib.spec b/common/SPECS/log4shib.spec
index cf1e791..758bd49 100644
--- a/common/SPECS/log4shib.spec
+++ b/common/SPECS/log4shib.spec
@@ -7,7 +7,8 @@ Group: Development/Libraries
Vendor: Shibboleth Consortium
URL: http://shibboleth.net/downloads/log4shib/%version%
Source: %name-%version.tar.bz2
-BuildRequires: gcc-c++ pkgconfig
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
%{!?_without_doxygenrpm:BuildRequires: doxygen}
%if "%{_vendor}" == "redhat"
BuildRequires: redhat-rpm-config
diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index 1df6131..6f8162f 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -12,7 +12,9 @@ BuildRequires: libxml-security-c-devel >= 2.0.0
BuildRequires: libxmltooling-devel >= 3.2.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
-BuildRequires: gcc-c++, pkgconfig, boost-devel >= 1.32.0
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: boost-devel >= 1.32.0
%{!?_without_doxygen:BuildRequires: doxygen}
%if "%{_vendor}" == "redhat"
BuildRequires: redhat-rpm-config
diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index 7cb54a3..d28d7de 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -10,12 +10,15 @@ Source: %{name}-sp-%{version}.tar.bz2
Obsoletes: shibboleth-sp = 2.5.0
Requires: openssl
%if 0%{?rhel} >= 6 || 0%{?amzn} == 1 || 0%{?amzn} == 2
-PreReq: xmltooling-schemas%{?_isa} >= 3.2.0, opensaml-schemas%{?_isa} >= 3.2.0
+PreReq: xmltooling-schemas%{?_isa} >= 3.2.0
+PreReq: opensaml-schemas%{?_isa} >= 3.2.0
%else
-PreReq: xmltooling-schemas >= 3.2.0, opensaml-schemas >= 3.2.0
+PreReq: xmltooling-schemas >= 3.2.0
+PreReq: opensaml-schemas >= 3.2.0
%endif
%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
-PreReq: %{insserv_prereq} %{fillup_prereq}
+PreReq: %{insserv_prereq}
+PreReq: %{fillup_prereq}
%endif
%if 0%{?rhel} >= 7
Requires: hostname
@@ -39,7 +42,9 @@ BuildRequires: chrpath
%if 0%{?suse_version} > 1300
BuildRequires: libtool
%endif
-BuildRequires: gcc-c++, pkgconfig, boost-devel >= 1.32.0
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: boost-devel >= 1.32.0
%{!?_without_gssapi:BuildRequires: krb5-devel}
%{!?_without_doxygen:BuildRequires: doxygen}
%{!?_without_odbc:BuildRequires:unixODBC-devel}
@@ -57,14 +62,16 @@ BuildRequires: libmemcached-devel
BuildRequires: redhat-rpm-config
Requires(pre): shadow-utils
Requires(post): chkconfig
-Requires(preun): chkconfig, initscripts
+Requires(preun): chkconfig
+Requires(preun): initscripts
%endif
%if "%{_vendor}" == "suse"
Requires(pre): pwdutils
%{!?_without_builtinapache:BuildRequires: apache2-devel}
%{?systemd_requires}
%if 0%{?suse_version} >= 1210
-BuildRequires: systemd-rpm-macros, systemd-devel
+BuildRequires: systemd-rpm-macros
+BuildRequires: systemd-devel
%endif
%endif
diff --git a/common/SPECS/shibresolver.spec b/common/SPECS/shibresolver.spec
index 9795f10..64cca02 100644
--- a/common/SPECS/shibresolver.spec
+++ b/common/SPECS/shibresolver.spec
@@ -15,7 +15,8 @@ BuildRequires: shibboleth-devel >= 3.4.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
%{!?_without_gssapi:BuildRequires: krb5-devel}
-BuildRequires: gcc-c++, pkgconfig
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
%if "%{_vendor}" == "redhat"
BuildRequires: redhat-rpm-config
%endif
diff --git a/common/SPECS/xerces-c.spec b/common/SPECS/xerces-c.spec
index a8534c3..ce01206 100644
--- a/common/SPECS/xerces-c.spec
+++ b/common/SPECS/xerces-c.spec
@@ -7,7 +7,8 @@ Source0: %{name}-%{version}.tar.bz2
License: Apache
Group: Libraries
Prefix: /usr
-BuildRequires: gcc-c++ pkgconfig
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
%{?_with_curl:BuildRequires: curl-devel}
%{?_with_icu:BuildRequires: libicu-devel}
%if "%{_vendor}" == "redhat"
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index 4930398..ece9e6b 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -11,7 +11,11 @@ BuildRequires: libxerces-c-devel >= 3.2
BuildRequires: libxml-security-c-devel >= 2.0.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
-BuildRequires: gcc-c++, pkgconfig, zlib-devel, openssl-devel, boost-devel >= 1.32.0
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: zlib-devel
+BuildRequires: openssl-devel
+BuildRequires: boost-devel >= 1.32.0
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
BuildRequires: libcurl-openssl-devel >= 7.21.7
Requires: libcurl-openssl >= 7.21.7
@@ -74,7 +78,8 @@ Requires: libxerces-c-devel >= 3.2
Requires: libxml-security-c-devel >= 2.0.0
%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
-Requires: openssl-devel, boost-devel >= 1.32.0
+Requires: openssl-devel
+Requires: boost-devel >= 1.32.0
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
Requires: libcurl-openssl-devel >= 7.21.7
%else
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list