diff --git a/debian/control b/debian/control index 01285666fee7ea65adb0969fb1a9fe0a14de75d2..71632d85a56ab52e16d631bccbfdc1743ff3f6c9 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Conflicts: tarantool-common (<< 1.5.3), tarantool-lts-common, tarantool-lts, tarantool-lts-modules, + tarantool-lts-client, tarantool-lts-postgresql-module, tarantool-lts-mysql-module, tarantool-lts-dev, @@ -49,6 +50,7 @@ Conflicts: tarantool-lts-common, tarantool-lts-postgresql-module, tarantool-lts-mysql-module, tarantool-lts-dev, + tarantool-lts-client, tarantool-dbg (<< 1.5.2), tarantool-common (<< 1.6~), tarantool-client (<< 1.6~), @@ -83,6 +85,7 @@ Conflicts: tarantool-lts-common, tarantool-lts-modules, tarantool-lts-postgresql-module, tarantool-lts-mysql-module, + tarantool-lts-client, tarantool-lts-dev, tarantool-dbg (<< 1.5.2), tarantool-common (<< 1.6~), diff --git a/doc/www/content/newsite/download.yml.in b/doc/www/content/newsite/download.yml.in index d0019a454549b3baf6f2bb845b08dd6fd205e306..d9bdd48ed82543fd47823a51550138ad4490d207 100644 --- a/doc/www/content/newsite/download.yml.in +++ b/doc/www/content/newsite/download.yml.in @@ -22,7 +22,7 @@ blocks : `<http://tarantool.org/dist/master/ubuntu>`_. At the moment the repository contains builds for Ubuntu - "Precise", "Trusty", "Saucy". It can be added to your + "Precise", "Trusty", "Saucy", "Vivid". It can be added to your apt sources list with: .. code-block:: bash @@ -76,7 +76,7 @@ blocks : from `Apple Developer`_ web-site. .. _Apple Developer: https://developer.apple.com/downloads/ - - - "Fedora 19, 20 and Rawhide" + - - "Fedora 19, 20, 21, 22" - format : rst content: | Fedora repository is available at diff --git a/doc/www/content/newsite/index.yml b/doc/www/content/newsite/index.yml index f396d11c27d354fc1cc1d57e0eaaca5128422381..83fcd48238e3517e65fb5a51d7a9670bb495e311 100644 --- a/doc/www/content/newsite/index.yml +++ b/doc/www/content/newsite/index.yml @@ -6,7 +6,7 @@ template: "index" blocks : header: - "Tarantool" - - "Get your data in RAM. Get compute close to data. Enjoy the performance" + - "Get your data in RAM. Get compute close to data. Enjoy the performance." features: - format: rst content: > diff --git a/extra/rpm/mock/tarantool-fedora-21-i386.cfg b/extra/rpm/mock/tarantool-fedora-21-i386.cfg new file mode 100644 index 0000000000000000000000000000000000000000..5d77d87cb0e5323a1439e2557542716740c120a5 --- /dev/null +++ b/extra/rpm/mock/tarantool-fedora-21-i386.cfg @@ -0,0 +1,68 @@ +config_opts['root'] = 'fedora-21-i386' +config_opts['target_arch'] = 'i386' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '21' + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +failovermethod=priority +gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-21-primary +gpgcheck=1 + +[updates] +name=updates +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +failovermethod=priority +gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-21-primary +gpgcheck=1 + +[updates-testing] +name=updates-testing +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/i386/ +cost=2000 +enabled=0 + +[fedora-debuginfo] +name=fedora-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[updates-debuginfo] +name=updates-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[updates-testing-debuginfo] +name=updates-testing-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +""" diff --git a/extra/rpm/mock/tarantool-fedora-21-x86_64.cfg b/extra/rpm/mock/tarantool-fedora-21-x86_64.cfg new file mode 100644 index 0000000000000000000000000000000000000000..ac48a3212d8381d0eccde2e8f43ddff2ed2e7e2c --- /dev/null +++ b/extra/rpm/mock/tarantool-fedora-21-x86_64.cfg @@ -0,0 +1,68 @@ +config_opts['root'] = 'fedora-21-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '21' + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +failovermethod=priority +gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-21-primary +gpgcheck=1 + +[updates] +name=updates +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +failovermethod=priority +gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-21-primary +gpgcheck=1 + +[updates-testing] +name=updates-testing +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/x86_64/ +cost=2000 +enabled=0 + +[fedora-debuginfo] +name=fedora-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[updates-debuginfo] +name=updates-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[updates-testing-debuginfo] +name=updates-testing-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +""" diff --git a/extra/rpm/mock/tarantool-fedora-22-i386.cfg b/extra/rpm/mock/tarantool-fedora-22-i386.cfg new file mode 100644 index 0000000000000000000000000000000000000000..513106374b00a8f0bc889ec1463309defa75fa29 --- /dev/null +++ b/extra/rpm/mock/tarantool-fedora-22-i386.cfg @@ -0,0 +1,60 @@ + +config_opts['root'] = 'fedora-22-i386' +config_opts['target_arch'] = 'i386' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc22' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '22' + +config_opts['yum.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +# repos +[fedora] +name=fedora +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +failovermethod=priority +gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-22-primary +gpgcheck=1 +[updates] +name=updates +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +failovermethod=priority +gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-22-primary +gpgcheck=1 +[updates-testing] +name=updates-testing +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/f22-build/latest/i386/ +cost=2000 +enabled=0 +[fedora-debuginfo] +name=fedora-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch +failovermethod=priority +enabled=0 +[updates-debuginfo] +name=updates-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +[updates-testing-debuginfo] +name=updates-testing-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +""" diff --git a/extra/rpm/mock/tarantool-fedora-22-x86_64.cfg b/extra/rpm/mock/tarantool-fedora-22-x86_64.cfg new file mode 100644 index 0000000000000000000000000000000000000000..80796d5bfabbd7e49d8b7d413927545731886694 --- /dev/null +++ b/extra/rpm/mock/tarantool-fedora-22-x86_64.cfg @@ -0,0 +1,60 @@ + +config_opts['root'] = 'fedora-22-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc22' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '22' + +config_opts['yum.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +# repos +[fedora] +name=fedora +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +failovermethod=priority +gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-22-primary +gpgcheck=1 +[updates] +name=updates +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +failovermethod=priority +gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-22-primary +gpgcheck=1 +[updates-testing] +name=updates-testing +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/f22-build/latest/x86_64/ +cost=2000 +enabled=0 +[fedora-debuginfo] +name=fedora-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch +failovermethod=priority +enabled=0 +[updates-debuginfo] +name=updates-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +[updates-testing-debuginfo] +name=updates-testing-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +"""