Prepare repository for Fedora 20

4 files changed, 216 insertions, 2 deletions

diff --git a/buildfct b/buildfct
index 6e9fb03..78b5ba2 100644
--- a/buildfct
+++ b/buildfct
@@ -69,6 +69,9 @@ alias mockfc18xd="             mock --configdir=$mocketc -r fc18xd             r
 alias mockfc19i="setarch i686  mock --configdir=$mocketc -r fc19i  --arch i686 rebuild "
 alias mockfc19x="              mock --configdir=$mocketc -r fc19x              rebuild "
 
+alias mockfc20i="setarch i686  mock --configdir=$mocketc -r fc20i  --arch i686 rebuild "
+alias mockfc20x="              mock --configdir=$mocketc -r fc20x              rebuild "
+
 #alias mockel4i="setarch i686  mock --configdir=$mocketc -r el4i  --arch i386 rebuild "
 #alias mockel4it="setarch i686 mock --configdir=$mocketc -r el4it --arch i386 rebuild "
 #alias mockel4x="              mock --configdir=$mocketc -r el4x              rebuild "
diff --git a/mkallrepo b/mkallrepo
index 0155d12..3628e1d 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -6,7 +6,7 @@ TMPLNK=$(mktemp)
 cd /home/rpmbuild/site/rpms
 
 #for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64}
-for dep in fedora/{13,14,15,16,17,18,19}/*/{i386,x86_64} enterprise/{5,6}/*/{i386,x86_64}
+for dep in fedora/{13,14,15,16,17,18,19,20}/*/{i386,x86_64} enterprise/{5,6}/*/{i386,x86_64}
 do
 	arch=${dep##*/}
 
@@ -51,7 +51,7 @@ else 	echo "Rien à lier."
 fi
 
 #for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64}
-for dep in SRPMS fedora/{13,14,15,16,17,18,19}/*/{i386,x86_64} enterprise/{5,6}/*/{i386,x86_64}
+for dep in SRPMS fedora/{13,14,15,16,17,18,19,20}/*/{i386,x86_64} enterprise/{5,6}/*/{i386,x86_64}
 do
 	if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ]
 	then	echo "== Actualisation de $dep =="
