Fix yum.conf building.

This commit is contained in:
Richard W.M. Jones 2010-12-06 20:26:58 +00:00
parent 5f74947c26
commit b1163a7bee
1 changed files with 10 additions and 14 deletions

View File

@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.7.19 Version: 1.7.19
Release: 10%{?dist} Release: 11%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -444,19 +444,15 @@ mkdir -p daemon/m4
mkdir repo mkdir repo
find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 cp -t repo find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 cp -t repo
createrepo repo createrepo repo
cp /etc/yum.conf yum.conf cat > yum.conf <<EOF
cat >> yum.conf <<EOF
[main] [main]
cachedir=/var/cache/yum/\$basearch/\$releasever cachedir=/var/cache/yum
keepcache=0 debuglevel=1
debuglevel=2
logfile=/var/log/yum.log logfile=/var/log/yum.log
exactarch=1 retries=20
obsoletes=1 obsoletes=1
gpgcheck=1 gpgcheck=0
plugins=1 assumeyes=1
installonly_limit=3
color=never
reposdir=/dev/null reposdir=/dev/null
[local] [local]
@ -467,9 +463,9 @@ enabled=1
gpgcheck=0 gpgcheck=0
EOF EOF
%define extra --with-febootstrap-yum-config=$(pwd)/yum.conf %define extra --with-febootstrap-yum-config=$(pwd)/yum.conf
echo /etc/yum.conf ---------------------------------------- echo "==== /etc/yum.conf ===="
cat /etc/yum.conf cat /etc/yum.conf
echo our yum.conf ---------------------------------------- echo "==== our yum.conf ===="
cat yum.conf cat yum.conf
%endif %endif
@ -756,7 +752,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Dec 6 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-10 * Mon Dec 6 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-11
- Rebuild appliance properly using febootstrap 3.1 and alternate yum repo. - Rebuild appliance properly using febootstrap 3.1 and alternate yum repo.
* Sun Dec 5 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-1 * Sun Dec 5 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-1