Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/SLOF.git#4f911648fc88b01f5fd5b40a57e272862d2b85ea

.gitignore

@@ -1 +1 @@
-/SLOF-*.tar.gz
+/qemu-slof-*.tar.gz

SLOF.spec

@@ -1,31 +1,27 @@
-%global gittagdate 20200327
 %global gittagdate 20200717
+%global gittagcommit e18ddad8
 
 # Disable debuginfo because it is of no use to us.
 %global debug_package %{nil}
 
 %if 0%{?fedora:1}
 %define cross 1
+%define targetdir qemu
+%else
+%define targetdir qemu-kvm
 %endif
 
 %global gittag qemu-slof-%{gittagdate}
 
 Name:           SLOF
-Version:        0.1.git%{gittagdate}
+Version:        %{gittagdate}
-Release:        2%{?dist}
+Release:        3.git%{gittagcommit}%{?dist}
 Summary:        Slimline Open Firmware
 
 License:        BSD
 URL:            http://www.openfirmware.info/SLOF
 
-
+Source0:        https://github.com/aik/SLOF/archive/qemu-slof-%{gittagdate}.tar.gz
-# There are no upstream tarballs.  To prepare a tarball, do:
-#
-# git clone git://github.com/aik/SLOF.git
-# cd SLOF
-# git archive -o ../SLOF-{gittagdate}.tar.gz \
-#     --prefix=SLOF-{gittagdate}/ {gittag}
-Source0:        SLOF-%{gittagdate}.tar.gz
 
 
 %if 0%{?cross:1}
@@ -33,6 +29,7 @@ BuildArch:      noarch
 BuildRequires:  gcc-powerpc64-linux-gnu
 %else
 ExclusiveArch:  ppc64le
+BuildArch: noarch
 %endif
 
 BuildRequires:  make
@@ -41,7 +38,6 @@ BuildRequires:  perl-interpreter
 BuildRequires:  perl(Getopt::Std)
 BuildRequires:  perl(Data::Dumper)
 
-
 %description
 Slimline Open Firmware (SLOF) is initialization and boot source code
 based on the IEEE-1275 (Open Firmware) standard, developed by
@@ -56,26 +52,35 @@ separately.  It is a dependency of qemu-system-ppc64.
 
 
 %prep
-%setup -q -n SLOF-%{gittagdate}
+%setup -q -n SLOF-qemu-slof-%{gittagdate}
 %autopatch -p1
 
 %build
 %if 0%{?cross:1}
 export CROSS="powerpc64-linux-gnu-"
+%else
+export CROSS=""
 %endif
+
+%if 0%{?rhel:1}
+# Workaround for problems on the TPS machines.  They have a
+# environment variable called "RELEASE" which somehow confuses the
+# SLOF Makefiles which also use a variable named RELEASE.
+unset RELEASE
+%endif
+
 make qemu %{?_smp_mflags} V=2
 
-
 %install
-mkdir -p %{buildroot}%{_datadir}/qemu
+mkdir -p %{buildroot}%{_datadir}/%{targetdir}
-cp -a boot_rom.bin %{buildroot}%{_datadir}/qemu/slof.bin
+install -c -m 0644 boot_rom.bin %{buildroot}%{_datadir}/%{targetdir}/slof.bin
 
 
 %files
 %doc LICENSE
 %doc README
-%dir %{_datadir}/qemu
+%dir %{_datadir}/%{targetdir}
-%{_datadir}/qemu/slof.bin
+%{_datadir}/%{targetdir}/slof.bin
 
 
 %changelog

sources

@@ -1 +1 @@
-SHA512 (SLOF-20200717.tar.gz) = f0d18ab68c02748e8893b1a8cc21d478d59a9e17aba392907e72155885158046ed2fa3591f37abcba27597c68ad00865923108f85904dad8d73273a62aca2a56
+SHA512 (qemu-slof-20200717.tar.gz) = 8292a8f524d767971340cf3871f2bd880bc4f75c96f78dd39f076be1475512e11a08a634fccb0d4f0a1c2ad2c3272ef2d7046907ece3f5cbf8d36c41e09c516c