mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-30 19:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

dist: fetch CentOS dependencies from koji, update them to latest version

Browse Source 
Signed-off-by: Takuya ASADA <syuu@scylladb.com>
Message-Id: <1453378765-19596-1-git-send-email-syuu@scylladb.com>
This commit is contained in:
Takuya ASADA
2016-01-21 21:19:25 +09:00
committed by Avi Kivity
parent 755d792c78
commit fae47ee4a8
8 changed files with 240 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dist/redhat/centos_dep/binutils.diff vendored
View File

@@ -1,5 +1,5 @@
--- binutils.spec 2015-10-19 05:45:55.106745163 +0000
+++ binutils.spec.1 2015-10-19 05:45:55.807742899 +0000
--- binutils.spec.orig 2015-09-30 14:48:25.000000000 +0000
+++ binutils.spec 2016-01-20 14:42:17.856037134 +0000
@@ -17,7 +17,7 @@
%define enable_deterministic_archives 1
@@ -7,7 +7,7 @@
-Name: %{?cross}binutils%{?_with_debug:-debug}
+Name: scylla-%{?cross}binutils%{?_with_debug:-debug}
Version: 2.25
Release: 5%{?dist}
Release: 15%{?dist}
License: GPLv3+
@@ -29,6 +29,7 @@
# instead.
@@ -17,7 +17,7 @@
Source2: binutils-2.19.50.0.1-output-format.sed
Patch01: binutils-2.20.51.0.2-libtool-lib64.patch
@@ -82,6 +83,9 @@
@@ -89,6 +90,9 @@
BuildRequires: texinfo >= 4.0, gettext, flex, bison, zlib-devel
# BZ 920545: We need pod2man in order to build the manual pages.
BuildRequires: /usr/bin/pod2man
@@ -27,7 +27,7 @@
# Required for: ld-bootstrap/bootstrap.exp bootstrap with --static
# It should not be required for: ld-elf/elf.exp static {preinit,init,fini} array
%if %{run_testsuite}
@@ -105,8 +109,8 @@
@@ -112,8 +116,8 @@
%if "%{build_gold}" == "both"
Requires(post): coreutils
@@ -38,7 +38,7 @@
%endif
# On ARM EABI systems, we do want -gnueabi to be part of the
@@ -131,11 +135,12 @@
@@ -138,11 +142,12 @@
%package devel
Summary: BFD and opcodes static and dynamic libraries and header files
Group: System Environment/Libraries
@@ -50,10 +50,10 @@
Requires: zlib-devel
-Requires: binutils = %{version}-%{release}
+Requires: scylla-binutils = %{version}-%{release}
# BZ 1215242: We need touch...
Requires: coreutils
%description devel
This package contains BFD and opcodes static and dynamic libraries.
@@ -411,11 +416,11 @@
@@ -426,11 +431,11 @@
%post
%if "%{build_gold}" == "both"
%__rm -f %{_bindir}/%{?cross}ld
@@ -68,7 +68,7 @@
%endif
%if %{isnative}
/sbin/ldconfig
@@ -433,8 +438,8 @@
@@ -448,8 +453,8 @@
%preun
%if "%{build_gold}" == "both"
if [ $1 = 0 ]; then

90
dist/redhat/centos_dep/boost.diff vendored
View File

