The package rpms/fb303.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/fb303.git/commit/?id=4d5342facb63....
Change:
-%ifarch %ix86 x86_64
Thanks.
Full change:
============
commit 4d5342facb630d24e0046c1f5f247ee924564c03
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Mon Feb 28 16:33:32 2022 -0800
Update to snapshot from 2022.02.21
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index 05358d6..2b0afda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/fb303-bd92ca817da526f9b57faa6b0f70445c80a6318f.tar.gz
+/fb303-fd133d97ac002c72cbb115abe4a92c474b337a11.tar.gz
diff --git a/fb303.spec b/fb303.spec
index 3b221ce..c341dd7 100644
--- a/fb303.spec
+++ b/fb303.spec
@@ -1,29 +1,19 @@
%global forgeurl
https://github.com/facebook/fb303/
# take the date fbthrift is tagged
# and use the first "Updating submodules" commit from that day
-%global commit bd92ca817da526f9b57faa6b0f70445c80a6318f
+%global commit fd133d97ac002c72cbb115abe4a92c474b337a11
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20211220
+%global date 20220221
# need to figure out how to get the Python bindings to build later
%bcond_with python
-## Depends on fizz, which has linking issues on some platforms:
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1893332
-%ifarch %ix86 x86_64
-%bcond_without static
-%else
-%bcond_with static
-%endif
-
# No tests were found!!!
-%bcond_with tests
-
-%global _static_builddir static_build
+%bcond_with check
Name: fb303
-Version: 0
-Release: 0.7.%{date}git%{shortcommit}%{?dist}
+Version: 0^%{date}git%{shortcommit}
+Release: %autorelease
Summary: Base Thrift service and a common set of functionality
License: ASL 2.0
@@ -57,6 +47,7 @@ stats, options, and other information from a service.}
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: cmake-filesystem
+Obsoletes: %{name}-static < 0^20220221gitfd133d9-1
%description devel %{_description}
@@ -64,43 +55,11 @@ 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}
-BuildRequires: fbthrift-static
-BuildRequires: fizz-static
-BuildRequires: folly-static
-BuildRequires: wangle-static
-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 -n %{name}-%{commit} -p1
%build
-%if %{with static}
-# static build
-mkdir %{_static_builddir}
-pushd %{_static_builddir}
-%cmake .. \
- -DBUILD_SHARED_LIBS=OFF \
- -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name}-static \
- -DFBTHRIFT_ROOT=%{_libdir}/cmake/fbthrift-static \
- -DFIZZ_ROOT=%{_libdir}/cmake/fizz-static \
- -DFOLLY_ROOT=%{_libdir}/cmake/folly-static \
- -DWANGLE_ROOT=%{_libdir}/cmake/wangle-static \
- -DPYTHON_EXTENSIONS=OFF
-%cmake_build
-popd
-
-%endif
%cmake \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name} \
@@ -114,20 +73,11 @@ popd
%install
-%if %{with static}
-# static build
-pushd %{_static_builddir}
-%cmake_install
-popd
-%endif
-
%cmake_install
+# 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
@@ -144,15 +94,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
-* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.7.20211220gitbd92ca8
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
%autochangelog
diff --git a/sources b/sources
index e1e1a2d..9aa7832 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fb303-bd92ca817da526f9b57faa6b0f70445c80a6318f.tar.gz) =
d3ea819aa8d567faf50fe191e1855f82a19ef9fec9e117267f4e8a8e22967b5efec4c09b6e0c277e21310bc3bde313f07f3ae6f1aab94ae6ccbf2f9a91d077ab
+SHA512 (fb303-fd133d97ac002c72cbb115abe4a92c474b337a11.tar.gz) =
624eab46007aad9185a4ab30dea80324acdd4fbf68cf6f688a22b438f6bfe13ba8fea5b7c5fd411f7aeac7c8837888fc561c4a70034bcf526229fd445365abf3
commit 945b9baea8f457e88afa8f1b5374aab267cf2706
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 20 02:41:36 2022 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/fb303.spec b/fb303.spec
index 6181ebd..3b221ce 100644
--- a/fb303.spec
+++ b/fb303.spec
@@ -23,7 +23,7 @@
Name: fb303
Version: 0
-Release: 0.6.%{date}git%{shortcommit}%{?dist}
+Release: 0.7.%{date}git%{shortcommit}%{?dist}
Summary: Base Thrift service and a common set of functionality
License: ASL 2.0
@@ -152,4 +152,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.7.20211220gitbd92ca8
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
%autochangelog