Re: kholidays-16.12.3 depfreeze broken

[Andreas Sturmlechner]

Merge commit c8f9b01c480de6bc561fa96289260e2bb82d4a1e bumped cmake min version 
and PIM_VERSION.

Attached patch might fix it, unless you want to blacklist.

Regards,
Andreas


---Original Message---
On Friday, 10 March 2017 at 14:10, Andreas Sturmlechner wrote:

> master was merged twice into Applications/16.12 branch and bumped 
KF5_VERSION, 
> cmake minimum version and PIM_VERSION.
> 
> Bad (version bumping/dropping) commits:
> c714ab94bc5d3f82e6de135798f905f27f19fc64
> 065c4028f97268466b22afb59eae2cbb37994a40
> 4594308464a3ee8386c6e85e643dc7dac052e250
> 
> This will need a tarball respin.
> 
> Best regards,
> Andreas
commit f1e9e5780473e46b912ca262cd5003e4984f4f7f
Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
Date:   Fri Mar 10 13:33:10 2017 +0100

    Revert depfreeze breaking merge (KF5_VERSION, cmake, PIM_VERSION)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05164db..2ca8624 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,26 @@
-cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.4.40")
+cmake_minimum_required(VERSION 2.8.12)
 
-project(KHolidays VERSION ${PIM_VERSION})
+project(KHolidays)
 
 # ECM setup
-set(KF5_VERSION "5.31.0")
+set(KF5_VERSION "5.28.0")
 find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(ECMGeneratePriFile)
-include(CMakePackageConfigHelpers)
+include(ECMPackageConfigHelpers)
 include(ECMSetupVersion)
 include(ECMPoQmTools)
 include(FeatureSummary)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
-include(ECMCoverageOption)
 
 set(KHOLIDAYS_LIB_VERSION ${PIM_VERSION})
 
-ecm_setup_version(PROJECT VARIABLE_PREFIX KHOLIDAYS
+ecm_setup_version(${KHOLIDAYS_LIB_VERSION} PROJECT VARIABLE_PREFIX KHOLIDAYS
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h"
                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfigVersion.cmake"
                         SOVERSION 5
@@ -50,7 +48,7 @@ endif()
 ########### CMake Config Files ###########
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Holidays")
 
-configure_package_config_file(
+ecm_configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/KF5HolidaysConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfig.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}