Perry Myers
2008-Sep-16 00:43 UTC
[Ovirt-devel] [PATCH appliance] Fix spec to provide ability to excludepkgs from Fedora mirrors
And set it to not bring in rubygem-rails, activerecord and
activesupport pkgs since we need to address problems with
upgrading from 2.0.1 to 2.1.0.
bad_pkgs can be overridden using --define macro in rpmbuild.
Signed-off-by: Perry Myers <pmyers at redhat.com>
---
ovirt-appliance.spec | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ovirt-appliance.spec b/ovirt-appliance.spec
index bd32391..8a2158e 100644
--- a/ovirt-appliance.spec
+++ b/ovirt-appliance.spec
@@ -3,6 +3,7 @@
%{!?ovirt_url: %define ovirt_url http://ovirt.org/repos/ovirt}
%{?fedora_url: %define fedora_tree_url
%{fedora_url}/releases/%{fedora}/Fedora/%{_arch}/os}
%{!?fedora_tree_url: %define fedora_tree_url
http://download.fedoraproject.org/pub/fedora/linux/releases/%{fedora}/Fedora/%{_arch}/os}
+%{!?bad_pkgs: %define bad_pkgs
rubygem-rails,rubygem-activesupport,rubygem-activerecord}
%define fedora_mirror http://mirrors.fedoraproject.org/mirrorlist
Summary: oVirt Appliance
@@ -42,14 +43,14 @@ The oVirt Appliance image and scripts to install on a Fedora
Host
if [ -n "%{?fedora_url}" ]; then
cat > repos.ks << EOF
repo --name=f%{fedora}
--baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
-repo --name=f%{fedora}-updates
--baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}
-repo --name=f%{fedora}-updates-newkey
--baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
+repo --name=f%{fedora}-updates
--baseurl=%{fedora_url}/updates/%{fedora}/%{_arch} --excludepkgs=%{bad_pkgs}
+repo --name=f%{fedora}-updates-newkey
--baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
--excludepkgs=%{bad_pkgs}
EOF
else
cat > repos.ks << EOF
repo --name=f%{fedora}
--mirrorlist=%{fedora_mirror}?repo=fedora-%{fedora}&arch=%{_arch}
-repo --name=f%{fedora}-updates
--mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}&arch=%{_arch}
-repo --name=f%{fedora}-updates-newkey
--mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}.newkey&arch=%{_arch}
+repo --name=f%{fedora}-updates
--mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}&arch=%{_arch}
--excludepkgs=%{bad_pkgs}
+repo --name=f%{fedora}-updates-newkey
--mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}.newkey&arch=%{_arch}
--excludepkgs=%{bad_pkgs}
EOF
fi
--
1.5.5.1
Perry N. Myers
2008-Sep-16 00:45 UTC
[Ovirt-devel] Re: [PATCH appliance] Fix spec to provide ability to excludepkgs from Fedora mirrors
Perry Myers wrote:> And set it to not bring in rubygem-rails, activerecord and > activesupport pkgs since we need to address problems with > upgrading from 2.0.1 to 2.1.0. > > bad_pkgs can be overridden using --define macro in rpmbuild.Note, since the builds were presently broken due to Ruby I committed this change without ACKs. If anyone has any problems with the patch let me know and we can correct it with additional patches. Also, since the versions prior to 2.1.0 for the above packages were 2.0.2 and they were all in the Fedora 9 base repo, there was no need to host any of these packages in the ovirt.org repo. Perry