fix/rpm: again

albanobattistella · Mar 23, 2021 · cd52be4 · cd52be4
1 parent 3b90177
commit cd52be4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.concourse/fedora/buildrpm.sh b/.concourse/fedora/buildrpm.sh
@@ -14,9 +14,6 @@ cp -v build/rpmspec/oregano.spec ${RPMBUILD_DIR}/SPECS/
 ./waf dist
 cp -v oregano*.tar.xz ${RPMBUILD_DIR}/SOURCES/
 
-dnf -y install 'dnf-command(builddep)'
-dnf -y builddep build/rpmspec/oregano.spec
-
 cd ${RPMBUILD_DIR}
 rpmbuild \
 --define "_topdir %(pwd)" \

diff --git a/oregano.spec.in b/oregano.spec.in
@@ -1,4 +1,3 @@
-%global debug_package %{nil}
 
 Name:			oregano
 Summary:		Schematic capture and simulation of electrical circuits
@@ -35,7 +34,10 @@ as front-end and ng-spice/gnu-cap as back-end
 ./waf distclean || true
 
 # the bare "build" target does not mangle any additional cflags into the build
-CFLAGS="%{optflags} -ggdb" ./waf configure --destdir="$RPM_BUILD_ROOT" --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}" --no-xdg build
+# and optflags includes `-g`
+# Avoid xdg installation, since it will try to modify the _host_ env!
+CFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-deprecated -DGDK_DISABLE_DEPRECATION_WARNINGS" \
+    ./waf configure --destdir="$RPM_BUILD_ROOT" --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}" --no-xdg build
 
 %install
 ./waf install --destdir="$RPM_BUILD_ROOT" --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}"
@@ -69,7 +71,6 @@ fi
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-
 %files -f oregano.lang
 %defattr(-, root, root)