[puppet] Pre Branching F-20 for Fedora before RPM Fusion is branched also

commit 4d4b7917ff431768771047b7e9116d7632b8d64c Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Mon Aug 26 18:56:54 2013 +0200 Pre Branching F-20 for Fedora before RPM Fusion is branched also .../config/fedora-rawhide-i386-rpmfusion_free.cfg | 8 +++----- .../fedora-rawhide-i386-rpmfusion_nonfree.cfg | 8 +++----- .../fedora-rawhide-x86_64-rpmfusion_free.cfg | 9 +++------ .../fedora-rawhide-x86_64-rpmfusion_nonfree.cfg | 9 +++------ 4 files changed, 12 insertions(+), 22 deletions(-) --- diff --git a/modules/mock/files/config/fedora-rawhide-i386-rpmfusion_free.cfg b/modules/mock/files/config/fedora-rawhide-i386-rpmfusion_free.cfg index e6190e6..5ddb48c 100644 --- a/modules/mock/files/config/fedora-rawhide-i386-rpmfusion_free.cfg +++ b/modules/mock/files/config/fedora-rawhide-i386-rpmfusion_free.cfg @@ -2,7 +2,7 @@ config_opts['root'] = 'fedora-rawhide-i386-rpmfusion_free' config_opts['target_arch'] = 'i686' config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['dist'] = 'fc20' # only useful for --resultdir variable subst config_opts['macros']['%distribution'] = 'Fedora Rawhide' config_opts['macros']['%vendor'] = 'RPM Fusion' config_opts['macros']['%packager'] = '<http://free.rpmfusion.org/>' @@ -27,10 +27,8 @@ failovermethod=priority [fedora-rawhide] name=fedora -baseurl=http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/ -# http://mirror.wilsonet.com/fedora/development/rawhide/i386/os/ -#baseurl=http://mirror.wilsonet.com/fedora/development/16/i386/os/ -# http://dl.fedoraproject.org/pub/fedora/linux/development/16/i386/os/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/development/20/i386/os/ +# http://dl.fedoraproject.org/pub/fedora/linux/development/20/i386/os/ # rpmfusion free diff --git a/modules/mock/files/config/fedora-rawhide-i386-rpmfusion_nonfree.cfg b/modules/mock/files/config/fedora-rawhide-i386-rpmfusion_nonfree.cfg index e97ee27..812b426 100644 --- a/modules/mock/files/config/fedora-rawhide-i386-rpmfusion_nonfree.cfg +++ b/modules/mock/files/config/fedora-rawhide-i386-rpmfusion_nonfree.cfg @@ -2,7 +2,7 @@ config_opts['root'] = 'fedora-rawhide-i386-rpmfusion_nonfree' config_opts['target_arch'] = 'i686' config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['dist'] = 'fc20' # only useful for --resultdir variable subst config_opts['macros']['%distribution'] = 'Fedora Rawhide' config_opts['macros']['%vendor'] = 'RPM Fusion' config_opts['macros']['%packager'] = '<http://nonfree.rpmfusion.org/>' @@ -27,10 +27,8 @@ failovermethod=priority [fedora-rawhide] name=fedora -baseurl=http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/ -# http://mirror.wilsonet.com/fedora/development/rawhide/i386/os/ -#baseurl=http://mirror.wilsonet.com/fedora/development/16/i386/os/ -# http://dl.fedoraproject.org/pub/fedora/linux/development/16/i386/os/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/development/20/i386/os/ +# http://dl.fedoraproject.org/pub/fedora/linux/development/20/i386/os/ # rpmfusion free diff --git a/modules/mock/files/config/fedora-rawhide-x86_64-rpmfusion_free.cfg b/modules/mock/files/config/fedora-rawhide-x86_64-rpmfusion_free.cfg index 044edf4..a482d23 100644 --- a/modules/mock/files/config/fedora-rawhide-x86_64-rpmfusion_free.cfg +++ b/modules/mock/files/config/fedora-rawhide-x86_64-rpmfusion_free.cfg @@ -2,7 +2,7 @@ config_opts['root'] = 'fedora-rawhide-x86_64-rpmfusion_free' config_opts['target_arch'] = 'x86_64' config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['dist'] = 'fc20' # only useful for --resultdir variable subst config_opts['macros']['%distribution'] = 'Fedora Rawhide' config_opts['macros']['%vendor'] = 'RPM Fusion' config_opts['macros']['%packager'] = '<http://free.rpmfusion.org/>' @@ -30,11 +30,8 @@ exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0- [fedora-rawhide] name=fedora -baseurl=http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/ -# http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/ -# http://mirror.wilsonet.com/fedora/development/rawhide/x86_64/os/ -#baseurl=http://mirror.wilsonet.com/fedora/development/16/x86_64/os/ -# http://dl.fedoraproject.org/pub/fedora/linux/development/16/x86_64/os/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/development/20/x86_64/os/ +# http://dl.fedoraproject.org/pub/fedora/linux/development/20/x86_64/os/ # rpmfusion free diff --git a/modules/mock/files/config/fedora-rawhide-x86_64-rpmfusion_nonfree.cfg b/modules/mock/files/config/fedora-rawhide-x86_64-rpmfusion_nonfree.cfg index 49f92e7..3535731 100644 --- a/modules/mock/files/config/fedora-rawhide-x86_64-rpmfusion_nonfree.cfg +++ b/modules/mock/files/config/fedora-rawhide-x86_64-rpmfusion_nonfree.cfg @@ -2,7 +2,7 @@ config_opts['root'] = 'fedora-rawhide-x86_64-rpmfusion_nonfree' config_opts['target_arch'] = 'x86_64' config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc16' # only useful for --resultdir variable subst +config_opts['dist'] = 'fc20' # only useful for --resultdir variable subst config_opts['macros']['%distribution'] = 'Fedora Rawhide' config_opts['macros']['%vendor'] = 'RPM Fusion' config_opts['macros']['%packager'] = '<http://nonfree.rpmfusion.org/>' @@ -30,11 +30,8 @@ exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0- [fedora-rawhide] name=fedora -baseurl=http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/ -# http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/ -# http://mirror.wilsonet.com/fedora/development/rawhide/x86_64/os/ -#baseurl=http://mirror.wilsonet.com/fedora/development/16/x86_64/os/ -# http://dl.fedoraproject.org/pub/fedora/linux/development/16/x86_64/os/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/development/20/x86_64/os/ +# http://dl.fedoraproject.org/pub/fedora/linux/development/20/x86_64/os/ # rpmfusion free