From 8a31f52840609c28f21cbdc653a6b1119a474815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 17 May 2013 09:42:02 +0000 Subject: [PATCH 1/2] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=214 --- build.changes | 5 +++++ build.spec | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/build.changes b/build.changes index b013ee40..9174bfe7 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 17 09:44:35 UTC 2013 - adrian@suse.de + +- fix build for non-SUSE rpm distros + ------------------------------------------------------------------- Fri May 17 09:24:49 UTC 2013 - adrian@suse.de diff --git a/build.spec b/build.spec index 3d1644aa..aae70ce6 100644 --- a/build.spec +++ b/build.spec @@ -109,14 +109,19 @@ chroot or a secure virtualized %setup -q -n obs-build-%version %build +%if 0%{?suse_version} +# initvm make CFLAGS="$RPM_BUILD_FLAGS" initvm-all +%endif %install # initvm +%if 0%{?suse_version} make DESTDIR=$RPM_BUILD_ROOT initvm-install strip $RPM_BUILD_ROOT/usr/lib/build/initvm.* export NO_BRP_STRIP_DEBUG="true" chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.* +%endif # main make DESTDIR=$RPM_BUILD_ROOT install @@ -159,8 +164,10 @@ test -e default.conf /usr/lib/build/mkdrpms %endif +%if 0%{?suse_version} %files initvm-%{initvm_arch} %defattr(-,root,root) /usr/lib/build/initvm.* +%endif %changelog From 5875af4ce7701c6de2df71ffecbc54485d814360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 May 2013 18:32:42 +0000 Subject: [PATCH 2/2] fix for non-suse OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=216 --- build.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.spec b/build.spec index aae70ce6..2c5fba34 100644 --- a/build.spec +++ b/build.spec @@ -145,7 +145,9 @@ test -e default.conf /usr/lib/build %config(noreplace) /usr/lib/build/emulator/emulator.sh %{_mandir}/man1/build.1* +%if 0%{?suse_version} %exclude /usr/lib/build/initvm.* +%endif %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} %exclude /usr/lib/build/mkbaselibs