diff --git a/.gitignore b/.gitignore index c60cfe6..fb52459 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libeconf-0.3.3.tar.xz /libeconf-0.3.4.tar.xz /libeconf-0.3.5.tar.xz +/libeconf-0.3.8.tar.gz diff --git a/0001-CMake-Install-version-file.patch b/0001-CMake-Install-version-file.patch new file mode 100644 index 0000000..04092b1 --- /dev/null +++ b/0001-CMake-Install-version-file.patch @@ -0,0 +1,34 @@ +From f467e0f7c02be955a74d6e2844de0c846f40a6f1 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Fri, 10 Jul 2020 14:02:34 -0400 +Subject: [PATCH] CMake: Install version file + +--- + lib/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index ec3baf3..3553d2d 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -57,12 +57,16 @@ configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/libeconfConfig.cmake.i + NO_SET_AND_CHECK_MACRO + NO_CHECK_REQUIRED_COMPONENTS_MACRO + ) ++install(FILES ++ ${CMAKE_BINARY_DIR}/libeconfConfig.cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libeconf ++) + write_basic_package_version_file( + ${CMAKE_BINARY_DIR}/libeconfConfigVersion.cmake + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMinorVersion + ) + install(FILES +- ${CMAKE_BINARY_DIR}/libeconfConfig.cmake ++ ${CMAKE_BINARY_DIR}/libeconfConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libeconf + ) +-- +2.26.2 + diff --git a/libeconf.spec b/libeconf.spec index 4fe82db..fe22721 100644 --- a/libeconf.spec +++ b/libeconf.spec @@ -1,17 +1,21 @@ +# Force out of source build +%undefine __cmake_in_source_build + %global somajor 0 Name: libeconf -Version: 0.3.5 +Version: 0.3.8 Release: 1%{?dist} Summary: Enhanced config file parser library License: MIT URL: https://github.com/openSUSE/libeconf -Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool +# From: https://github.com/openSUSE/libeconf/pull/127 +Patch0001: 0001-CMake-Install-version-file.patch + +BuildRequires: cmake >= 3.12 BuildRequires: gcc BuildRequires: make @@ -31,22 +35,23 @@ developing applications that use %{name}. %prep -%autosetup +%autosetup -p1 + +# Set the version correctly +sed -e "s/project(libeconf VERSION .*/project(libeconf VERSION %{version}/" -i CMakeLists.txt %build -autoreconf -fiv -%configure --disable-static -%make_build +%cmake +%cmake_build %install -%make_install -find %{buildroot} -name '*.la' -print -delete +%cmake_install %check -%make_build check +%make_build -C %{_vpath_builddir} check %files @@ -58,10 +63,14 @@ find %{buildroot} -name '*.la' -print -delete %doc example/ %{_includedir}/* %{_libdir}/%{name}.so +%{_libdir}/cmake/%{name}/ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 10 2020 Neal Gompa - 0.3.8-1 +- Update to 0.3.8 (RH#1844005) + * Thu Feb 06 2020 Neal Gompa - 0.3.5-1 - Update to 0.3.5 (RH#1797753) diff --git a/sources b/sources index e882859..25821b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libeconf-0.3.5.tar.xz) = 18bb408185721c054695fa46b488e7e2226dc25a116a019bf3178233a9928cfd2711dce182793e7bbf235d69023bffc5c29897901c90d04bd066620505069900 +SHA512 (libeconf-0.3.8.tar.gz) = 748c9fe5a87ded94b466a78d617716c6f9255b7687889732f277762f9621d2c0368ee9eac48f8f7b056f7eb4264dc4c66e9a7f043ac04f724425d88eba51ec98