The package rpms/fizz.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/fizz.git/commit/?id=bd253a748b571...
https://src.fedoraproject.org/cgit/rpms/fizz.git/commit/?id=9a75904a36cb9....
Change:
+ExcludeArch: ppc64le
-%ifarch i686 x86_64
Thanks.
Full change:
============
commit bd253a748b571941ecffb3c17c4a404bd65caa78
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Fri Mar 4 15:46:55 2022 -0800
Use clang on releases with GCC 12; fix build with cmake 3.23.0
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/fizz.spec b/fizz.spec
index c10d04e..1080e26 100644
--- a/fizz.spec
+++ b/fizz.spec
@@ -1,3 +1,10 @@
+%if 0%{?fedora} >= 36
+# Folly is compiled with Clang
+%bcond_without toolchain_clang
+%else
+%bcond_with toolchain_clang
+%endif
+
%if 0%{?el8}
%ifarch ppc64le
# tests often stall after this
@@ -29,9 +36,17 @@ Patch2: %{name}-make_version_consistent.patch
# Folly is known not to work on big-endian CPUs
#
https://bugzilla.redhat.com/show_bug.cgi?id=1892152
ExcludeArch: s390x
+%if 0%{?fedora} >= 36
+# fmt code breaks:
https://bugzilla.redhat.com/show_bug.cgi?id=2061022
+ExcludeArch: ppc64le
+%endif
BuildRequires: cmake
+%if %{with toolchain_clang}
+BuildRequires: clang
+%else
BuildRequires: gcc-c++
+%endif
BuildRequires: folly-devel = %{version}
%if %{with check}
BuildRequires: gmock-devel
@@ -74,7 +89,8 @@ developing applications that use %{name}.
%build
-%cmake fizz \
+cd fizz
+%cmake \
%if %{without tests}
-DBUILD_TESTS=OFF \
%endif
@@ -83,17 +99,20 @@ developing applications that use %{name}.
-DPACKAGE_VERSION=%{version} \
-DSO_VERSION=%{version}
%cmake_build
+cd -
%install
+cd fizz
%cmake_install
-
-# find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+cd -
%if %{with check}
%check
+cd fizz
%ctest
+cd -
%endif
commit 9a75904a36cb9193077614b0f7e60ec3a993d313
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Mar 2 13:58:04 2022 -0800
Update to 2022.02.28.00; drop static build
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/fizz-make_version_consistent.patch b/fizz-make_version_consistent.patch
new file mode 100644
index 0000000..37f14b3
--- /dev/null
+++ b/fizz-make_version_consistent.patch
@@ -0,0 +1,23 @@
+diff '--color=auto' -ruN fizz-2022.02.28.00/fizz/CMakeLists.txt
fizz-2022.02.28.00-make-version-consistent/fizz/CMakeLists.txt
+--- fizz-2022.02.28.00/fizz/CMakeLists.txt 2022-02-26 12:47:52.000000000 -0800
++++ fizz-2022.02.28.00-make-version-consistent/fizz/CMakeLists.txt 2022-03-02
15:38:49.956074611 -0800
+@@ -7,10 +7,6 @@
+ set(PACKAGE_VERSION "1.0.0")
+ endif()
+
+-if (NOT DEFINED SO_VERSION)
+- set(SO_VERSION 1)
+-endif()
+-
+ project("fizz" VERSION ${PACKAGE_VERSION} LANGUAGES CXX C)
+
+ if (NOT DEFINED CPACK_GENERATOR)
+@@ -230,7 +226,7 @@
+
+ if (BUILD_SHARED_LIBS)
+ set_target_properties(fizz
+- PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${SO_VERSION})
++ PROPERTIES VERSION ${PACKAGE_VERSION})
+ endif()
+
+ get_filename_component(FIZZ_BASE_DIR ${CMAKE_SOURCE_DIR}/.. ABSOLUTE)
diff --git a/fizz.spec b/fizz.spec
index cc7f11b..c10d04e 100644
--- a/fizz.spec
+++ b/fizz.spec
@@ -1,29 +1,19 @@
-# link issues on some platforms:
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1893332
-%ifarch i686 x86_64
-%bcond_without static
-%else
-%bcond_with static
-%endif
-
%if 0%{?el8}
%ifarch ppc64le
# tests often stall after this
# 64/66 Test #60: SlidingBloomReplayCacheTest
-%bcond_with tests
+%bcond_with check
%else
# tests don't currently compile with el8's gmock
# error: use of deleted function
-%bcond_with tests
+%bcond_with check
%endif
%else
-%bcond_without tests
+%bcond_without check
%endif
-%global _static_builddir static_build
-
Name: fizz
-Version: 2022.02.21.00
+Version: 2022.02.28.00
Release: %autorelease
Summary: A C++14 implementation of the TLS-1.3 standard
@@ -33,6 +23,8 @@ Source0: %{url}/archive/v%{version}/fizz-%{version}.tar.gz
# Disable failing tests
Patch0: %{name}-no_failed_tests.patch
Patch1: %{name}-no_32bit_failed_tests.patch
+# SO_VERSION strips extra zeros
+Patch2: %{name}-make_version_consistent.patch
# Folly is known not to work on big-endian CPUs
#
https://bugzilla.redhat.com/show_bug.cgi?id=1892152
@@ -41,10 +33,7 @@ ExcludeArch: s390x
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: folly-devel = %{version}
-%if %{with static}
-BuildRequires: folly-static = %{version}
-%endif
-%if %{with tests}
+%if %{with check}
BuildRequires: gmock-devel
BuildRequires: gtest-devel
%endif
@@ -67,6 +56,7 @@ PSK resumption, early data, client authentication, and
HelloRetryRequest.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-static < 2022.02.28.00-1
%description devel %{_description}
@@ -74,24 +64,13 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
-%if %{with static}
-%package static
-Summary: Static development libraries for %{name}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-
-%description static %{_description}
-
-The %{name}-static package contains static libraries for
-developing applications that use %{name}.
-%endif
-
-
%prep
%setup -q
%patch0 -p1 -b .no_failed_tests
%ifarch armv7hl i686
%patch1 -p1 -b .no_32bit_failed_tests
%endif
+%patch2 -p1
%build
@@ -106,36 +85,13 @@ developing applications that use %{name}.
%cmake_build
-%if %{with static}
-# static build
-# apply patch to build against static folly
-#cat {SOURCE1} | patch -p1
-mkdir %{_static_builddir}
-cd %{_static_builddir}
-%cmake ../fizz \
- -DBUILD_SHARED_LIBS=OFF \
- -DBUILD_TESTS=OFF \
- -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name}-static \
- -DFOLLY_ROOT=%{_libdir}/cmake/folly-static \
- -DPACKAGE_VERSION=%{version}
-%cmake_build
-%endif
-
-
%install
%cmake_install
-%if %{with static}
-# static build
-pushd %{_static_builddir}
-%cmake_install
-popd
-%endif
-
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+# find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-%if %{with tests}
+%if %{with check}
%check
%ctest
%endif
@@ -145,7 +101,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%license LICENSE
%{_bindir}/fizz
%{_bindir}/fizz-bogoshim
-%{_libdir}/*.so.*
+%{_libdir}/*.so.%{version}
%files devel
%doc CODE_OF_CONDUCT.md CONTRIBUTING.md README.md
@@ -153,101 +109,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {}
';'
%{_libdir}/*.so
%{_libdir}/cmake/%{name}
-%if %{with static}
-%files static
-%{_libdir}/*.a
-%{_libdir}/cmake/%{name}-static
-%endif
-
%changelog
%autochangelog
-* Thu Nov 18 2021 Michel Alexandre Salim <michel(a)michel-slm.name> -
2021.11.15.00-1
-- Update to 2021.11.15.00
-
-* Tue Sep 14 2021 Sahana Prasad <sahana(a)redhat.com> - 2021.08.02.00-2
-- Rebuilt with OpenSSL 3.0.0
-
-* Thu Aug 5 2021 Filipe Brandenburger <filbranden(a)gmail.com> - 2021.08.02.00-1
-- Update to 2021.08.02.00
-
-* Thu Jul 29 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2021.07.22.00-3
-- Use C++20 standard, in order to enable C++ coroutines
-
-* Tue Jul 27 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2021.07.22.00-2
-- Rebuilt for folly 2021.07.22.00
-
-* Sat Jul 24 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2021.07.22.00-1
-- Update to 2021.07.22.00
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
2021.06.28.00-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jul 12 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2021.06.28.00-1
-- Update to 2021.06.28.00
-
-* Wed Jun 09 2021 Michel Alexandre Salim <michel(a)michel-slm.name> -
2021.06.07.00-1
-- Update to 2021.06.07.00
-
-* Mon May 10 2021 Michel Alexandre Salim <michel(a)michel-slm.name> -
2021.05.10.00-1
-- Update to 2021.05.10.00
-
-* Mon Apr 26 2021 Michel Alexandre Salim <michel(a)michel-slm.name> -
2021.04.26.00-1
-- Update to 2021.04.26.00
-
-* Fri Apr 16 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2021.04.12.00-1
-- Update to 2021.04.12.00
-
-* Mon Mar 29 2021 Michel Alexandre Salim <michel(a)michel-slm.name> -
2021.03.29.00-1
-- Update to 2021.03.29.00
-
-* Wed Mar 24 2021 Michel Alexandre Salim <michel(a)michel-slm.name> -
2021.03.22.00-1
-- Update to 2021.03.22.00
-
-* Mon Mar 15 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2021.03.15.00-1
-- Update to 2021.03.15.00
-
-* Wed Feb 03 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2021.02.01.00-1
-- Update to 2021.02.01.00
-
-* Tue Jan 26 17:49:18 PST 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2021.01.25.00-1
-- Update to 2021.01.25.00
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
2020.12.28.00-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 29 12:14:58 PST 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.12.28.00-1
-- Update to 2020.12.28.00
-
-* Tue Dec 22 16:56:06 PST 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.12.21.00-1
-- Update to 2020.12.21.00
-
-* Mon Nov 30 10:42:44 PST 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.11.30.00-1
-- Update to 2020.11.30.00
-
-* Mon Nov 23 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.11.23.00-1
-- Update to 2020.11.23.00
-
-* Mon Nov 16 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.11.16.00-2
-- Fix tests on 32-bit architectures
-
-* Mon Nov 16 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.11.16.00-1
-- Update to 2020.11.16.00
-
-* Mon Nov 9 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.11.09.00-1
-- Update to 2020.11.09.00
-
-* Mon Nov 2 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.11.02.00-1
-- Update to 2020.11.02.00
-
-* Fri Oct 30 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.10.26.00-3
-- Only enable static subpackage on x86/x86_64 architectures for now (bz #1893332)
-
-* Thu Oct 29 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.10.26.00-2
-- Add static subpackage
-
-* Mon Oct 26 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.10.26.00-1
-- Update to 2020.10.26.00
-
-* Thu Oct 22 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
2020.10.19.00-1
-- Initial package
diff --git a/sources b/sources
index 7595edf..2dcb17c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fizz-2022.02.21.00.tar.gz) =
1f8e20f7b937885ea6b747bf743eab9cd1aea9fb2606819dab94c4d37ad1db39e6285354a0bfea7396f9c3979d4e921f355349d87c2aede854eb790e61006401
+SHA512 (fizz-2022.02.28.00.tar.gz) =
ccfd493b04cca5e8e76e64dea2659b88ec1fe0dcdfa3b1133d46fe8d37abc4fc78710c0831c2038ce0806f7ebad47607aa7597f9ee8577b9bbd11436ff1cdeaf
commit 3f0880447b277e2dad82c7140056819f9dc044b2
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Feb 23 15:35:03 2022 -0800
Update to 2022.02.21.00 (resolves: rhbz#2035845)
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/fizz.spec b/fizz.spec
index e401b51..cc7f11b 100644
--- a/fizz.spec
+++ b/fizz.spec
@@ -12,7 +12,9 @@
# 64/66 Test #60: SlidingBloomReplayCacheTest
%bcond_with tests
%else
-%bcond_without tests
+# tests don't currently compile with el8's gmock
+# error: use of deleted function
+%bcond_with tests
%endif
%else
%bcond_without tests
@@ -21,7 +23,7 @@
%global _static_builddir static_build
Name: fizz
-Version: 2022.01.17.00
+Version: 2022.02.21.00
Release: %autorelease
Summary: A C++14 implementation of the TLS-1.3 standard
@@ -38,9 +40,9 @@ ExcludeArch: s390x
BuildRequires: cmake
BuildRequires: gcc-c++
-BuildRequires: folly-devel
+BuildRequires: folly-devel = %{version}
%if %{with static}
-BuildRequires: folly-static
+BuildRequires: folly-static = %{version}
%endif
%if %{with tests}
BuildRequires: gmock-devel
diff --git a/sources b/sources
index 3407564..7595edf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fizz-2022.01.17.00.tar.gz) =
343e2ef0515e27efaf437b3447e47fa92231d3f86b27446398210e3bd7dc94fd9117aa71afa86ddfbf4d3c2ce11e2ec12688adaa16a0c5832c7b1b6b84c623ae
+SHA512 (fizz-2022.02.21.00.tar.gz) =
1f8e20f7b937885ea6b747bf743eab9cd1aea9fb2606819dab94c4d37ad1db39e6285354a0bfea7396f9c3979d4e921f355349d87c2aede854eb790e61006401