@@ -1,5 +1,5 @@
--- boost.spec 2015-05-03 17:32:13.000000000 +0000
+++ boost.spec.1 2015-10-19 06:03:12.670534256 +0000
--- boost.spec.orig 2016-01-15 18:41:47.000000000 +0000
+++ boost.spec 2016-01-20 14:46:47.397663246 +0000
@@ -6,6 +6,11 @@
# We should be able to install directly.
%define boost_docdir __tmp_docdir
@@ -20,9 +20,9 @@
+Name: scylla-boost
+%define orig_name boost
Summary: The free peer-reviewed portable C++ source libraries
Version: 1.57.0
%define version_enc 1_57_0
Release: 6%{?dist}
Version: 1.58.0
%define version_enc 1_58_0
Release: 11%{?dist}
License: Boost and MIT and Python
-%define toplev_dirname %{name}_%{version_enc}
@@ -93,8 +93,8 @@
+Requires: scylla-boost-wave%{?_isa} = %{version}-%{release}
BuildRequires: m4
BuildRequires: libstdc++-devel%{?_isa}
@@ -151,6 +159,7 @@
BuildRequires: libstdc++-devel
@@ -156,6 +164,7 @@
%package atomic
Summary: Run-Time component of boost atomic library
Group: System Environment/Libraries
@@ -102,7 +102,7 @@
%description atomic
@@ -162,7 +171,8 @@
@@ -167,7 +176,8 @@
%package chrono
Summary: Run-Time component of boost chrono library
Group: System Environment/Libraries
@@ -112,7 +112,7 @@
%description chrono
@@ -171,6 +181,7 @@
@@ -176,6 +186,7 @@
%package container
Summary: Run-Time component of boost container library
Group: System Environment/Libraries
@@ -120,7 +120,7 @@
%description container
@@ -183,6 +194,7 @@
@@ -188,6 +199,7 @@
%package context
Summary: Run-Time component of boost context switching library
Group: System Environment/Libraries
@@ -128,7 +128,7 @@
%description context
@@ -192,6 +204,7 @@
@@ -197,6 +209,7 @@
%package coroutine
Summary: Run-Time component of boost coroutine library
Group: System Environment/Libraries
@@ -136,7 +136,7 @@
%description coroutine
Run-Time support for Boost.Coroutine, a library that provides
@@ -203,6 +216,7 @@
@@ -208,6 +221,7 @@
%package date-time
Summary: Run-Time component of boost date-time library
Group: System Environment/Libraries
@@ -144,7 +144,7 @@
%description date-time
@@ -212,7 +226,8 @@
@@ -217,7 +231,8 @@
%package filesystem
Summary: Run-Time component of boost filesystem library
Group: System Environment/Libraries
@@ -154,7 +154,7 @@
%description filesystem
@@ -223,7 +238,8 @@
@@ -228,7 +243,8 @@
%package graph
Summary: Run-Time component of boost graph library
Group: System Environment/Libraries
@@ -164,7 +164,7 @@
%description graph
@@ -243,9 +259,10 @@
@@ -248,9 +264,10 @@
%package locale
Summary: Run-Time component of boost locale library
Group: System Environment/Libraries
@@ -178,7 +178,7 @@
%description locale
@@ -255,6 +272,7 @@
@@ -260,6 +277,7 @@
%package log
Summary: Run-Time component of boost logging library
Group: System Environment/Libraries
@@ -186,7 +186,7 @@
%description log
@@ -265,6 +283,7 @@
@@ -270,6 +288,7 @@
%package math
Summary: Math functions for boost TR1 library
Group: System Environment/Libraries
@@ -194,7 +194,7 @@
%description math
@@ -274,6 +293,7 @@
@@ -279,6 +298,7 @@
%package program-options
Summary: Run-Time component of boost program_options library
Group: System Environment/Libraries
@@ -202,7 +202,7 @@
%description program-options
@@ -284,6 +304,7 @@
@@ -289,6 +309,7 @@
%package python
Summary: Run-Time component of boost python library
Group: System Environment/Libraries
@@ -210,7 +210,7 @@
%description python
@@ -298,6 +319,7 @@
@@ -303,6 +324,7 @@
%package python3
Summary: Run-Time component of boost python library for Python 3
Group: System Environment/Libraries
@@ -218,7 +218,7 @@
%description python3
@@ -310,8 +332,9 @@
@@ -315,8 +337,9 @@
%package python3-devel
Summary: Shared object symbolic links for Boost.Python 3
Group: System Environment/Libraries
@@ -230,7 +230,7 @@
%description python3-devel
@@ -322,6 +345,7 @@
@@ -327,6 +350,7 @@
%package random
Summary: Run-Time component of boost random library
Group: System Environment/Libraries
@@ -238,7 +238,7 @@
%description random
@@ -330,6 +354,7 @@
@@ -335,6 +359,7 @@
%package regex
Summary: Run-Time component of boost regular expression library
Group: System Environment/Libraries
@@ -246,7 +246,7 @@
%description regex
@@ -338,6 +363,7 @@
@@ -343,6 +368,7 @@
%package serialization
Summary: Run-Time component of boost serialization library
Group: System Environment/Libraries
@@ -254,7 +254,7 @@
%description serialization
@@ -346,6 +372,7 @@
@@ -351,6 +377,7 @@
%package signals
Summary: Run-Time component of boost signals and slots library
Group: System Environment/Libraries
@@ -262,7 +262,7 @@
%description signals
@@ -354,6 +381,7 @@
@@ -359,6 +386,7 @@
%package system
Summary: Run-Time component of boost system support library
Group: System Environment/Libraries
@@ -270,7 +270,7 @@
%description system
@@ -364,6 +392,7 @@
@@ -369,6 +397,7 @@
%package test
Summary: Run-Time component of boost test library
Group: System Environment/Libraries
@@ -278,7 +278,7 @@
%description test
@@ -373,7 +402,8 @@
@@ -378,7 +407,8 @@
%package thread
Summary: Run-Time component of boost thread library
Group: System Environment/Libraries
@@ -288,7 +288,7 @@
%description thread
@@ -385,8 +415,9 @@
@@ -390,8 +420,9 @@
%package timer
Summary: Run-Time component of boost timer library
Group: System Environment/Libraries
@@ -300,7 +300,7 @@
%description timer
@@ -397,11 +428,12 @@
@@ -402,11 +433,12 @@
%package wave
Summary: Run-Time component of boost C99/C++ pre-processing library
Group: System Environment/Libraries
@@ -318,7 +318,7 @@
%description wave
@@ -412,27 +444,20 @@
@@ -417,27 +449,20 @@
%package devel
Summary: The Boost C++ headers and shared development libraries
Group: Development/Libraries
@@ -352,7 +352,7 @@
%description static
Static Boost C++ libraries.
@@ -443,11 +468,7 @@
@@ -448,11 +473,7 @@
%if 0%{?rhel} >= 6
BuildArch: noarch
%endif
@@ -365,7 +365,7 @@
%description doc
This package contains the documentation in the HTML format of the Boost C++
@@ -460,7 +481,7 @@
@@ -465,7 +486,7 @@
%if 0%{?rhel} >= 6
BuildArch: noarch
%endif
@@ -374,19 +374,18 @@
%description examples
This package contains example source files distributed with boost.
@@ -471,9 +492,10 @@
@@ -476,8 +497,9 @@
%package openmpi
Summary: Run-Time component of Boost.MPI library
Group: System Environment/Libraries
+Requires: scylla-env
Requires: openmpi%{?_isa}
BuildRequires: openmpi-devel
-Requires: boost-serialization%{?_isa} = %{version}-%{release}
+Requires: scylla-boost-serialization%{?_isa} = %{version}-%{release}
%description openmpi
@@ -483,10 +505,11 @@
@@ -487,10 +509,11 @@
%package openmpi-devel
Summary: Shared library symbolic links for Boost.MPI
Group: System Environment/Libraries
@@ -402,7 +401,7 @@
%description openmpi-devel
@@ -496,9 +519,10 @@
@@ -500,9 +523,10 @@
%package openmpi-python
Summary: Python run-time component of Boost.MPI library
Group: System Environment/Libraries
@@ -416,7 +415,7 @@
%description openmpi-python
@@ -508,8 +532,9 @@
@@ -512,8 +536,9 @@
%package graph-openmpi
Summary: Run-Time component of parallel boost graph library
Group: System Environment/Libraries
@@ -428,12 +427,11 @@
%description graph-openmpi
@@ -526,11 +551,11 @@
@@ -530,10 +555,10 @@
%package mpich
Summary: Run-Time component of Boost.MPI library
Group: System Environment/Libraries
+Requires: scylla-env
Requires: mpich%{?_isa}
BuildRequires: mpich-devel
-Requires: boost-serialization%{?_isa} = %{version}-%{release}
-Provides: boost-mpich2 = %{version}-%{release}
@@ -443,7 +441,7 @@
%description mpich
@@ -540,12 +565,12 @@
@@ -543,12 +568,12 @@
%package mpich-devel
Summary: Shared library symbolic links for Boost.MPI
Group: System Environment/Libraries
@@ -462,7 +460,7 @@
%description mpich-devel
@@ -555,11 +580,11 @@
@@ -558,11 +583,11 @@
%package mpich-python
Summary: Python run-time component of Boost.MPI library
Group: System Environment/Libraries
@@ -479,7 +477,7 @@
%description mpich-python
@@ -569,10 +594,10 @@
@@ -572,10 +597,10 @@
%package graph-mpich
Summary: Run-Time component of parallel boost graph library
Group: System Environment/Libraries
@@ -494,7 +492,7 @@
%description graph-mpich
@@ -586,7 +611,8 @@
@@ -589,7 +614,8 @@
%package build
Summary: Cross platform build system for C++ projects
Group: Development/Tools
@@ -504,7 +502,7 @@
BuildArch: noarch
%description build
@@ -600,6 +626,7 @@
@@ -613,6 +639,7 @@
%package jam
Summary: A low-level build tool
Group: Development/Tools
@@ -512,7 +510,7 @@
%description jam
Boost.Jam (BJam) is the low-level build engine tool for Boost.Build.
@@ -1134,7 +1161,7 @@
@@ -1186,7 +1213,7 @@
%files devel
%defattr(-, root, root, -)
%doc LICENSE_1_0.txt

