[packages/FHS] - more fixes

baggins baggins at pld-linux.org
Sat Dec 18 10:35:23 CET 2021


commit b68acde4045a91a6138523c5ef55f13143fc9f23
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 18 10:35:14 2021 +0100

    - more fixes

 FHS.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/FHS.spec b/FHS.spec
index 483c760..7ddc231 100644
--- a/FHS.spec
+++ b/FHS.spec
@@ -124,11 +124,11 @@ done
 cd $RPM_BUILD_ROOT
 
 check_filesystem_dirs() {
-	RPMFILES="%{name}-%{version}-%{release}.%{_target_cpu}.rpm %{name}-debug-%{version}-%{release}.%{_target_cpu}.rpm"
+	RPMFILES="%{_rpmdir}/%{name}-%{version}-%{release}.%{_target_cpu}.rpm %{_rpmdir}/%{name}-debug-%{version}-%{release}.%{_target_cpu}.rpm"
 	TMPFILE=$(mktemp)
 	find | sed -e 's|^\.||g' -e '/^$/d' | LC_ALL=C sort > $TMPFILE
 
-	if rpm -qpl %{_rpmdir}/$RPMFILE | grep -v '^/$' | LC_ALL=C sort | diff -u $TMPFILE - ; then
+	if rpm -qpl $RPMFILES | grep -v '^/$' | LC_ALL=C sort | diff -u $TMPFILE - ; then
 		rm -rf $RPM_BUILD_ROOT
 	else
 		echo -e "\nNot so good, some directories are not included in package\n"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/FHS.git/commitdiff/b68acde4045a91a6138523c5ef55f13143fc9f23



More information about the pld-cvs-commit mailing list