From 5a563e8c46366181bf5957dff8bad0400a85099a Mon Sep 17 00:00:00 2001 From: by-screwdriver Date: Mon, 9 Oct 2017 07:39:36 +0000 Subject: Automatic commit of package [vespa] release [6.154.156-1]. Created by command: /usr/bin/tito tag --use-version=6.154.156 --no-auto-changelog --- .tito/packages/.readme | 3 + .tito/packages/vespa | 1 + .tito/tito.props | 6 ++ dist/.tito/packages/.readme | 3 - dist/.tito/tito.props | 6 -- dist/vespa.spec | 175 -------------------------------------------- vespa.spec | 175 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 185 insertions(+), 184 deletions(-) create mode 100644 .tito/packages/.readme create mode 100644 .tito/packages/vespa create mode 100644 .tito/tito.props delete mode 100644 dist/.tito/packages/.readme delete mode 100644 dist/.tito/tito.props delete mode 100644 dist/vespa.spec create mode 100644 vespa.spec diff --git a/.tito/packages/.readme b/.tito/packages/.readme new file mode 100644 index 00000000000..ae0c7fe13cc --- /dev/null +++ b/.tito/packages/.readme @@ -0,0 +1,3 @@ +the .tito/packages directory contains metadata files +named after their packages. Each file has the latest tagged +version and the project's relative directory. \ No newline at end of file diff --git a/.tito/packages/vespa b/.tito/packages/vespa new file mode 100644 index 00000000000..232038cb48b --- /dev/null +++ b/.tito/packages/vespa @@ -0,0 +1 @@ +6.154.156-1 ./ diff --git a/.tito/tito.props b/.tito/tito.props new file mode 100644 index 00000000000..db2c33744dc --- /dev/null +++ b/.tito/tito.props @@ -0,0 +1,6 @@ +[buildconfig] +builder = tito.builder.Builder +tagger = tito.tagger.VersionTagger +tag_format = {component}-{version} +changelog_do_not_remove_cherrypick = 0 +changelog_format = %s (%ae) \ No newline at end of file diff --git a/dist/.tito/packages/.readme b/dist/.tito/packages/.readme deleted file mode 100644 index ae0c7fe13cc..00000000000 --- a/dist/.tito/packages/.readme +++ /dev/null @@ -1,3 +0,0 @@ -the .tito/packages directory contains metadata files -named after their packages. Each file has the latest tagged -version and the project's relative directory. \ No newline at end of file diff --git a/dist/.tito/tito.props b/dist/.tito/tito.props deleted file mode 100644 index db2c33744dc..00000000000 --- a/dist/.tito/tito.props +++ /dev/null @@ -1,6 +0,0 @@ -[buildconfig] -builder = tito.builder.Builder -tagger = tito.tagger.VersionTagger -tag_format = {component}-{version} -changelog_do_not_remove_cherrypick = 0 -changelog_format = %s (%ae) \ No newline at end of file diff --git a/dist/vespa.spec b/dist/vespa.spec deleted file mode 100644 index bf6e49fdf85..00000000000 --- a/dist/vespa.spec +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# Hack to speed up jar packing for now -%define __jar_repack %{nil} - -# Force special prefix for Vespa -%define _prefix /opt/vespa - -Name: vespa -Version: VESPA_VERSION -Release: 1%{?dist} -Summary: Vespa - The open big data serving engine -Group: Applications/Databases -License: Commercial -URL: http://vespa.ai -Source0: vespa-%{version}.tar.gz - -%if 0%{?centos} -BuildRequires: epel-release -BuildRequires: centos-release-scl -BuildRequires: devtoolset-6-gcc-c++ -BuildRequires: devtoolset-6-libatomic-devel -BuildRequires: devtoolset-6-binutils -BuildRequires: rh-maven33 -%define _devtoolset_enable /opt/rh/devtoolset-6/enable -%define _rhmaven33_enable /opt/rh/rh-maven33/enable -%endif -%if 0%{?fedora} -BuildRequires: gcc-c++ -BuildRequires: libatomic -%endif -BuildRequires: Judy-devel -%if 0%{?centos} -BuildRequires: cmake3 -BuildRequires: llvm3.9-devel -BuildRequires: vespa-boost-devel >= 1.59.0-6 -BuildRequires: vespa-zookeeper-c-client-devel >= 3.4.9-6 -%endif -%if 0%{?fedora} -BuildRequires: cmake >= 3.9.1 -BuildRequires: maven -%if 0%{?fc25} -BuildRequires: llvm-devel >= 3.9.1 -BuildRequires: boost-devel >= 1.60 -%endif -%if 0%{?fc26} -BuildRequires: llvm-devel >= 4.0 -BuildRequires: boost-devel >= 1.63 -%endif -BuildRequires: zookeeper-devel >= 3.4.9 -%endif -BuildRequires: lz4-devel -BuildRequires: libzstd-devel -BuildRequires: zlib-devel -BuildRequires: libicu-devel -BuildRequires: java-1.8.0-openjdk-devel -BuildRequires: openssl-devel -BuildRequires: rpm-build -BuildRequires: make -BuildRequires: vespa-cppunit-devel >= 1.12.1-6 -BuildRequires: vespa-libtorrent-devel >= 1.0.11-6 -BuildRequires: systemd -%if 0%{?centos} -Requires: epel-release -%endif -Requires: which -Requires: initscripts -Requires: valgrind -Requires: Judy -Requires: lz4 -Requires: libzstd -Requires: zlib -Requires: libicu -%if 0%{?centos} -Requires: llvm3.9 -Requires: vespa-boost >= 1.59.0-6 -Requires: vespa-zookeeper-c-client >= 3.4.9-6 -%define _extra_link_directory /usr/lib64/llvm3.9/lib;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib -%define _extra_include_directory /usr/include/llvm3.9;/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include -%endif -%if 0%{?fedora} -%if 0%{?fc25} -Requires: llvm >= 3.9.1 -Requires: boost >= 1.60 -%endif -%if 0%{?fc26} -Requires: llvm >= 4.0 -Requires: boost >= 1.63 -%define _vespa_llvm_version 4.0 -%endif -Requires: zookeeper >= 3.4.9 -%define _extra_link_directory /opt/vespa-libtorrent/lib;/opt/vespa-cppunit/lib -%define _extra_include_directory /opt/vespa-libtorrent/include;/opt/vespa-cppunit/include -%define _vespa_boost_lib_suffix %{nil} -%endif -Requires: java-1.8.0-openjdk -Requires: openssl -Requires: vespa-cppunit >= 1.12.1-6 -Requires: vespa-libtorrent >= 1.0.11-6 -Requires(pre): shadow-utils - -# Ugly workaround because vespamalloc/src/vespamalloc/malloc/mmap.cpp uses the private -# _dl_sym function. -Provides: libc.so.6(GLIBC_PRIVATE)(64bit) - -%description - -Vespa - The open big data serving engine - -%prep -%setup -q - -%build -%if 0%{?_devtoolset_enable:1} -source %{_devtoolset_enable} || true -%endif -%if 0%{?_rhmaven33_enable:1} -source %{_rhmaven33_enable} || true -%endif -sh bootstrap.sh java -mvn -nsu -T 2C install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="%{_extra_link_directory}" \ - -DEXTRA_INCLUDE_DIRECTORY="%{_extra_include_directory}" \ - -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64%{?_extra_link_directory:;%{_extra_link_directory}};/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \ - %{?_vespa_llvm_version:-DVESPA_LLVM_VERSION="%{_vespa_llvm_version}"} \ - %{?_vespa_boost_lib_suffix:-DVESPA_BOOST_LIB_SUFFIX="%{_vespa_boost_lib_suffix}"} \ - . - -make %{_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=%{buildroot} - -mkdir -p %{buildroot}/usr/lib/systemd/system -cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa.service %{buildroot}/usr/lib/systemd/system -cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa-configserver.service %{buildroot}/usr/lib/systemd/system - -%clean -rm -rf $RPM_BUILD_ROOT - -%pre -getent group vespa >/dev/null || groupadd -r vespa -getent passwd vespa >/dev/null || \ - useradd -r -g vespa -d %{_prefix} -s /sbin/nologin \ - -c "Create owner of all Vespa data files" vespa -echo "pathmunge %{_prefix}/bin" > /etc/profile.d/vespa.sh -echo "export VESPA_HOME=%{_prefix}" >> /etc/profile.d/vespa.sh -chmod +x /etc/profile.d/vespa.sh -exit 0 - -%post -%systemd_post vespa-configserver.service -%systemd_post vespa.service - -%preun -%systemd_preun vespa.service -%systemd_preun vespa-configserver.service - -%postun -%systemd_postun_with_restart vespa.service -%systemd_postun_with_restart vespa-configserver.service -rm -f /etc/profile.d/vespa.sh -userdel vespa - -%files -%defattr(-,vespa,vespa,-) -%doc -%{_prefix}/* -%attr(644,root,root) /usr/lib/systemd/system/vespa.service -%attr(644,root,root) /usr/lib/systemd/system/vespa-configserver.service - -%changelog diff --git a/vespa.spec b/vespa.spec new file mode 100644 index 00000000000..d3655ff9b30 --- /dev/null +++ b/vespa.spec @@ -0,0 +1,175 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +# Hack to speed up jar packing for now +%define __jar_repack %{nil} + +# Force special prefix for Vespa +%define _prefix /opt/vespa + +Name: vespa +Version: 6.154.156 +Release: 1%{?dist} +Summary: Vespa - The open big data serving engine +Group: Applications/Databases +License: Commercial +URL: http://vespa.ai +Source0: vespa-%{version}.tar.gz + +%if 0%{?centos} +BuildRequires: epel-release +BuildRequires: centos-release-scl +BuildRequires: devtoolset-6-gcc-c++ +BuildRequires: devtoolset-6-libatomic-devel +BuildRequires: devtoolset-6-binutils +BuildRequires: rh-maven33 +%define _devtoolset_enable /opt/rh/devtoolset-6/enable +%define _rhmaven33_enable /opt/rh/rh-maven33/enable +%endif +%if 0%{?fedora} +BuildRequires: gcc-c++ +BuildRequires: libatomic +%endif +BuildRequires: Judy-devel +%if 0%{?centos} +BuildRequires: cmake3 +BuildRequires: llvm3.9-devel +BuildRequires: vespa-boost-devel >= 1.59.0-6 +BuildRequires: vespa-zookeeper-c-client-devel >= 3.4.9-6 +%endif +%if 0%{?fedora} +BuildRequires: cmake >= 3.9.1 +BuildRequires: maven +%if 0%{?fc25} +BuildRequires: llvm-devel >= 3.9.1 +BuildRequires: boost-devel >= 1.60 +%endif +%if 0%{?fc26} +BuildRequires: llvm-devel >= 4.0 +BuildRequires: boost-devel >= 1.63 +%endif +BuildRequires: zookeeper-devel >= 3.4.9 +%endif +BuildRequires: lz4-devel +BuildRequires: libzstd-devel +BuildRequires: zlib-devel +BuildRequires: libicu-devel +BuildRequires: java-1.8.0-openjdk-devel +BuildRequires: openssl-devel +BuildRequires: rpm-build +BuildRequires: make +BuildRequires: vespa-cppunit-devel >= 1.12.1-6 +BuildRequires: vespa-libtorrent-devel >= 1.0.11-6 +BuildRequires: systemd +%if 0%{?centos} +Requires: epel-release +%endif +Requires: which +Requires: initscripts +Requires: valgrind +Requires: Judy +Requires: lz4 +Requires: libzstd +Requires: zlib +Requires: libicu +%if 0%{?centos} +Requires: llvm3.9 +Requires: vespa-boost >= 1.59.0-6 +Requires: vespa-zookeeper-c-client >= 3.4.9-6 +%define _extra_link_directory /usr/lib64/llvm3.9/lib;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib +%define _extra_include_directory /usr/include/llvm3.9;/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include +%endif +%if 0%{?fedora} +%if 0%{?fc25} +Requires: llvm >= 3.9.1 +Requires: boost >= 1.60 +%endif +%if 0%{?fc26} +Requires: llvm >= 4.0 +Requires: boost >= 1.63 +%define _vespa_llvm_version 4.0 +%endif +Requires: zookeeper >= 3.4.9 +%define _extra_link_directory /opt/vespa-libtorrent/lib;/opt/vespa-cppunit/lib +%define _extra_include_directory /opt/vespa-libtorrent/include;/opt/vespa-cppunit/include +%define _vespa_boost_lib_suffix %{nil} +%endif +Requires: java-1.8.0-openjdk +Requires: openssl +Requires: vespa-cppunit >= 1.12.1-6 +Requires: vespa-libtorrent >= 1.0.11-6 +Requires(pre): shadow-utils + +# Ugly workaround because vespamalloc/src/vespamalloc/malloc/mmap.cpp uses the private +# _dl_sym function. +Provides: libc.so.6(GLIBC_PRIVATE)(64bit) + +%description + +Vespa - The open big data serving engine + +%prep +%setup -q + +%build +%if 0%{?_devtoolset_enable:1} +source %{_devtoolset_enable} || true +%endif +%if 0%{?_rhmaven33_enable:1} +source %{_rhmaven33_enable} || true +%endif +sh bootstrap.sh java +mvn -nsu -T 2C install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true +cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ + -DEXTRA_LINK_DIRECTORY="%{_extra_link_directory}" \ + -DEXTRA_INCLUDE_DIRECTORY="%{_extra_include_directory}" \ + -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64%{?_extra_link_directory:;%{_extra_link_directory}};/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \ + %{?_vespa_llvm_version:-DVESPA_LLVM_VERSION="%{_vespa_llvm_version}"} \ + %{?_vespa_boost_lib_suffix:-DVESPA_BOOST_LIB_SUFFIX="%{_vespa_boost_lib_suffix}"} \ + . + +make %{_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} + +mkdir -p %{buildroot}/usr/lib/systemd/system +cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa.service %{buildroot}/usr/lib/systemd/system +cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa-configserver.service %{buildroot}/usr/lib/systemd/system + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +getent group vespa >/dev/null || groupadd -r vespa +getent passwd vespa >/dev/null || \ + useradd -r -g vespa -d %{_prefix} -s /sbin/nologin \ + -c "Create owner of all Vespa data files" vespa +echo "pathmunge %{_prefix}/bin" > /etc/profile.d/vespa.sh +echo "export VESPA_HOME=%{_prefix}" >> /etc/profile.d/vespa.sh +chmod +x /etc/profile.d/vespa.sh +exit 0 + +%post +%systemd_post vespa-configserver.service +%systemd_post vespa.service + +%preun +%systemd_preun vespa.service +%systemd_preun vespa-configserver.service + +%postun +%systemd_postun_with_restart vespa.service +%systemd_postun_with_restart vespa-configserver.service +rm -f /etc/profile.d/vespa.sh +userdel vespa + +%files +%defattr(-,vespa,vespa,-) +%doc +%{_prefix}/* +%attr(644,root,root) /usr/lib/systemd/system/vespa.service +%attr(644,root,root) /usr/lib/systemd/system/vespa-configserver.service + +%changelog -- cgit v1.2.3