From 3337adbb4468f82a84326671dcb8b216e6b1e7d1 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Sat, 28 Mar 2020 13:06:10 -0400 Subject: [PATCH] do-rpm: set build flags to the rpm provided ones (instead of using dev build flags) Fixes #11 --- .gitignore | 5 +++++ do-rpm | 2 +- illum.spec.in | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ac9305d..b6b189b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,8 @@ illum-ctl # FIXME: remove once config.h is shoved in one of the build subdirs config.h + +/BUILD/ +/RPMS/ +/SRPMS/ +/RPM_SOURCES/ diff --git a/do-rpm b/do-rpm index dae0262..0970afa 100755 --- a/do-rpm +++ b/do-rpm @@ -24,4 +24,4 @@ gzip -9 RPM_SOURCES/ccan-"$ccan_ph".tar sed -e s,%ver%,$pv,g -e s,%dist%,$dist,g -e s,%commit%,$ph,g -e s,%ccan_commit%,$ccan_ph,g < $pn.spec.in > RPM_SOURCES/$pn.spec -rpmbuild -D_topdir" $(pwd)" -D_sourcedir" $(pwd)"/RPM_SOURCES -D_specdir" $(pwd)"/RPM_SOURCES -ba RPM_SOURCES/"$pn".spec +rpmbuild --nodeps -D_topdir" $(pwd)" -D_sourcedir" $(pwd)"/RPM_SOURCES -D_specdir" $(pwd)"/RPM_SOURCES -ba RPM_SOURCES/"$pn".spec diff --git a/illum.spec.in b/illum.spec.in index 06492df..9c0db22 100644 --- a/illum.spec.in +++ b/illum.spec.in @@ -26,7 +26,8 @@ rmdir ccan mv $(basename %{SOURCE1} .tar.gz) ccan %build -./build +%set_build_flags +./build -v %install rm -rf $RPM_BUILD_ROOT