From ca8931b42c5e232727f3dcf7c97ff8b96dabcf8f Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" <alexander.klimov@icinga.com> Date: Tue, 23 Nov 2021 12:26:31 +0100 Subject: [PATCH] Release 2.13.2-1, only for Fedora 35 --- .gitlab-ci.yml | 164 ------------------------------------------------- icinga2.spec | 1 + 2 files changed, 1 insertion(+), 164 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c31162c..e217e00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,43 +47,6 @@ variables: - master - tags -################################### -# EPEL -################################### -build/centos/8: - <<: *build - variables: - DOCKER_IMAGE: centos/8 - -test/centos/8: - <<: *test - variables: - DOCKER_IMAGE: centos/8 - dependencies: - - build/centos/8 - -upload/epel/8: - <<: *upload - dependencies: - - build/centos/8 - -build/centos/7: - <<: *build - variables: - DOCKER_IMAGE: centos/7 - -test/centos/7: - <<: *test - variables: - DOCKER_IMAGE: centos/7 - dependencies: - - build/centos/7 - -upload/epel/7: - <<: *upload - dependencies: - - build/centos/7 - ################################### # Fedora ################################### @@ -104,130 +67,3 @@ upload/fedora/35: <<: *upload dependencies: - build/fedora/35 - -build/fedora/34: - <<: *build - variables: - DOCKER_IMAGE: fedora/34 - RPM_BUILD_NCPUS: '1' - -test/fedora/34: - <<: *test - variables: - DOCKER_IMAGE: fedora/34 - dependencies: - - build/fedora/34 - -upload/fedora/34: - <<: *upload - dependencies: - - build/fedora/34 - -build/fedora/33: - <<: *build - variables: - DOCKER_IMAGE: fedora/33 - RPM_BUILD_NCPUS: '1' - -test/fedora/33: - <<: *test - variables: - DOCKER_IMAGE: fedora/33 - dependencies: - - build/fedora/33 - -upload/fedora/33: - <<: *upload - dependencies: - - build/fedora/33 - -################################### -# SLES -################################### -build/sles/15.3: - <<: *build - variables: - DOCKER_IMAGE: sles/15.3 - -test/sles/15.3: - <<: *test - variables: - DOCKER_IMAGE: sles/15.3 - dependencies: - - build/sles/15.3 - -upload/SUSE/15.3: - <<: *upload - dependencies: - - build/sles/15.3 - -build/sles/15.2: - <<: *build - variables: - DOCKER_IMAGE: sles/15.2 - -test/sles/15.2: - <<: *test - variables: - DOCKER_IMAGE: sles/15.2 - dependencies: - - build/sles/15.2 - -upload/SUSE/15.2: - <<: *upload - dependencies: - - build/sles/15.2 - -build/sles/12.5: - <<: *build - variables: - DOCKER_IMAGE: sles/12.5 - -test/sles/12.5: - <<: *test - variables: - DOCKER_IMAGE: sles/12.5 - dependencies: - - build/sles/12.5 - -upload/SUSE/12.5: - <<: *upload - dependencies: - - build/sles/12.5 - -################################### -# openSUSE -################################### -build/opensuse/15.3: - <<: *build - variables: - DOCKER_IMAGE: opensuse/15.3 - -test/opensuse/15.3: - <<: *test - variables: - DOCKER_IMAGE: opensuse/15.3 - dependencies: - - build/opensuse/15.3 - -upload/openSUSE/15.3: - <<: *upload - dependencies: - - build/opensuse/15.3 - -build/opensuse/15.2: - <<: *build - variables: - DOCKER_IMAGE: opensuse/15.2 - -test/opensuse/15.2: - <<: *test - variables: - DOCKER_IMAGE: opensuse/15.2 - dependencies: - - build/opensuse/15.2 - -upload/openSUSE/15.2: - <<: *upload - dependencies: - - build/opensuse/15.2 diff --git a/icinga2.spec b/icinga2.spec index 8923025..1995a27 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -352,6 +352,7 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DBoost_NO_BOOST_CMAKE=ON \ + -DICINGA2_GIT_VERSION_INFO=OFF \ -DICINGA2_PLUGINDIR=%{plugindir} \ -DICINGA2_RUNDIR=%{_rundir} \ -DICINGA2_SYSCONFIGFILE=/etc/sysconfig/icinga2 \ -- GitLab