73
dist/redhat/centos_dep/build_dependency.sh vendored
View File

@@ -8,36 +8,36 @@ do_install()
echo Install $name done
}
sudo yum install -y wget yum-utils rpm-build rpmdevtools gcc gcc-c++ make patch rpm-devel python34-devel guile-devel
sudo yum install -y wget yum-utils rpm-build rpmdevtools gcc gcc-c++ make patch
mkdir -p build/srpms
cd build/srpms
if [ ! -f binutils-2.25-5.fc22.src.rpm ]; then
wget http://download.fedoraproject.org/pub/fedora/linux/releases/22/Everything/source/SRPMS/b/binutils-2.25-5.fc22.src.rpm
if [ ! -f binutils-2.25-15.fc23.src.rpm ]; then
wget https://kojipkgs.fedoraproject.org//packages/binutils/2.25/15.fc23/src/binutils-2.25-15.fc23.src.rpm
fi
if [ ! -f isl-0.14-3.fc22.src.rpm ]; then
wget http://download.fedoraproject.org/pub/fedora/linux/releases/22/Everything/source/SRPMS/i/isl-0.14-3.fc22.src.rpm
if [ ! -f isl-0.14-4.fc23.src.rpm ]; then
wget https://kojipkgs.fedoraproject.org//packages/isl/0.14/4.fc23/src/isl-0.14-4.fc23.src.rpm
fi
if [ ! -f gcc-5.1.1-4.fc22.src.rpm ]; then
wget https://s3.amazonaws.com/scylla-centos-dep/gcc-5.1.1-4.fc22.src.rpm
if [ ! -f gcc-5.3.1-2.fc23.src.rpm ]; then
wget https://kojipkgs.fedoraproject.org//packages/gcc/5.3.1/2.fc23/src/gcc-5.3.1-2.fc23.src.rpm
fi
if [ ! -f boost-1.57.0-6.fc22.src.rpm ]; then
wget http://download.fedoraproject.org/pub/fedora/linux/releases/22/Everything/source/SRPMS/b/boost-1.57.0-6.fc22.src.rpm
if [ ! -f boost-1.58.0-11.fc23.src.rpm ]; then
wget https://kojipkgs.fedoraproject.org//packages/boost/1.58.0/11.fc23/src/boost-1.58.0-11.fc23.src.rpm
fi
if [ ! -f ninja-build-1.5.3-2.fc22.src.rpm ]; then
wget http://download.fedoraproject.org/pub/fedora/linux/releases/22/Everything/source/SRPMS/n/ninja-build-1.5.3-2.fc22.src.rpm
if [ ! -f ninja-build-1.6.0-2.fc23.src.rpm ]; then
wget https://kojipkgs.fedoraproject.org//packages/ninja-build/1.6.0/2.fc23/src/ninja-build-1.6.0-2.fc23.src.rpm
fi
if [ ! -f ragel-6.8-3.fc22.src.rpm ]; then
wget http://download.fedoraproject.org/pub/fedora/linux/releases/22/Everything/source/SRPMS/r/ragel-6.8-3.fc22.src.rpm
if [ ! -f ragel-6.8-5.fc23.src.rpm ]; then
wget https://kojipkgs.fedoraproject.org//packages/ragel/6.8/5.fc23/src/ragel-6.8-5.fc23.src.rpm
fi
if [ ! -f gdb-7.10-23.fc23.src.rpm ]; then
wget http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/source/SRPMS/g/gdb-7.10-23.fc23.src.rpm
if [ ! -f gdb-7.10.1-30.fc23.src.rpm ]; then
wget https://kojipkgs.fedoraproject.org//packages/gdb/7.10.1/30.fc23/src/gdb-7.10.1-30.fc23.src.rpm
fi
cd -
@@ -50,6 +50,7 @@ sudo yum install -y flex bison dejagnu zlib-static glibc-static sharutils bc lib
sudo yum install -y gcc-objc
sudo yum install -y asciidoc
sudo yum install -y gettext
sudo yum install -y rpm-devel python34-devel guile-devel readline-devel ncurses-devel expat-devel texlive-collection-latexrecommended
if [ ! -f $RPMBUILD/RPMS/noarch/scylla-env-1.0-1.el7.centos.noarch.rpm ]; then
cd dist/redhat/centos_dep
@@ -59,55 +60,55 @@ if [ ! -f $RPMBUILD/RPMS/noarch/scylla-env-1.0-1.el7.centos.noarch.rpm ]; then
fi
do_install scylla-env-1.0-1.el7.centos.noarch.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-binutils-2.25-5.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/binutils-2.25-5.fc22.src.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-binutils-2.25-15.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/binutils-2.25-15.fc23.src.rpm
patch $RPMBUILD/SPECS/binutils.spec < dist/redhat/centos_dep/binutils.diff
rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/binutils.spec
fi
do_install scylla-binutils-2.25-5.el7.centos.x86_64.rpm
do_install scylla-binutils-2.25-15.el7.centos.x86_64.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-isl-0.14-3.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/isl-0.14-3.fc22.src.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-isl-0.14-4.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/isl-0.14-4.fc23.src.rpm
patch $RPMBUILD/SPECS/isl.spec < dist/redhat/centos_dep/isl.diff
rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/isl.spec
fi
do_install scylla-isl-0.14-3.el7.centos.x86_64.rpm
do_install scylla-isl-devel-0.14-3.el7.centos.x86_64.rpm
do_install scylla-isl-0.14-4.el7.centos.x86_64.rpm
do_install scylla-isl-devel-0.14-4.el7.centos.x86_64.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-gcc-5.1.1-4.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/gcc-5.1.1-4.fc22.src.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-gcc-5.3.1-2.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/gcc-5.3.1-2.fc23.src.rpm
patch $RPMBUILD/SPECS/gcc.spec < dist/redhat/centos_dep/gcc.diff
rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/gcc.spec
fi
do_install scylla-*5.1.1-4*
do_install scylla-*5.3.1-2*
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-boost-1.57.0-6.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/boost-1.57.0-6.fc22.src.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-boost-1.58.0-11.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/boost-1.58.0-11.fc23.src.rpm
patch $RPMBUILD/SPECS/boost.spec < dist/redhat/centos_dep/boost.diff
rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/boost.spec
fi
do_install scylla-boost*
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-ninja-build-1.5.3-2.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/ninja-build-1.5.3-2.fc22.src.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-ninja-build-1.6.0-2.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/ninja-build-1.6.0-2.fc23.src.rpm
patch $RPMBUILD/SPECS/ninja-build.spec < dist/redhat/centos_dep/ninja-build.diff
rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/ninja-build.spec
fi
do_install scylla-ninja-build-1.5.3-2.el7.centos.x86_64.rpm
do_install scylla-ninja-build-1.6.0-2.el7.centos.x86_64.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-ragel-6.8-3.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/ragel-6.8-3.fc22.src.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-ragel-6.8-5.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/ragel-6.8-5.fc23.src.rpm
patch $RPMBUILD/SPECS/ragel.spec < dist/redhat/centos_dep/ragel.diff
rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/ragel.spec
fi
do_install scylla-ragel-6.8-3.el7.centos.x86_64.rpm
do_install scylla-ragel-6.8-5.el7.centos.x86_64.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-gdb-7.10-23.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/gdb-7.10-23.fc23.src.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-gdb-7.10.1-30.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/gdb-7.10.1-30.fc23.src.rpm
patch $RPMBUILD/SPECS/gdb.spec < dist/redhat/centos_dep/gdb.diff
rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/gdb.spec
fi
do_install scylla-gdb-7.10-23.el7.centos.x86_64.rpm
do_install scylla-gdb-7.10.1-30.el7.centos.x86_64.rpm
if [ ! -f $RPMBUILD/RPMS/noarch/scylla-antlr3-tool-3.5.2-1.el7.centos.noarch.rpm ]; then
mkdir build/scylla-antlr3-tool-3.5.2

