diff --git a/build.spec b/build.spec index d05bb5a8..815cfe6a 100644 --- a/build.spec +++ b/build.spec @@ -18,7 +18,13 @@ # needsbinariesforbuild -Name: build +%if 0%{?fedora} || 0%{?rhel} +%define __pkg_name obs-build +%else +%define __pkg_name build +%endif + +Name: %{__pkg_name} Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-only OR GPL-3.0-only Group: Development/Tools/Building @@ -67,11 +73,11 @@ Recommends: /sbin/mkfs.ext3 %endif %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -Requires: build-mkbaselibs +Requires: %{__pkg_name}-mkbaselibs %endif %if 0%{?suse_version} > 1120 || 0%{?mdkversion} -Recommends: build-mkdrpms +Recommends: %{__pkg_name}-mkdrpms %endif %description @@ -95,7 +101,7 @@ Summary: Tools to generate delta rpms Group: Development/Tools/Building Requires: deltarpm # XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq -Requires: build +Requires: %{__pkg_name} %description mkdrpms This package contains the parts which may be installed in the inner build system @@ -110,11 +116,11 @@ for generating delta rpm packages. %package initvm-%{initvm_arch} Summary: Virtualization initializer for emulated cross architecture builds Group: Development/Tools/Building -Requires: build +Requires: %{__pkg_name} BuildRequires: gcc BuildRequires: glibc-devel -Provides: build-initvm -Obsoletes: build-initvm +Provides: %{__pkg_name}-initvm +Obsoletes: %{__pkg_name}-initvm %if 0%{?suse_version} > 1200 BuildRequires: glibc-devel-static %endif @@ -166,7 +172,7 @@ ln -s sl${SUSE_V:0:2}.${SUSE_V:2:1}.conf default.conf ln -s sle${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf %endif %if 0%{?sles_version} == 1110 -# this is SUSE SLE 11 +# this is SUSE SLE 11 ln -s sles11sp2.conf default.conf %endif # make sure that we have a config diff --git a/obs-build-20200122.tar.gz b/obs-build-20200122.tar.gz index bea31653..8b63fc42 100644 --- a/obs-build-20200122.tar.gz +++ b/obs-build-20200122.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:244d6d126a965818a97e2a651efc68aa50675903dd0f0736a3a1107f9d105aa9 -size 356779 +oid sha256:df2cbc1a8a9c53595b2e46fdc6977c574c6c3cb9f67f3278f38f3ba1c186d97c +size 357281