diff --git a/ucommon.spec b/ucommon.spec index 60caa45..b530e8d 100644 --- a/ucommon.spec +++ b/ucommon.spec @@ -10,19 +10,18 @@ Name: ucommon Version: 7.0.0 -Release: 29%{?dist} +Release: 24%{?dist} Summary: Portable C++ framework for threads and sockets License: LGPL-3.0-or-later URL: http://www.gnu.org/software/commoncpp Source0: https://ftpmirror.gnu.org/commoncpp/ucommon-%{version}.tar.gz -# Raise minimum cmake version to 3.5 -Patch0: ucommon_cmakever.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: graphviz-gd +BuildRequires: make BuildRequires: gnutls-devel @@ -67,12 +66,12 @@ HTML format. %prep -%autosetup -p1 +%setup -q %build -export CXXFLAGS="-std=c++14 %{optflags}" -%cmake -DBUILD_DOCS=ON +export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" +%cmake %cmake_build %cmake_build --target doc @@ -80,6 +79,8 @@ export CXXFLAGS="-std=c++14 %{optflags}" %install %cmake_install +%ldconfig_scriptlets + %files %doc AUTHORS README NEWS SUPPORT ChangeLog @@ -124,21 +125,6 @@ export CXXFLAGS="-std=c++14 %{optflags}" %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 7.0.0-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Fri Jun 12 2026 Yaakov Selkowitz - 7.0.0-28 -- Rebuilt for openssl 4.0 - -* Tue Jan 20 2026 Fedora Release Engineering - 7.0.0-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 7.0.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jul 17 2025 Sandro Mani - 7.0.0-25 -- Raise minimum cmake version, modernize spec - * Sun Jan 19 2025 Fedora Release Engineering - 7.0.0-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/ucommon_cmakever.patch b/ucommon_cmakever.patch deleted file mode 100644 index 2413631..0000000 --- a/ucommon_cmakever.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN ucommon-7.0.0/CMakeLists.txt ucommon-7.0.0-new/CMakeLists.txt ---- ucommon-7.0.0/CMakeLists.txt 2015-12-13 12:28:25.000000000 +0100 -+++ ucommon-7.0.0-new/CMakeLists.txt 2025-07-17 20:53:21.196126866 +0200 -@@ -17,7 +17,7 @@ - # meant for generating project files for those working with IDE's to do - # otherwise generic builds of the library and supporting applications. - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - PROJECT(ucommon) - set (VERSION 7.0.0) -