diff --git a/.gitignore b/.gitignore index b5bd712..349da28 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ ucommon-3.3.4.tar.gz /ucommon-6.6.1.tar.gz /v6.6.2.tar.gz /v7.0.0.tar.gz +/ucommon-7.0.0.tar.gz diff --git a/sources b/sources index 07707ae..7bdb057 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8352f1a6d1688d89bf942f54838c86c6 v7.0.0.tar.gz +SHA512 (ucommon-7.0.0.tar.gz) = d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b diff --git a/ucommon.spec b/ucommon.spec index 7149946..60caa45 100644 --- a/ucommon.spec +++ b/ucommon.spec @@ -10,17 +10,20 @@ Name: ucommon Version: 7.0.0 -Release: 7%{?dist} +Release: 29%{?dist} Summary: Portable C++ framework for threads and sockets -License: LGPLv3+ +License: LGPL-3.0-or-later URL: http://www.gnu.org/software/commoncpp -Source0: https://github.com/tychosoft/ucommon/archive/v%{version}.tar.gz +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: compat-openssl10-devel +BuildRequires: gnutls-devel %description @@ -64,21 +67,18 @@ HTML format. %prep -%setup -q +%autosetup -p1 %build -%cmake . -make %{?_smp_mflags} -make doc +export CXXFLAGS="-std=c++14 %{optflags}" +%cmake -DBUILD_DOCS=ON +%cmake_build +%cmake_build --target doc %install -%make_install INSTALL="install -p" - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%cmake_install %files @@ -120,10 +120,79 @@ make doc %{_mandir}/man1/commoncpp-config.* %files doc -%doc doc/html/* +%doc %{_vpath_builddir}/doc/html/* %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 + +* Sat Jul 20 2024 Fedora Release Engineering - 7.0.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 7.0.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 7.0.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 7.0.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 7.0.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 7.0.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 7.0.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 7.0.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Sep 22 2020 Sandro Mani - 7.0.0-16 +- Switch to gnutls + +* Wed Jul 29 2020 Fedora Release Engineering - 7.0.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Jeff Law - 7.0.0-14 +- Force C++14 as this code is not C++17 ready + +* Fri Jan 31 2020 Fedora Release Engineering - 7.0.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 7.0.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 7.0.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 7.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Feb 19 2018 Sandro Mani - 7.0.0-9 +- Add missing BR: gcc-c++, make + +* Fri Feb 09 2018 Fedora Release Engineering - 7.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 7.0.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/ucommon_cmakever.patch b/ucommon_cmakever.patch new file mode 100644 index 0000000..2413631 --- /dev/null +++ b/ucommon_cmakever.patch @@ -0,0 +1,12 @@ +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) +