rpms/mock/devel mock-epel-config.patch, NONE, 1.1 mock.spec, 1.76, 1.77
Dennis Gilmore
ausil at fedoraproject.org
Wed Sep 2 18:03:11 UTC 2009
Author: ausil
Update of /cvs/extras/rpms/mock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4736
Modified Files:
mock.spec
Added Files:
mock-epel-config.patch
Log Message:
fix epel configs
mock-epel-config.patch:
epel-4-i386.cfg | 8 ++++++--
epel-4-ppc.cfg | 5 ++++-
epel-4-x86_64.cfg | 6 ++++--
epel-5-i386.cfg | 5 ++++-
epel-5-ppc.cfg | 5 ++++-
epel-5-x86_64.cfg | 6 ++++--
6 files changed, 26 insertions(+), 9 deletions(-)
--- NEW FILE mock-epel-config.patch ---
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-i386.cfg mock-0.9.14/etc/mock/epel-4-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-i386.cfg 2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-i386.cfg 2009-09-02 12:43:53.000000000 -0500
@@ -31,16 +31,20 @@
name=groups
baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel4/i386/
-[extras]
+[stable]
name=epel
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=i386
[testing]
name=epel-testing
+enabled=0
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=i386
[local]
name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/i386/
+cost=2000
+enabled=0
+
"""
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg mock-0.9.14/etc/mock/epel-4-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg 2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-ppc.cfg 2009-09-02 12:44:01.000000000 -0500
@@ -38,9 +38,12 @@
[testing]
name=epel-testing
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=ppc
+enabled=0
[local]
name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/ppc/
+cost=2000
+enabled=0
"""
diff -uNr mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg mock-0.9.14/etc/mock/epel-4-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg 2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-4-x86_64.cfg 2009-09-02 12:44:47.000000000 -0500
@@ -41,11 +41,13 @@
[testing]
name=epel-testing
+enabled=0
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=x86_64
[local]
name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/x86_64/
+cost=2000
+enabled=0
"""
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-i386.cfg mock-0.9.14/etc/mock/epel-5-i386.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-i386.cfg 2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-i386.cfg 2009-09-02 12:45:21.000000000 -0500
@@ -34,10 +34,13 @@
[testing]
name=epel-testing
+enabled=0
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=i386
[local]
name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/i386/
+cost=2000
+enabled=0
"""
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg mock-0.9.14/etc/mock/epel-5-ppc.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg 2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-ppc.cfg 2009-09-02 12:45:41.000000000 -0500
@@ -34,10 +34,13 @@
[testing]
name=epel-testing
+enabled=0
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=ppc
[local]
name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/ppc/
+cost=2000
+enabled=0
"""
diff -uNr mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg mock-0.9.14/etc/mock/epel-5-x86_64.cfg
--- mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg 2009-02-01 22:00:04.000000000 -0600
+++ mock-0.9.14/etc/mock/epel-5-x86_64.cfg 2009-09-02 12:46:11.000000000 -0500
@@ -37,11 +37,13 @@
[testing]
name=epel-testing
+enabled=0
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=x86_64
[local]
name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/x86_64/
+cost=2000
+enabled=0
"""
Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- mock.spec 25 Jul 2009 14:41:16 -0000 1.76
+++ mock.spec 2 Sep 2009 18:03:11 -0000 1.77
@@ -11,7 +11,7 @@
Summary: Builds packages inside chroots
Name: mock
Version: %{release_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Development/Tools
Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
@@ -21,12 +21,14 @@ BuildArch: noarch
Requires: python >= 2.4, yum >= 2.4, tar, gzip, python-ctypes, python-decoratortools, usermode
Requires(pre): shadow-utils
BuildRequires: python-devel
+Patch0: mock-epel-config.patch
%description
Mock takes a srpm and builds it in a chroot
%prep
%setup -q
+%patch0 -p1
%if "%{?dist}" == ".fc8"
pushd etc/mock
sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
@@ -97,6 +99,9 @@ fi
%attr(02775, root, mock) %dir /var/cache/mock
%changelog
+* Wed Sep 02 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.17-3
+Add patch cleaning up mock configs for epel
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list