diff --git a/mock/fc20i.cfg b/mock/fc20i.cfg
new file mode 100644
index 0000000..74a6293
--- /dev/null
+++ b/mock/fc20i.cfg
@@ -0,0 +1,103 @@
+config_opts['root'] = 'fc20i'
+config_opts['target_arch'] = 'i686'
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc20'  # only useful for --resultdir variable subst
+
+config_opts['plugin_conf']['ccache_enable'] = True
+config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc20i/"
+
+config_opts['basedir'] = '/dev/shm/'
+config_opts['resultdir'] = "/var/lib/mock/fc20i"
+config_opts['cleanup_on_success'] = True
+config_opts['cleanup_on_failure'] = False
+
+config_opts['createrepo_on_rpms'] = True
+config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+
+config_opts['macros']['%_topdir']="/builddir/build"
+config_opts['macros']['%_smp_mflags']="-j3"
+config_opts['macros']['%vendor']="Remi Collet"
+config_opts['macros']['%packager']="http://blog.famillecollet.com/"
+config_opts['macros']['%dist']=".fc20.remi"
+config_opts['macros']['%fedora']="20"
+config_opts['macros']['%_with_ibase']="1"
+config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%runselftest']="1"
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=i386
+#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/20/Everything/i386/os/
+#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/20/Everything/i386/os/
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=i386
+#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/20/i386/
+#	http://mirrors.ircam.fr/pub/fedora/linux/updates/20/i386/
+#	http://fr2.rpmfind.net/linux/fedora/updates/20/i386/
+enabled=1
+
+[updates-testing]
+name=updates-testing
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f20&arch=i386
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/20/i386/
+enabled=1
+
+[remi]
+name=remi public
+baseurl=file:/home/rpmbuild/site/rpms/fedora/20/remi/i386/
+enabled=1
+
+[remi-priv]
+name=remi prive
+baseurl=file:/home/rpmbuild/site/rpms/priv/i386/
+enabled=1
+
+[remi-test]
+name=remi test
+baseurl=file:/home/rpmbuild/site/rpms/fedora/20/test/i386/
+enabled=0
+
+[rpmfusion-free]
+name=rpmfusion-free
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-20&arch=i386
+enabled=1
+
+[rpmfusion-free-updates]
+name=rpmfusion-free
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-20&arch=i386
+enabled=1
+
+[rpmfusion-nonfree]
+name=rpmfusion-nonfree
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-20&arch=i386
+enabled=0
+
+[rpmfusion-nonfree-updates]
+name=rpmfusion-nonfree
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-20&arch=i386
+enabled=0
+
+[result]
+name=result
+baseurl=file:/var/lib/mock/fc20i/
+enabled=1
+
+"""
+
diff --git a/mock/fc20x.cfg b/mock/fc20x.cfg
new file mode 100644
index 0000000..19fae5c
--- /dev/null
+++ b/mock/fc20x.cfg
@@ -0,0 +1,108 @@
+config_opts['root'] = 'fc20x'
+config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc20'  # only useful for --resultdir variable subst
+
+config_opts['plugin_conf']['ccache_enable'] = True
+config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc20x/"
+
+config_opts['basedir'] = '/dev/shm/'
+config_opts['resultdir'] = "/var/lib/mock/fc20x"
+config_opts['cleanup_on_success'] = True
+config_opts['cleanup_on_failure'] = False
+
+config_opts['createrepo_on_rpms'] = True
+config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
+
+config_opts['macros']['%_topdir']="/builddir/build"
+config_opts['macros']['%_smp_mflags']="-j3"
+config_opts['macros']['%vendor']="Remi Collet"
+config_opts['macros']['%packager']="http://blog.famillecollet.com/"
+config_opts['macros']['%dist']=".fc20.remi"
+config_opts['macros']['%fedora']="20"
+config_opts['macros']['%_with_ibase']="1"
+config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%runselftest']="1"
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=x86_64
+#baseurl=http://fr2.rpmfind.net/linux/fedora/releases/20/Everything/x86_64/os/
+#	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/20/Everything/x86_64/os/
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=x86_64
+#baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
+#	http://mirrors.ircam.fr/pub/fedora/linux/updates/20/x86_64/
+#	http://fr2.rpmfind.net/linux/fedora/updates/20/x86_64/
+enabled=1
+	
+[updates-testing]
+name=updates-testing
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f20&arch=x86_64
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/20/x86_64/
+enabled=1
+
+[remi]
+name=remi public
+baseurl=file:/home/rpmbuild/site/rpms/fedora/20/remi/x86_64/
+enabled=1
+
+[remi-priv]
+name=remi prive
+baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/
+enabled=1
+
+[remi-test]
+name=remi test
+baseurl=file:/home/rpmbuild/site/rpms/fedora/20/test/x86_64/
+enabled=0
+
+[remi-dev]
+name=remi dev
+baseurl=file:/home/rpmbuild/site/rpms/fedora/20/devs/x86_64/
+enabled=0
+
+[rpmfusion-free]
+name=rpmfusion-free
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-20&arch=x86_64
+enabled=1
+
+[rpmfusion-free-updates]
+name=rpmfusion-free
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-20&arch=x86_64
+enabled=1
+
+[rpmfusion-nonfree]
+name=rpmfusion-nonfree
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-20&arch=x86_64
+enabled=0
+
+[rpmfusion-nonfree-updates]
+name=rpmfusion-nonfree
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-20&arch=x86_64
+enabled=0
+
+[result]
+name=result
+baseurl=file:/var/lib/mock/fc20x/
+enabled=1
+
+"""
+