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=2b0650a0930f....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit a07f619835ce09eea7d32c77ad99d66b86f88aad
Author: Michel Alexandre Salim <michel(a)michel-slm.name>
Date: Mon Nov 30 16:21:17 2020 -0800
Update to snapshot from 20201130
Signed-off-by: Michel Alexandre Salim <michel(a)michel-slm.name>
diff --git a/.gitignore b/.gitignore
index 78be369..c5d2722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/fb303-94cac88cf8be1636727727591891b903a1dbdcb5.tar.gz
+/fb303-2b3b110f2b8c27f70ba0fe1e81b0213cae62bc0a.tar.gz
diff --git a/fb303-explicit_glog.patch b/fb303-explicit_glog.patch
new file mode 100644
index 0000000..6f0cf16
--- /dev/null
+++ b/fb303-explicit_glog.patch
@@ -0,0 +1,25 @@
+From 05368003379fe1479a393d21d5f2c848eb5e7490 Mon Sep 17 00:00:00 2001
+From: Michel Alexandre Salim <michel(a)michel-slm.name>
+Date: Mon, 30 Nov 2020 16:07:04 -0800
+Subject: [PATCH] QuantileStatMap.h: include glog/logging.h
+
+Signed-off-by: Michel Alexandre Salim <michel(a)michel-slm.name>
+---
+ fb303/detail/QuantileStatMap.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/fb303/detail/QuantileStatMap.h b/fb303/detail/QuantileStatMap.h
+index 66e1e07..a9c9150 100644
+--- a/fb303/detail/QuantileStatMap.h
++++ b/fb303/detail/QuantileStatMap.h
+@@ -21,6 +21,7 @@
+ #include <vector>
+
+ #include <gflags/gflags.h>
++#include <glog/logging.h>
+
+ #include <folly/Optional.h>
+ #include <folly/SharedMutex.h>
+--
+2.28.0
+
diff --git a/fb303.spec b/fb303.spec
index b92df4d..9ef2ab5 100644
--- a/fb303.spec
+++ b/fb303.spec
@@ -1,10 +1,11 @@
%global forgeurl
https://github.com/facebook/fb303/
# take the date fbthrift is tagged
# and use the last fb303 commit prior to that date
-%global commit 94cac88cf8be1636727727591891b903a1dbdcb5
-%global date 20201123
+%global commit 2b3b110f2b8c27f70ba0fe1e81b0213cae62bc0a
+%global date 20201130
-%forgemeta -i
+# add -i for outputting more info
+%forgemeta
# need to figure out how to get the Python bindings to build later
%bcond_with python
@@ -27,6 +28,7 @@ Summary: Base Thrift service and a common set of functionality
License: ASL 2.0
URL: %{forgeurl}
Source0: %{forgesource}
+Patch0: %{name}-explicit_glog.patch
# Folly is known not to work on big-endian CPUs
ExcludeArch: s390x
@@ -141,5 +143,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Mon Nov 30 14:54:10 PST 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.1.20201130git2b3b110
+- Update to snapshot from 20201130
+
* Mon Nov 23 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.1.20201123git94cac88
- Initial package
diff --git a/sources b/sources
index 55504b6..b816bdd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fb303-94cac88cf8be1636727727591891b903a1dbdcb5.tar.gz) =
b52bacdc75a4fbb9206514262e300bb64b6100961603453240a7776df46d08aeca89182c3433a0cdc7ce6c0e892357ca7bdcd347f4fbcd5853fada450ea7156e
+SHA512 (fb303-2b3b110f2b8c27f70ba0fe1e81b0213cae62bc0a.tar.gz) =
84f10b6d9e6035e2aa9a49b103142ebb6d730266259e834ab10757e10ac3c3e1c05051eb69428aead414c7bb34c1805f39dbe2deaf40e1a57a3a2ac103cd7ea9
commit 0fcafddea3beb7049927b6f66371ec219d66c88c
Author: Michel Alexandre Salim <michel(a)michel-slm.name>
Date: Mon Nov 23 13:16:24 2020 -0800
Stop accidentally reenabling static subpackage
Signed-off-by: Michel Alexandre Salim <michel(a)michel-slm.name>
diff --git a/fb303.spec b/fb303.spec
index 9ee5512..b92df4d 100644
--- a/fb303.spec
+++ b/fb303.spec
@@ -16,7 +16,6 @@
%else
%bcond_with static
%endif
-%bcond_without static
%global _static_builddir static_build
commit 2b0650a0930fc428042e67f40efe5f0f59358f70
Author: Michel Alexandre Salim <michel(a)michel-slm.name>
Date: Mon Nov 23 11:08:01 2020 -0800
Packaging variables read or set by %forgemeta
forgeurl:
https://github.com/facebook/fb303
forgesource:
https://github.com/facebook/fb303/archive/94cac88cf8be1636727727591891b90...
forgesetupargs: -n fb303-94cac88cf8be1636727727591891b903a1dbdcb5
archivename: fb303-94cac88cf8be1636727727591891b903a1dbdcb5
archiveext: tar.gz
archiveurl:
https://github.com/facebook/fb303/archive/94cac88cf8be1636727727591891b90...
topdir: fb303-94cac88cf8be1636727727591891b903a1dbdcb5
extractdir: fb303-94cac88cf8be1636727727591891b903a1dbdcb5
repo: fb303
scm: git
commit: 94cac88cf8be1636727727591891b903a1dbdcb5
date: 20201123
distprefix: .20201123git94cac88
dist: .20201123git94cac88.fc34
(snapshot date is either manually supplied or computed once
%{_sourcedir}/%{archivename}.%{archiveext} is available)
Initial package
Signed-off-by: Michel Alexandre Salim <michel(a)michel-slm.name>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..78be369
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/fb303-94cac88cf8be1636727727591891b903a1dbdcb5.tar.gz
diff --git a/fb303.spec b/fb303.spec
new file mode 100644
index 0000000..9ee5512
--- /dev/null
+++ b/fb303.spec
@@ -0,0 +1,146 @@
+%global forgeurl
https://github.com/facebook/fb303/
+# take the date fbthrift is tagged
+# and use the last fb303 commit prior to that date
+%global commit 94cac88cf8be1636727727591891b903a1dbdcb5
+%global date 20201123
+
+%forgemeta -i
+
+# 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 i686 x86_64
+%bcond_without static
+%else
+%bcond_with static
+%endif
+%bcond_without static
+
+%global _static_builddir static_build
+
+Name: fb303
+Version: 0
+Release: 0.1%{?dist}
+Summary: Base Thrift service and a common set of functionality
+
+License: ASL 2.0
+URL: %{forgeurl}
+Source0: %{forgesource}
+
+# Folly is known not to work on big-endian CPUs
+ExcludeArch: s390x
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: fbthrift-devel
+BuildRequires: fizz-devel
+BuildRequires: folly-devel
+BuildRequires: gflags-devel
+BuildRequires: glog-devel
+%if %{with python}
+BuildRequires: python3-devel
+BuildRequires: python3-fbthrift-devel
+%endif
+BuildRequires: wangle-devel
+#Requires:
+
+%description
+fb303 is a base Thrift service and a common set of functionality for querying
+stats, options, and other information from a service.
+
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: cmake-filesystem
+
+%description devel
+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
+The %{name}-static package contains static libraries for
+developing applications that use %{name}.
+%endif
+
+
+%prep
+# forgesetup doesn't take patches
+%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} \
+ -DPACKAGE_VERSION=0.%{date} \
+%if %{with python}
+ -DPYTHON_EXTENSIONS=ON
+%else
+ -DPYTHON_EXTENSIONS=OFF
+%endif
+%cmake_build
+
+
+%install
+%if %{with static}
+# static build
+pushd %{_static_builddir}
+%cmake_install
+popd
+%endif
+
+%cmake_install
+
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+
+%files
+%license LICENSE
+%doc README.md
+%{_libdir}/*.so.*
+
+%files devel
+%doc CODE_OF_CONDUCT.md CONTRIBUTING.md
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/cmake/%{name}/
+
+%if %{with static}
+%files static
+%{_libdir}/*.a
+%{_libdir}/cmake/%{name}-static
+%endif
+
+
+%changelog
+* Mon Nov 23 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.1.20201123git94cac88
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..55504b6
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (fb303-94cac88cf8be1636727727591891b903a1dbdcb5.tar.gz) =
b52bacdc75a4fbb9206514262e300bb64b6100961603453240a7776df46d08aeca89182c3433a0cdc7ce6c0e892357ca7bdcd347f4fbcd5853fada450ea7156e