155
dist/redhat/centos_dep/gcc.diff vendored
View File

@@ -1,30 +1,14 @@
--- gcc.spec 2015-10-19 06:31:44.889189647 +0000
+++ gcc.spec.1 2015-10-19 07:56:17.445991665 +0000
@@ -1,22 +1,15 @@
%global DATE 20150618
%global SVNREV 224595
%global gcc_version 5.1.1
--- gcc.spec.orig 2015-12-08 16:03:46.000000000 +0000
+++ gcc.spec 2016-01-21 08:47:49.160667342 +0000
@@ -1,6 +1,7 @@
%global DATE 20151207
%global SVNREV 231358
%global gcc_version 5.3.1
+%define _prefix /opt/scylladb
# Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line.
%global gcc_release 4
%global _unpackaged_files_terminate_build 0
%global _performance_build 1
%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
-%ifarch %{ix86} x86_64 ia64 ppc ppc64 ppc64p7 alpha %{arm} aarch64
-%global build_ada 1
-%else
%global build_ada 0
-%endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
-%global build_go 1
-%else
%global build_go 0
-%endif
%ifarch %{ix86} x86_64 ia64
%global build_libquadmath 1
%else
@@ -82,7 +75,8 @@
%global gcc_release 2
@@ -84,7 +85,8 @@
%global multilib_32_arch i686
%endif
Summary: Various compilers (C, C++, Objective-C, Java, ...)
@@ -34,7 +18,7 @@
Version: %{gcc_version}
Release: %{gcc_release}%{?dist}
# libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
@@ -97,6 +91,7 @@
@@ -99,6 +101,7 @@
%global isl_version 0.14
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,7 +26,7 @@
# Need binutils with -pie support >= 2.14.90.0.4-4
# Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
# Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
@@ -108,7 +103,7 @@
@@ -110,7 +113,7 @@
# Need binutils which support .cfi_sections >= 2.19.51.0.14-33
# Need binutils which support --no-add-needed >= 2.20.51.0.2-12
# Need binutils which support -plugin
@@ -51,7 +35,7 @@
# While gcc doesn't include statically linked binaries, during testing
# -static is used several times.
BuildRequires: glibc-static
@@ -143,15 +138,15 @@
@@ -145,15 +148,15 @@
BuildRequires: libunwind >= 0.98
%endif
%if %{build_isl}
@@ -71,7 +55,7 @@
# Need .eh_frame ld optimizations
# Need proper visibility support
# Need -pie support
@@ -166,7 +161,7 @@
@@ -168,7 +171,7 @@
# Need binutils that support .cfi_sections
# Need binutils that support --no-add-needed
# Need binutils that support -plugin
@@ -80,7 +64,7 @@
# Make sure gdb will understand DW_FORM_strp
Conflicts: gdb < 5.1-2
Requires: glibc-devel >= 2.2.90-12
@@ -174,17 +169,15 @@
@@ -176,17 +179,15 @@
# Make sure glibc supports TFmode long double
Requires: glibc >= 2.3.90-35
%endif
@@ -102,7 +86,7 @@
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
AutoReq: true
@@ -226,12 +219,12 @@
@@ -228,12 +229,12 @@
The gcc package contains the GNU Compiler Collection version 5.
You'll need this package in order to compile C code.
@@ -117,7 +101,7 @@
%endif
Obsoletes: libmudflap
Obsoletes: libmudflap-devel
@@ -239,17 +232,19 @@
@@ -241,17 +242,19 @@
Obsoletes: libgcj < %{version}-%{release}
Obsoletes: libgcj-devel < %{version}-%{release}
Obsoletes: libgcj-src < %{version}-%{release}
@@ -141,7 +125,7 @@
Autoreq: true
%description c++
@@ -257,50 +252,55 @@
@@ -259,50 +262,55 @@
It includes support for most of the current C++ specification,
including templates and exception handling.
@@ -209,7 +193,7 @@
Autoreq: true
%description objc
@@ -311,29 +311,32 @@
@@ -313,29 +321,32 @@
%package objc++
Summary: Objective-C++ support for GCC
Group: Development/Languages
@@ -249,7 +233,7 @@
%endif
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -343,260 +346,286 @@
@@ -345,260 +356,286 @@
The gcc-gfortran package provides support for compiling Fortran
programs with the GNU Compiler Collection.
@@ -608,7 +592,7 @@
Cpp is the GNU C-Compatible Compiler Preprocessor.
Cpp is a macro processor which is used automatically
by the C compiler to transform your program before actual
@@ -621,8 +650,9 @@
@@ -623,8 +660,9 @@
%package gnat
Summary: Ada 83, 95, 2005 and 2012 support for GCC
Group: Development/Languages
@@ -620,7 +604,7 @@
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Autoreq: true
@@ -631,40 +661,44 @@
@@ -633,82 +671,90 @@
GNAT is a GNU Ada 83, 95, 2005 and 2012 front-end to GCC. This package includes
development tools, the documents and Ada compiler.
@@ -674,8 +658,13 @@
+Requires: scylla-libgo-devel = %{version}-%{release}
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Requires(post): %{_sbindir}/update-alternatives
@@ -675,38 +709,42 @@
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
+Requires(post): /sbin/update-alternatives
+Requires(postun): /sbin/update-alternatives
Autoreq: true
%description go
The gcc-go package provides support for compiling Go programs
with the GNU Compiler Collection.
@@ -728,7 +717,7 @@
Requires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1, libmpc-devel >= 0.8.1
%description plugin-devel
@@ -726,7 +764,8 @@
@@ -728,7 +774,8 @@
Summary: Debug information for package %{name}
Group: Development/Debug
AutoReqProv: 0
@@ -738,21 +727,21 @@
%description debuginfo
This package provides debug information for package %{name}.
@@ -961,11 +1000,10 @@
@@ -958,11 +1005,11 @@
--enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu \
--enable-plugin --enable-initfini-array \
--disable-libgcj \
-%if 0%{fedora} >= 21 && 0%{fedora} <= 22
--with-default-libstdcxx-abi=c++98 \
--with-default-libstdcxx-abi=gcc4-compatible \
-%endif
%if %{build_isl}
- --with-isl \
--with-isl \
+ --with-isl-include=/opt/scylladb/include/ \
+ --with-isl-lib=/opt/scylladb/lib64/ \
%else
--without-isl \
%endif
@@ -974,11 +1012,9 @@
@@ -971,11 +1018,9 @@
%else
--disable-libmpx \
%endif
@@ -764,7 +753,7 @@
%ifarch %{arm}
--disable-sjlj-exceptions \
%endif
@@ -1009,9 +1045,6 @@
@@ -1006,9 +1051,6 @@
%if 0%{?rhel} >= 7
--with-cpu-32=power8 --with-tune-32=power8 --with-cpu-64=power8 --with-tune-64=power8 \
%endif
@@ -774,7 +763,7 @@
%endif
%ifarch ppc
--build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
@@ -1273,16 +1306,15 @@
@@ -1270,16 +1312,15 @@
mv %{buildroot}%{_prefix}/%{_lib}/libmpx.spec $FULLPATH/
%endif
@@ -797,7 +786,7 @@
%endif
%ifarch ppc
rm -f $FULLPATH/libgcc_s.so
@@ -1816,7 +1848,7 @@
@@ -1819,7 +1860,7 @@
chmod 755 %{buildroot}%{_prefix}/bin/c?9
cd ..
@@ -806,7 +795,7 @@
%find_lang cpplib
# Remove binaries we will not be including, so that they don't end up in
@@ -1866,11 +1898,7 @@
@@ -1869,11 +1910,7 @@
# run the tests.
make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ \
@@ -818,7 +807,7 @@
echo ====================TESTING=========================
( LC_ALL=C ../contrib/test_summary || : ) 2>&1 | sed -n '/^cat.*EOF/,/^EOF/{/^cat.*EOF/d;/^EOF/d;/^LAST_UPDATED:/d;p;}'
echo ====================TESTING END=====================
@@ -1897,13 +1925,13 @@
@@ -1900,13 +1937,13 @@
--info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
fi
@@ -834,7 +823,21 @@
if [ $1 = 0 -a -f %{_infodir}/cpp.info.gz ]; then
/sbin/install-info --delete \
--info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
@@ -1954,7 +1982,7 @@
@@ -1945,19 +1982,19 @@
fi
%post go
-%{_sbindir}/update-alternatives --install \
+/sbin/update-alternatives --install \
%{_prefix}/bin/go go %{_prefix}/bin/go.gcc 92 \
--slave %{_prefix}/bin/gofmt gofmt %{_prefix}/bin/gofmt.gcc
%preun go
if [ $1 = 0 ]; then
- %{_sbindir}/update-alternatives --remove go %{_prefix}/bin/go.gcc
+ /sbin/update-alternatives --remove go %{_prefix}/bin/go.gcc
fi
# Because glibc Prereq's libgcc and /sbin/ldconfig
# comes from glibc, it might not exist yet when
# libgcc is installed
@@ -843,7 +846,7 @@
if posix.access ("/sbin/ldconfig", "x") then
local pid = posix.fork ()
if pid == 0 then
@@ -1964,7 +1992,7 @@
@@ -1967,7 +2004,7 @@
end
end
@@ -852,7 +855,7 @@
if posix.access ("/sbin/ldconfig", "x") then
local pid = posix.fork ()
if pid == 0 then
@@ -1974,120 +2002,120 @@
@@ -1977,120 +2014,120 @@
end
end
@@ -1011,7 +1014,7 @@
%defattr(-,root,root,-)
%{_prefix}/bin/cc
%{_prefix}/bin/c89
@@ -2409,7 +2437,7 @@
@@ -2414,7 +2451,7 @@
%{!?_licensedir:%global license %%doc}
%license gcc/COPYING* COPYING.RUNTIME
@@ -1020,7 +1023,7 @@
%defattr(-,root,root,-)
%{_prefix}/lib/cpp
%{_prefix}/bin/cpp
@@ -2420,10 +2448,10 @@
@@ -2425,10 +2462,10 @@
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/cc1
@@ -1034,7 +1037,7 @@
%{!?_licensedir:%global license %%doc}
%license gcc/COPYING* COPYING.RUNTIME
@@ -2461,7 +2489,7 @@
@@ -2469,7 +2506,7 @@
%endif
%doc rpm.doc/changelogs/gcc/cp/ChangeLog*
@@ -1043,7 +1046,7 @@
%defattr(-,root,root,-)
%{_prefix}/%{_lib}/libstdc++.so.6*
%dir %{_datadir}/gdb
@@ -2473,7 +2501,7 @@
@@ -2481,7 +2518,7 @@
%dir %{_prefix}/share/gcc-%{gcc_version}/python
%{_prefix}/share/gcc-%{gcc_version}/python/libstdcxx
@@ -1052,7 +1055,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/include/c++
%dir %{_prefix}/include/c++/%{gcc_version}
@@ -2488,7 +2516,7 @@
@@ -2507,7 +2544,7 @@
%endif
%doc rpm.doc/changelogs/libstdc++-v3/ChangeLog* libstdc++-v3/README*
@@ -1061,7 +1064,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2509,7 +2537,7 @@
@@ -2528,7 +2565,7 @@
%endif
%if %{build_libstdcxx_docs}
@@ -1070,7 +1073,7 @@
%defattr(-,root,root)
%{_mandir}/man3/*
%doc rpm.doc/libstdc++-v3/html
@@ -2548,7 +2576,7 @@
@@ -2567,7 +2604,7 @@
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/cc1objplus
@@ -1079,7 +1082,7 @@
%defattr(-,root,root,-)
%{_prefix}/%{_lib}/libobjc.so.4*
@@ -2602,11 +2630,11 @@
@@ -2621,11 +2658,11 @@
%endif
%doc rpm.doc/gfortran/*
@@ -1093,7 +1096,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2652,12 +2680,12 @@
@@ -2671,12 +2708,12 @@
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/gnat1
%doc rpm.doc/changelogs/gcc/ada/ChangeLog*
@@ -1108,7 +1111,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2683,7 +2711,7 @@
@@ -2702,7 +2739,7 @@
%exclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib/libgnarl.a
%endif
@@ -1117,7 +1120,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2707,7 +2735,7 @@
@@ -2726,7 +2763,7 @@
%endif
%endif
@@ -1126,7 +1129,7 @@
%defattr(-,root,root,-)
%{_prefix}/%{_lib}/libgomp.so.1*
%{_prefix}/%{_lib}/libgomp-plugin-host_nonshm.so.1*
@@ -2715,14 +2743,14 @@
@@ -2734,14 +2771,14 @@
%doc rpm.doc/changelogs/libgomp/ChangeLog*
%if %{build_libquadmath}
@@ -1143,7 +1146,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2735,7 +2763,7 @@
@@ -2754,7 +2791,7 @@
%endif
%doc rpm.doc/libquadmath/ChangeLog*
@@ -1152,7 +1155,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2754,12 +2782,12 @@
@@ -2773,12 +2810,12 @@
%endif
%if %{build_libitm}
@@ -1167,7 +1170,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2772,7 +2800,7 @@
@@ -2791,7 +2828,7 @@
%endif
%doc rpm.doc/libitm/ChangeLog*
@@ -1176,7 +1179,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2791,11 +2819,11 @@
@@ -2810,11 +2847,11 @@
%endif
%if %{build_libatomic}
@@ -1190,7 +1193,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2815,11 +2843,11 @@
@@ -2834,11 +2871,11 @@
%endif
%if %{build_libasan}
@@ -1204,7 +1207,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2841,11 +2869,11 @@
@@ -2860,11 +2897,11 @@
%endif
%if %{build_libubsan}
@@ -1218,7 +1221,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2867,11 +2895,11 @@
@@ -2886,11 +2923,11 @@
%endif
%if %{build_libtsan}
@@ -1232,7 +1235,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2883,11 +2911,11 @@
@@ -2902,11 +2939,11 @@
%endif
%if %{build_liblsan}
@@ -1246,7 +1249,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2899,11 +2927,11 @@
@@ -2918,11 +2955,11 @@
%endif
%if %{build_libcilkrts}
@@ -1260,7 +1263,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2923,12 +2951,12 @@
@@ -2942,12 +2979,12 @@
%endif
%if %{build_libmpx}
@@ -1275,7 +1278,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -2990,12 +3018,12 @@
@@ -3009,12 +3046,12 @@
%endif
%doc rpm.doc/go/*
@@ -1290,7 +1293,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -3023,7 +3051,7 @@
@@ -3042,7 +3079,7 @@
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgo.so
%endif
@@ -1299,7 +1302,7 @@
%defattr(-,root,root,-)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -3041,12 +3069,12 @@
@@ -3060,12 +3097,12 @@
%endif
%endif

18
dist/redhat/centos_dep/gdb.diff vendored
View File

@@ -1,6 +1,6 @@
--- gdb.spec.orig 2015-09-18 15:03:10.000000000 -0400
+++ gdb.spec 2016-01-20 06:53:53.696000000 -0500
@@ -15,7 +15,10 @@
--- gdb.spec.orig 2015-12-06 04:10:30.000000000 +0000
+++ gdb.spec 2016-01-20 14:49:12.745843903 +0000
@@ -16,7 +16,10 @@
}
Summary: A GNU source-level debugger for C, C++, Fortran, Go and other languages
@@ -12,18 +12,18 @@
# Freeze it when GDB gets branched
%global snapsrc 20150706
@@ -562,12 +565,8 @@
BuildRequires: rpm-devel%{?_isa}
BuildRequires: zlib-devel%{?_isa} libselinux-devel%{?_isa}
@@ -572,12 +575,8 @@
BuildRequires: rpm-devel%{buildisa}
BuildRequires: zlib-devel%{buildisa} libselinux-devel%{buildisa}
%if 0%{!?_without_python:1}
-%if 0%{?rhel:1} && 0%{?rhel} <= 7
-BuildRequires: python-devel%{?_isa}
-BuildRequires: python-devel%{buildisa}
-%else
-%global __python %{__python3}
-BuildRequires: python3-devel%{?_isa}
-BuildRequires: python3-devel%{buildisa}
-%endif
+BuildRequires: python34-devel%{?_isa}
+%global __python /usr/bin/python3.4
%if 0%{?rhel:1} && 0%{?rhel} <= 6
%if 0%{?rhel:1} && 0%{?rhel} <= 7
# Temporarily before python files get moved to libstdc++.rpm
# libstdc++%{bits_other} is not present in Koji, the .spec script generating

4
dist/redhat/centos_dep/isl.diff vendored
View File

@@ -1,5 +1,5 @@
--- isl.spec 2015-01-06 16:24:49.000000000 +0000
+++ isl.spec.1 2015-10-18 12:12:38.000000000 +0000
--- isl.spec.orig 2016-01-20 14:41:16.891802146 +0000
+++ isl.spec 2016-01-20 14:43:13.838336396 +0000
@@ -1,5 +1,5 @@
Summary: Integer point manipulation library
-Name: isl

90
dist/redhat/centos_dep/ninja-build.diff vendored
View File

@@ -1,34 +1,56 @@
1c1
< Name: ninja-build
---
> Name: scylla-ninja-build
8d7
< Source1: ninja.vim
10a10
> Requires: scylla-env
14,16c14,15
< BuildRequires: re2c >= 0.11.3
< Requires: emacs-filesystem
< Requires: vim-filesystem
---
> #BuildRequires: scylla-re2c >= 0.11.3
> %define _prefix /opt/scylladb
35,37c34
< # TODO: Install ninja_syntax.py?
< mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/bash-completion/completions,%{_datadir}/emacs/site-lisp,%{_datadir}/vim/vimfiles/syntax,%{_datadir}/vim/vimfiles/ftdetect,%{_datadir}/zsh/site-functions}
<
---
> mkdir -p %{buildroot}/opt/scylladb/bin
39,43d35
< install -pm644 misc/bash-completion %{buildroot}%{_datadir}/bash-completion/completions/ninja-bash-completion
< install -pm644 misc/ninja-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/ninja-mode.el
< install -pm644 misc/ninja.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/ninja.vim
< install -pm644 %{SOURCE1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ninja.vim
< install -pm644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
53,58d44
< %{_datadir}/bash-completion/completions/ninja-bash-completion
< %{_datadir}/emacs/site-lisp/ninja-mode.el
< %{_datadir}/vim/vimfiles/syntax/ninja.vim
< %{_datadir}/vim/vimfiles/ftdetect/ninja.vim
< # zsh does not have a -filesystem package
< %{_datadir}/zsh/
--- ninja-build.spec.orig 2016-01-20 14:41:16.892802134 +0000
+++ ninja-build.spec 2016-01-20 14:44:42.453227192 +0000
@@ -1,19 +1,18 @@
-Name: ninja-build
+Name: scylla-ninja-build
Version: 1.6.0
Release: 2%{?dist}
Summary: A small build system with a focus on speed
License: ASL 2.0
URL: http://martine.github.com/ninja/
Source0: https://github.com/martine/ninja/archive/v%{version}.tar.gz#/ninja-%{version}.tar.gz
-Source1: ninja.vim
# Rename mentions of the executable name to be ninja-build.
Patch1000: ninja-1.6.0-binary-rename.patch
+Requires: scylla-env
BuildRequires: asciidoc
BuildRequires: gtest-devel
BuildRequires: python2-devel
-BuildRequires: re2c >= 0.11.3
-Requires: emacs-filesystem
-Requires: vim-filesystem
+#BuildRequires: scylla-re2c >= 0.11.3
+%define _prefix /opt/scylladb
%description
Ninja is a small build system with a focus on speed. It differs from other
@@ -32,15 +31,8 @@
./ninja -v ninja_test
%install
-# TODO: Install ninja_syntax.py?
-mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/bash-completion/completions,%{_datadir}/emacs/site-lisp,%{_datadir}/vim/vimfiles/syntax,%{_datadir}/vim/vimfiles/ftdetect,%{_datadir}/zsh/site-functions}
-
+mkdir -p %{buildroot}/opt/scylladb/bin
install -pm755 ninja %{buildroot}%{_bindir}/ninja-build
-install -pm644 misc/bash-completion %{buildroot}%{_datadir}/bash-completion/completions/ninja-bash-completion
-install -pm644 misc/ninja-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/ninja-mode.el
-install -pm644 misc/ninja.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/ninja.vim
-install -pm644 %{SOURCE1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ninja.vim
-install -pm644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
%check
# workaround possible too low default limits
@@ -50,12 +42,6 @@
%files
%doc COPYING HACKING.md README doc/manual.html
%{_bindir}/ninja-build
-%{_datadir}/bash-completion/completions/ninja-bash-completion
-%{_datadir}/emacs/site-lisp/ninja-mode.el
-%{_datadir}/vim/vimfiles/syntax/ninja.vim
-%{_datadir}/vim/vimfiles/ftdetect/ninja.vim
-# zsh does not have a -filesystem package
-%{_datadir}/zsh/
%changelog
* Mon Nov 16 2015 Ben Boeckel <mathstuf@gmail.com> - 1.6.0-2

6
dist/redhat/centos_dep/ragel.diff vendored
View File

@@ -1,11 +1,11 @@
--- ragel.spec 2014-08-18 11:55:49.000000000 +0000
+++ ragel.spec.1 2015-10-18 12:18:23.000000000 +0000
--- ragel.spec.orig 2015-06-18 22:12:28.000000000 +0000
+++ ragel.spec 2016-01-20 14:49:53.980327766 +0000
@@ -1,17 +1,20 @@
-Name: ragel
+Name: scylla-ragel
+%define orig_name ragel
Version: 6.8
Release: 3%{?dist}
Release: 5%{?dist}
Summary: Finite state machine compiler
Group: Development/Tools