The package rpms/wangle.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/wangle.git/commit/?id=6b907136b01...
https://src.fedoraproject.org/cgit/rpms/wangle.git/commit/?id=29da146b4c7....
Change:
+ExcludeArch: ppc64le
-%ifarch i686 x86_64
Thanks.
Full change:
============
commit 6b907136b01840e014eaec96bb201235d89fe264
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Fri Mar 4 22:37:20 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/wangle.spec b/wangle.spec
index 920c39f..fc0e334 100644
--- a/wangle.spec
+++ b/wangle.spec
@@ -1,3 +1,10 @@
+%if 0%{?fedora} >= 36
+# Folly is compiled with Clang
+%bcond_without toolchain_clang
+%else
+%bcond_with toolchain_clang
+%endif
+
%bcond_without check
Name: wangle
@@ -16,9 +23,17 @@ Patch1: %{name}-make_version_consistent.patch
# Folly is known not to work on big-endian CPUs
#
https://bugzilla.redhat.com/show_bug.cgi?id=1892807
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
# Library dependencies
BuildRequires: fizz-devel = %{version}
BuildRequires: folly-devel = %{version}
@@ -52,7 +67,8 @@ developing applications that use %{name}.
%build
-%cmake wangle \
+cd wangle
+%cmake \
%if %{with check}
-DBUILD_TESTS=ON \
%else
@@ -61,15 +77,20 @@ developing applications that use %{name}.
-DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name} \
-DPACKAGE_VERSION=%{version}
%cmake_build
+cd -
%install
+cd wangle
%cmake_install
+cd -
%if %{with check}
%check
+cd wangle
%ctest
+cd -
%endif
commit 29da146b4c72cd0ed03690c85767b8372f618794
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Mar 2 14:19:44 2022 -0800
Update to 2022.02.28.00; drop static build
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/sources b/sources
index 8cd1afc..0813949 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wangle-2022.02.21.00.tar.gz) =
ce3a85b203afebc5d339fbda6828fcaae341b34f1865aa7e482e548caaac55f9856627479f2c39e3371c4cee32f62ff42cdd7f55abc3544bb3baf6d2260f4f92
+SHA512 (wangle-2022.02.28.00.tar.gz) =
be69ea8318ebd0f75f8d6ffe82c833f868837cff965e99aacc11abb90f572e2d9b837782ac1e23e86355e52f5ca2b2be13be54ac4651db9ef22afa95bb0b3cc3
diff --git a/wangle-make_version_consistent.patch b/wangle-make_version_consistent.patch
new file mode 100644
index 0000000..a62045f
--- /dev/null
+++ b/wangle-make_version_consistent.patch
@@ -0,0 +1,23 @@
+diff '--color=auto' -ruN wangle-2022.02.28.00/wangle/CMakeLists.txt
wangle-2022.02.28.00-make_version_consistent/wangle/CMakeLists.txt
+--- wangle-2022.02.28.00/wangle/CMakeLists.txt 2022-02-26 14:10:46.000000000 -0800
++++ wangle-2022.02.28.00-make_version_consistent/wangle/CMakeLists.txt 2022-03-02
15:56:09.677111019 -0800
+@@ -18,10 +18,6 @@
+ set(PACKAGE_VERSION "1.0.0")
+ endif()
+
+-if (NOT DEFINED SO_VERSION)
+- set(SO_VERSION 1)
+-endif()
+-
+ project("wangle" VERSION ${PACKAGE_VERSION} LANGUAGES CXX C)
+
+ if (NOT DEFINED CPACK_GENERATOR)
+@@ -153,7 +149,7 @@
+
+ if (BUILD_SHARED_LIBS)
+ set_target_properties(wangle
+- PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${SO_VERSION})
++ PROPERTIES VERSION ${PACKAGE_VERSION})
+ endif()
+
+ target_include_directories(
diff --git a/wangle.spec b/wangle.spec
index eeabeca..920c39f 100644
--- a/wangle.spec
+++ b/wangle.spec
@@ -1,18 +1,7 @@
-# Depends on fizz, which has linking 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
-
-# Tests are not currently passing
-%bcond_without tests
-
-%global _static_builddir static_build
+%bcond_without check
Name: wangle
-Version: 2022.02.21.00
+Version: 2022.02.28.00
Release: %autorelease
Summary: Framework for building services in a consistent/modular/composable way
@@ -21,6 +10,8 @@ URL:
https://github.com/facebook/wangle
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# disable failing tests, see patch for context
Patch0: %{name}-disable_failed_tests.patch
+# PROJECT_VERSION strips leading 0s
+Patch1: %{name}-make_version_consistent.patch
# Folly is known not to work on big-endian CPUs
#
https://bugzilla.redhat.com/show_bug.cgi?id=1892807
@@ -31,11 +22,7 @@ BuildRequires: gcc-c++
# Library dependencies
BuildRequires: fizz-devel = %{version}
BuildRequires: folly-devel = %{version}
-%if %{with static}
-BuildRequires: fizz-static = %{version}
-BuildRequires: folly-static = %{version}
-%endif
-%if %{with tests}
+%if %{with check}
BuildRequires: gmock-devel
BuildRequires: gtest-devel
%endif
@@ -53,69 +40,34 @@ It's like Netty + Finagle smooshed together, but in C++.}
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-static < 2022.02.28.00-1
%description devel %{_description}
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
%autosetup -p1
%build
%cmake wangle \
-%if %{with tests}
+%if %{with check}
-DBUILD_TESTS=ON \
%else
-DBUILD_TESTS=OFF \
%endif
-DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name} \
- -DPACKAGE_VERSION=%{version} \
- -DSO_VERSION=%{version}
-%cmake_build
-
-%if %{with static}
-# static build
-mkdir %{_static_builddir}
-cd %{_static_builddir}
-%cmake ../wangle \
- -DBUILD_SHARED_LIBS=OFF \
- -DBUILD_TESTS=OFF \
- -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name}-static \
- -DFIZZ_ROOT=%{_libdir}/cmake/fizz-static \
- -DFOLLY_ROOT=%{_libdir}/cmake/folly-static \
-DPACKAGE_VERSION=%{version}
%cmake_build
-%endif
%install
-%if %{with static}
-# static build
-pushd %{_static_builddir}
-%cmake_install
-popd
-%endif
-
%cmake_install
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-%if %{with tests}
+%if %{with check}
%check
%ctest
%endif
@@ -123,7 +75,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%files
%license LICENSE
-%{_libdir}/*.so.*
+%{_libdir}/*.so.%{version}
%files devel
%doc CONTRIBUTING.md README.md tutorial.md
@@ -131,12 +83,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
commit 02f18ed9a0cbd1b3f8b38cbcffc2c484892ef55f
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Feb 23 15:53:40 2022 -0800
Update to 2022.02.21.00 (resolves: rhbz#2035820)
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/sources b/sources
index 4f49df1..8cd1afc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wangle-2022.01.17.00.tar.gz) =
6da923659d372a0e9dce061c0b9278d53476dc64ba61a6d5edd015a851cb257208966294104f8f8cf875a2db4c65b8335c122a5894ba3cbba3573154cca8df95
+SHA512 (wangle-2022.02.21.00.tar.gz) =
ce3a85b203afebc5d339fbda6828fcaae341b34f1865aa7e482e548caaac55f9856627479f2c39e3371c4cee32f62ff42cdd7f55abc3544bb3baf6d2260f4f92
diff --git a/wangle.spec b/wangle.spec
index 0256c26..eeabeca 100644
--- a/wangle.spec
+++ b/wangle.spec
@@ -12,7 +12,7 @@
%global _static_builddir static_build
Name: wangle
-Version: 2022.01.17.00
+Version: 2022.02.21.00
Release: %autorelease
Summary: Framework for building services in a consistent/modular/composable way
@@ -29,11 +29,11 @@ ExcludeArch: s390x
BuildRequires: cmake
BuildRequires: gcc-c++
# Library dependencies
-BuildRequires: fizz-devel
-BuildRequires: folly-devel
+BuildRequires: fizz-devel = %{version}
+BuildRequires: folly-devel = %{version}
%if %{with static}
-BuildRequires: fizz-static
-BuildRequires: folly-static
+BuildRequires: fizz-static = %{version}
+BuildRequires: folly-static = %{version}
%endif
%if %{with tests}
BuildRequires: gmock-devel