diff --git a/.drone.yml b/.drone.yml index 4358c65..a2d9613 100644 --- a/.drone.yml +++ b/.drone.yml @@ -268,6 +268,7 @@ steps: pull: always environment: LANG: C.utf8 + CXX: /opt/rh/devtoolset-6/root/usr/bin/g++ CXXFLAGS: -pipe -O2 commands: - sed -i 's/keepcache=0/keepcache=1/' /etc/yum.conf @@ -276,7 +277,7 @@ steps: - yum install -qy centos-release-scl - yum install -qy devtoolset-6 - scl enable devtoolset-6 bash - - yum install -qy libcurl-devel rpm-build libxdg-basedir boost-devel boost-system boost-filesystem asciidoc + - yum install -qy libcurl-devel rpm-build libxdg-basedir boost-system boost-filesystem asciidoc - yum --enablerepo=epel install -qy cmake3 vsqlite++-devel - curl -s -o /var/cache/yum/curlpp-devel-0.7.3-5.el6.x86_64.rpm https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/curlpp-devel-0.7.3-5.el6.x86_64.rpm - curl -s -o /var/cache/yum/curlpp-0.7.3-5.el6.x86_64.rpm https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/curlpp-0.7.3-5.el6.x86_64.rpm diff --git a/packages.CMakeLists.txt b/packages.CMakeLists.txt index 502c228..22c1e90 100644 --- a/packages.CMakeLists.txt +++ b/packages.CMakeLists.txt @@ -40,7 +40,7 @@ if (WITH_RPM) set(CPACK_SOURCE_GENERATOR "RPM") set(CPACK_RPM_PACKAGE_LICENSE "GPL-3") set(CPACK_RPM_PACKAGE_URL "https://schlomp.space/tastytea/${PROJECT_NAME}") - set(CPACK_RPM_PACKAGE_REQUIRES "curlpp >= 0.8.1, libxdg-basedir, vsqlite++ >= 0.3.13") + set(CPACK_RPM_PACKAGE_REQUIRES "curlpp >= 0.7.3, libxdg-basedir, vsqlite++ >= 0.3.13") set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.${CPACK_PACKAGE_ARCHITECTURE}") set(CPACK_SOURCE_PACKAGE_FILE_NAME