[cpp-linbuild] 03/03: SSPCPP-968 Write RPMs inside container to produce accurate manifests

[John W. O'Brien]

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=e3bf1157ef74cc11a551fcc51106e4511d38aa83

commit e3bf1157ef74cc11a551fcc51106e4511d38aa83
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Sep 19 10:21:22 2025 +0000

    SSPCPP-968 Write RPMs inside container to produce accurate manifests
---
 common/build.sh                 | 10 ++++++++--
 common/macros/macros.shibboleth |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/build.sh b/common/build.sh
index 4744dbe..23ed7ed 100644
--- a/common/build.sh
+++ b/common/build.sh
@@ -38,8 +38,14 @@ yum-builddep -y ${component}.spec
 rpmbuild -ba --clean ${component}.spec
 
 # Produce manifests
-rpmspec -q --rpms ${component}.spec > ${EXT_BASE}/out/${component}.rpms
-rpmspec -q --srpm ${component}.spec > ${EXT_BASE}/out/${component}.srpm
+find ${INT_BASE}/RPMS -type f -printf '%P\n' \
+    > ${EXT_BASE}/out/${component}.rpms
+find ${INT_BASE}/SRPMS -type f -printf '%P\n' \
+    > ${EXT_BASE}/out/${component}.srpm
+
+# Copy products out to host
+/usr/bin/cp -fr ${INT_BASE}/RPMS ${EXT_BASE}/out/
+/usr/bin/cp -fr ${INT_BASE}/SRPMS ${EXT_BASE}/out/
 
 # Generate/update local RPM repository
 createrepo ${localrepo}
diff --git a/common/macros/macros.shibboleth b/common/macros/macros.shibboleth
index b3207a3..cd765ea 100644
--- a/common/macros/macros.shibboleth
+++ b/common/macros/macros.shibboleth
@@ -6,6 +6,6 @@
 %_buildrootdir %{shibintbase}/BUILDROOT
 %_specdir %{shibextbase}/in/SPECS
 %_sourcedir %{shibextbase}/in/SOURCES
-%_rpmdir %{shibextbase}/out/RPMS
-%_srcrpmdir %{shibextbase}/out/SRPMS
+%_rpmdir %{shibintbase}/RPMS
+%_srcrpmdir %{shibintbase}/SRPMS
 %packager PLACE HOLDER <USER at EXAMPLE.COM>

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