From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 23 Jul 2012 20:29:51 +0000 (+0200)
Subject: Fedora 17 support, more generic OS detection.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=021f5c1562a9ebc4850e58aa7ed008a0967c622b;p=mock.git

Fedora 17 support, more generic OS detection.
---

diff --git a/fed-17-x86_64.cfg.template b/fed-17-x86_64.cfg.template
new file mode 100644
index 0000000..e5fccf4
--- /dev/null
+++ b/fed-17-x86_64.cfg.template
@@ -0,0 +1,47 @@
+config_opts['root'] = 'fed-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc17'  # only useful for --resultdir variable subst
+config_opts['macros']['%__arch_install_post'] = '%{nil}'
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+logfile=/var/log/yum.log
+reposdir=/dev/null
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+
+# repos
+
+[fedora]
+name=Fedora 17 - $basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-17&arch=$basearch
+
+[update]
+name=Fedora 17 - $basearch - Updates
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f17&arch=$basearch
+
+[EGI-trustanchors]
+name=EGI-trustanchors
+baseurl=http://repository.egi.eu/sw/production/cas/1/current/
+gpgkey=http://repository.egi.eu/sw/production/cas/1/GPG-KEY-EUGridPMA-RPM-3
+
+[EMI-2-third-party]
+name=EMI 2 Third-Party Repository
+baseurl=http://emisoft.web.cern.ch/emisoft/dist/EMI/2/sl6/$basearch/third-party
+gpgkey=http://emisoft.web.cern.ch/emisoft/dist/EMI/2/RPM-GPG-KEY-emi
+protect=1
+enabled=1
+
+[main]
+[local]
+name=Local
+baseurl=file://@PWD@/@REPO@
+"""
diff --git a/mock.sh b/mock.sh
index b1bbd96..ce5e98a 100755
--- a/mock.sh
+++ b/mock.sh
@@ -40,8 +40,9 @@ Scientific*5.*)
 Scientific*6.*)
 	CONF=sl-6-$ARCH
 	;;
-Fedora*16*)
-	CONF=fed-16-$ARCH
+Fedora*)
+	major=`rpm -q fedora-release | sed 's/fedora-release-\([0-9]*\)-.*/\1/'`
+	CONF=fed-$major-$ARCH
 	;;
 *)
 	echo "Unknown OS '$OS'"