[cpp-linbuild] 05/15: Escape macros in comments
John W. O'Brien
john at saltant.com
Sun Jun 18 15:00:40 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=91c9df961f93cf11f0fb1bcbae3dce07a570eecb
commit 91c9df961f93cf11f0fb1bcbae3dce07a570eecb
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Jun 16 12:05:33 2023 +0000
Escape macros in comments
---
common/SPECS/log4shib.spec | 2 +-
common/SPECS/shibboleth.spec | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/SPECS/log4shib.spec b/common/SPECS/log4shib.spec
index f8bb55a..58da75d 100644
--- a/common/SPECS/log4shib.spec
+++ b/common/SPECS/log4shib.spec
@@ -61,7 +61,7 @@ The static libraries and header files needed for development with log4shib.
%install
%{__make} DESTDIR=$RPM_BUILD_ROOT apidir=$RPM_BUILD_ROOT%{pkgdocdir}/api install
-# If we use %doc down below to package the README files from the build tree,
+# If we use %%doc down below to package the README files from the build tree,
# it will blow away the package's docdir folder, and the installed API docs with it.
# Instead, copy the README files manually into the platform's docdir.
config/install-sh -d $RPM_BUILD_ROOT%{pkgdocdir}
diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index d28d7de..179c0d2 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -275,7 +275,7 @@ fi
%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon" || "%{_vendor}" == "suse"
if [ "$SYSTEMD_SHIBD" == "no" ] ; then
- # %{_initddir} not yet in RHEL5, use deprecated %{_initrddir}
+ # %%{_initddir} not yet in RHEL5, use deprecated %%{_initrddir}
install -d -m 0755 $RPM_BUILD_ROOT%{_initrddir}
install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
%if "%{_vendor}" == "suse"
@@ -412,7 +412,7 @@ exit 0
%posttrans
# One-time extra restart of shibd and Apache to work around
-# SUSE bug that breaks old %restart_on_update macro.
+# SUSE bug that breaks old %%restart_on_update macro.
# If we remove, upgrades from pre-systemd to post-systemd
# will stop doing the final restart.
%if "%{_vendor}" == "suse" && 0%{?suse_version} >= 1210
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list