AlmaLinux changes
This commit is contained in:
		
							parent
							
								
									dfae7ac85a
								
							
						
					
					
						commit
						be7a16351a
					
				@ -3,6 +3,7 @@
 | 
			
		||||
# In theory the above, in practice golang is so often broken that
 | 
			
		||||
# I now disable it:
 | 
			
		||||
%global golang_arches NONE
 | 
			
		||||
%global dist %{?dist}.alma
 | 
			
		||||
 | 
			
		||||
# Architectures that we run the basic sanity-check test.
 | 
			
		||||
#
 | 
			
		||||
@ -763,17 +764,10 @@ sed 's/@VERSION@/%{version}/g' < %{SOURCE4} > README
 | 
			
		||||
# Test if network is available.
 | 
			
		||||
ip addr list ||:
 | 
			
		||||
ip route list ||:
 | 
			
		||||
if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
 | 
			
		||||
  extra=
 | 
			
		||||
else
 | 
			
		||||
  mkdir cachedir repo
 | 
			
		||||
  # -n 1 because of RHBZ#980502.
 | 
			
		||||
  find /var/cache/{dnf,yum} -type f -name '*.rpm' -print0 | \
 | 
			
		||||
    xargs -0 -n 1 cp -t repo
 | 
			
		||||
  createrepo_c repo
 | 
			
		||||
  sed -e "s|@PWD@|$(pwd)|" %{SOURCE6} > yum.conf
 | 
			
		||||
  extra=--with-supermin-packager-config=$(pwd)/yum.conf
 | 
			
		||||
fi
 | 
			
		||||
# AlmaLinux: avoid permission denied for yum/dnf cache
 | 
			
		||||
mkdir cachedir
 | 
			
		||||
sed -e "s|/var/cache/yum|$(pwd)/cachedir|" -e "s|/var/cache/dnf|$(pwd)/cachedir|" /etc/dnf/dnf.conf > yum.conf
 | 
			
		||||
extra=--with-supermin-packager-config=$(pwd)/yum.conf
 | 
			
		||||
 | 
			
		||||
%{configure} \
 | 
			
		||||
%if 0%{?rhel} && !0%{?eln}
 | 
			
		||||
@ -1148,6 +1142,10 @@ rm ocaml/html/.gitignore
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
%changelog
 | 
			
		||||
* Tue Aug 09 2022 Edaurd Abdullin <eabdullin@almalinux.org> - 1:1.46.1-4.alma
 | 
			
		||||
- Fix build for AlmaLinux
 | 
			
		||||
- Avoid permission denied for yum/dnf cache
 | 
			
		||||
 | 
			
		||||
* Sun May 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.46.1-4
 | 
			
		||||
- Disable 5-level page tables when using -cpu max
 | 
			
		||||
  resolves: rhbz#2085527
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user