[cpp-linbuild] branch main updated: Avoid macro expansion in SPEC changelog section

John W. O'Brien john at saltant.com
Sat Dec 28 17:44:43 UTC 2024


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=40f2211e359d5213bd022d95f12982446c44cbcb

The following commit(s) were added to refs/heads/main by this push:
     new 40f2211  Avoid macro expansion in SPEC changelog section
40f2211 is described below

commit 40f2211e359d5213bd022d95f12982446c44cbcb
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Sat Dec 28 17:41:32 2024 +0000

    Avoid macro expansion in SPEC changelog section
---
 common/SPECS/curl-openssl.spec           | 2 +-
 common/SPECS/log4shib.spec               | 4 ++--
 common/SPECS/opensaml.spec               | 4 ++--
 common/SPECS/shibboleth-embedded-ds.spec | 4 ++--
 common/SPECS/shibboleth.spec             | 6 +++---
 common/SPECS/shibresolver.spec           | 4 ++--
 common/SPECS/xerces-c.spec               | 4 ++--
 common/SPECS/xml-security-c.spec         | 4 ++--
 common/SPECS/xmltooling.spec             | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/SPECS/curl-openssl.spec b/common/SPECS/curl-openssl.spec
index ed3e7a2..1e1b78f 100644
--- a/common/SPECS/curl-openssl.spec
+++ b/common/SPECS/curl-openssl.spec
@@ -147,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT
 - Normalize SPEC file whitespace
 - Delete obsolete BuildRoot macro
 - Ensure Source is valid and fetchable
-- Adopt %make_install
+- Adopt %%make_install
 
 * Thu Feb 18 2016 Scott Cantor <cantor.2 at osu.edu> 7.47.1-1
 - update version
diff --git a/common/SPECS/log4shib.spec b/common/SPECS/log4shib.spec
index e28baeb..2ec7ddd 100644
--- a/common/SPECS/log4shib.spec
+++ b/common/SPECS/log4shib.spec
@@ -94,10 +94,10 @@ fi
 - Conform License field to SPDX License List
 - Escape macros in comments
 - Ensure Source is valid and fetchable
-- Adopt %make_install
+- Adopt %%make_install
 - Parameterize (sub-)package names
 - Replace empty main package with lib sub-package
-- Append %dist to Release
+- Append %%dist to Release
 
 * Thu Oct 28 2021 Scott Cantor <cantor.2 at osu.edu> - 2.0.1-1
 - Remove static library from manifest.
diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index 0ad5f84..f48a6b1 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -141,10 +141,10 @@ This package includes XML schemas and related files.
 - Delete obsolete BuildRoot macro
 - Limit macro specifications to one per line for diff-ability
 - Ensure Source is valid and fetchable
-- Adopt %make_install
+- Adopt %%make_install
 - Parameterize (sub-)package names
 - Replace empty main package with lib sub-package
-- Append %dist to Release
+- Append %%dist to Release
 
 * Wed Dec 2 2020 Scott Cantor <cantor.2 at osu.edu> - 3.2.0-1
 - Version and lib bump
diff --git a/common/SPECS/shibboleth-embedded-ds.spec b/common/SPECS/shibboleth-embedded-ds.spec
index 322364b..3309b02 100644
--- a/common/SPECS/shibboleth-embedded-ds.spec
+++ b/common/SPECS/shibboleth-embedded-ds.spec
@@ -88,8 +88,8 @@ exit 0
 - Normalize SPEC file whitespace
 - Delete obsolete BuildRoot macro
 - Ensure Source is valid and fetchable
-- Adopt %make_install
-- Append %dist to Release
+- Adopt %%make_install
+- Append %%dist to Release
 
 * Mon Jun 6 2016 Scott Cantor <cantor.2 at osu.edu> - 1.2.0-1
 - Update version
diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index 89708f6..48cc592 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -419,11 +419,11 @@ exit 0
 - Escape macros in comments
 - Avoid hardcoding library path
 - Replace deprecated PreReq
-- Run %setup quietly
+- Run %%setup quietly
 - Ensure Source is valid and fetchable
-- Adopt %make_install
+- Adopt %%make_install
 - Drop support for RHEL 5
-- Append %dist to Release
+- Append %%dist to Release
 
 * Fri Mar 24 2023 John W. O'Brien <john at saltant.com> 3.4.1-2
 - Build with memcached on RHEL 8 and later and derivatives
diff --git a/common/SPECS/shibresolver.spec b/common/SPECS/shibresolver.spec
index 9f7c57b..e0839d7 100644
--- a/common/SPECS/shibresolver.spec
+++ b/common/SPECS/shibresolver.spec
@@ -113,11 +113,11 @@ This package includes files needed for development.
 - Delete obsolete BuildRoot macro
 - Limit macro specifications to one per line for diff-ability
 - Ensure Source is valid and fetchable
-- Adopt %make_install
+- Adopt %%make_install
 - Drop support for RHEL 5
 - Parameterize (sub-)package names
 - Replace empty main package with lib sub-package
-- Append %dist to Release
+- Append %%dist to Release
 
 * Mon Oct 24 2022 Scott Cantor <cantor.2 at osu.edu> - 3.4.0-1
 - Bump version
diff --git a/common/SPECS/xerces-c.spec b/common/SPECS/xerces-c.spec
index 243d7a7..0198c07 100644
--- a/common/SPECS/xerces-c.spec
+++ b/common/SPECS/xerces-c.spec
@@ -104,11 +104,11 @@ The static libraries and header files needed for development with Xerces-C++.
 - Limit macro specifications to one per line for diff-ability
 - Conform License field to SPDX License List
 - Ensure Source is valid and fetchable
-- Adopt %make_install
+- Adopt %%make_install
 - Drop support for relocatable xerces-c RPM
 - Parameterize (sub-)package names
 - Replace empty main package with lib sub-package
-- Append %dist to Release
+- Append %%dist to Release
 
 * Fri Oct 21 2022 John W. O'Brien <john at saltant.com> 3.2.4-1
 - Bump version
diff --git a/common/SPECS/xml-security-c.spec b/common/SPECS/xml-security-c.spec
index c7f1f01..7858fe2 100644
--- a/common/SPECS/xml-security-c.spec
+++ b/common/SPECS/xml-security-c.spec
@@ -98,10 +98,10 @@ This package includes files needed for development with xml-security-c.
 - Delete obsolete BuildRoot macro
 - Conform License field to SPDX License List
 - Ensure Source is valid and fetchable
-- Adopt %make_install
+- Adopt %%make_install
 - Parameterize (sub-)package names
 - Replace empty main package with lib sub-package
-- Append %dist to Release
+- Append %%dist to Release
 
 * Mon Nov 13 2017 Scott Cantor <cantor.2 at osu.edu> 2.0.0-1
 - update to 2.0.0
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index e33e402..08e9beb 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -152,10 +152,10 @@ This package includes XML schemas and related files.
 - Delete obsolete BuildRoot macro
 - Limit macro specifications to one per line for diff-ability
 - Ensure Source is valid and fetchable
-- Adopt %make_install
+- Adopt %%make_install
 - Parameterize (sub-)package names
 - Replace empty main package with lib sub-package
-- Append %dist to Release
+- Append %%dist to Release
 
 * Wed Nov 2 2022 Scott Cantor <cantor.2 at osu.edu> - 3.2.2-1
 - Version bump

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list