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=26d58667a75b....
Change:
+%ifarch %ix86 x86_64
Thanks.
Full change:
============
commit b92e1914353ea08d22bc2acbf5ab8c48b2528790
Merge: 80bbfe3 26d5866
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Tue Dec 28 12:23:13 2021 -0800
Merge branch 'rawhide' into f35
commit 80bbfe36a8ca2700fc6e09c722262fb9f9eeec71
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Tue Dec 28 12:22:58 2021 -0800
Revert "Update to snapshot from 20211115"
This reverts commit 7bef73190558d00d6d2b1564911d7480ae0906b9.
diff --git a/.gitignore b/.gitignore
index d3d50c3..ff216f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/fb303-*.tar.gz
+/fb303-5b6063051bb293cc4fcca644c46468f6fdd64802.tar.gz
diff --git a/fb303.spec b/fb303.spec
index b7f4092..3e94329 100644
--- a/fb303.spec
+++ b/fb303.spec
@@ -1,9 +1,9 @@
%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 a4d35c761ca56899831e103b3bdcd7d9cb5695fe
+%global commit 5b6063051bb293cc4fcca644c46468f6fdd64802
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20211115
+%global date 20210722
# need to figure out how to get the Python bindings to build later
%bcond_with python
@@ -140,9 +140,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
-* Fri Nov 19 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.6.20211115gita4d35c7
-- Update to snapshot from 20211115
-
* Fri Aug 06 2021 Jonathan Wakely <jwakely(a)redhat.com> - 0-0.6.20210722git5b60630
- Rebuilt for Boost 1.76
diff --git a/sources b/sources
index 7c44fe8..46f5aa4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fb303-a4d35c761ca56899831e103b3bdcd7d9cb5695fe.tar.gz) =
a37a312b61db761cfd64b17e8ef6f6c71f79266c5de691ac7b0446d1347578ea49331f98d23f4a64b4f84a8a53a114e29f636af1a1ad842149a98f6f39cfd017
+SHA512 (fb303-5b6063051bb293cc4fcca644c46468f6fdd64802.tar.gz) =
3ed20b873468ba9900df1dd1b33653f997ec13ddd408352da0bc67fe7ef675d428cc016d9256790ee16646430cb5367451d3ed2ee8d30b6c608652613e907cb7
commit 26d58667a75b8efc43a49477b6ec3698dd85c33c
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Fri Dec 24 14:40:24 2021 -0800
Update to snapshot from 20211220
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index ff216f7..05358d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/fb303-5b6063051bb293cc4fcca644c46468f6fdd64802.tar.gz
+/fb303-bd92ca817da526f9b57faa6b0f70445c80a6318f.tar.gz
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..63feec7
--- /dev/null
+++ b/changelog
@@ -0,0 +1,61 @@
+* Fri Dec 24 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.6.20211220gitbd92ca8
+- Update to snapshot from 20211220
+- Opt in to rpmautospec (changelog only)
+
+* Fri Aug 06 2021 Jonathan Wakely <jwakely(a)redhat.com> - 0-0.6.20210722git5b60630
+- Rebuilt for Boost 1.76
+
+* Thu Jul 29 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.5-20210722git5b60630
+- Update to snapshot from 20210722
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.5.20210628git8ef9085
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jul 12 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.4.20210628git8ef9085
+- Update to snapshot from 20210628
+
+* Mon Jul 05 2021 Richard Shaw <hobbes1069(a)gmail.com> - 0-0.4.20210510git74978e1
+- Rebuild for new fmt version.
+
+* Mon May 10 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210510git74978e1
+- Update to snapshot from 20210510
+
+* Mon Apr 26 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210426git3843360
+- Update to snapshot from 20210426
+
+* Fri Apr 16 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210412git9066fd2
+- Update to snapshot from 20210412
+- Stop using forge macros in case we want to build for EPEL8
+
+* Mon Mar 29 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0.0-3.20210329gitbf56c7a
+- Update to snapshot from 20210329
+
+* Wed Mar 24 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210322git90a5e0c
+- Update to snapshot from 20210322
+
+* Mon Mar 15 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210314git042a0d3
+- Update to snapshot from 20210314
+
+* Wed Feb 3 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210201git72505c4
+- Update to snapshot from 20210201
+
+* Tue Jan 26 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.1.20210125git7b67e06
+- Update to snapshot from 20210125
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.3.20201228git7700913
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Jonathan Wakely <jwakely(a)redhat.com> - 0-0.2.20201228git7700913
+- Rebuilt for Boost 1.75
+
+* Tue Dec 29 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.1.20201228git7700913
+- Update to snapshot from 20201228
+
+* Tue Dec 22 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.1.20201221git96ae845
+- Update to snapshot from 20201221
+
+* 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/fb303.spec b/fb303.spec
index 3e94329..6181ebd 100644
--- a/fb303.spec
+++ b/fb303.spec
@@ -1,21 +1,24 @@
%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 5b6063051bb293cc4fcca644c46468f6fdd64802
+%global commit bd92ca817da526f9b57faa6b0f70445c80a6318f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20210722
+%global date 20211220
# 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
+%ifarch %ix86 x86_64
%bcond_without static
%else
%bcond_with static
%endif
+# No tests were found!!!
+%bcond_with tests
+
%global _static_builddir static_build
Name: fb303
@@ -42,11 +45,12 @@ BuildRequires: python3-devel
BuildRequires: python3-fbthrift-devel
%endif
BuildRequires: wangle-devel
-#Requires:
-%description
+%global _description %{expand:
fb303 is a base Thrift service and a common set of functionality for querying
-stats, options, and other information from a service.
+stats, options, and other information from a service.}
+
+%description %{_description}
%package devel
@@ -54,7 +58,8 @@ Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: cmake-filesystem
-%description devel
+%description devel %{_description}
+
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
@@ -68,14 +73,14 @@ BuildRequires: folly-static
BuildRequires: wangle-static
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-%description static
+%description static %{_description}
+
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
@@ -118,9 +123,16 @@ popd
%cmake_install
+
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%if %{with tests}
+%check
+%ctest
+%endif
+
+
%files
%license LICENSE
%doc README.md
@@ -140,60 +152,4 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
-* Fri Aug 06 2021 Jonathan Wakely <jwakely(a)redhat.com> - 0-0.6.20210722git5b60630
-- Rebuilt for Boost 1.76
-
-* Thu Jul 29 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.5-20210722git5b60630
-- Update to snapshot from 20210722
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.5.20210628git8ef9085
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jul 12 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.4.20210628git8ef9085
-- Update to snapshot from 20210628
-
-* Mon Jul 05 2021 Richard Shaw <hobbes1069(a)gmail.com> - 0-0.4.20210510git74978e1
-- Rebuild for new fmt version.
-
-* Mon May 10 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210510git74978e1
-- Update to snapshot from 20210510
-
-* Mon Apr 26 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210426git3843360
-- Update to snapshot from 20210426
-
-* Fri Apr 16 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210412git9066fd2
-- Update to snapshot from 20210412
-- Stop using forge macros in case we want to build for EPEL8
-
-* Mon Mar 29 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0.0-3.20210329gitbf56c7a
-- Update to snapshot from 20210329
-
-* Wed Mar 24 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210322git90a5e0c
-- Update to snapshot from 20210322
-
-* Mon Mar 15 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210314git042a0d3
-- Update to snapshot from 20210314
-
-* Wed Feb 3 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.3.20210201git72505c4
-- Update to snapshot from 20210201
-
-* Tue Jan 26 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.1.20210125git7b67e06
-- Update to snapshot from 20210125
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.3.20201228git7700913
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Jonathan Wakely <jwakely(a)redhat.com> - 0-0.2.20201228git7700913
-- Rebuilt for Boost 1.75
-
-* Tue Dec 29 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.1.20201228git7700913
-- Update to snapshot from 20201228
-
-* Tue Dec 22 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> -
0-0.1.20201221git96ae845
-- Update to snapshot from 20201221
-
-* 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
+%autochangelog
diff --git a/sources b/sources
index 46f5aa4..e1e1a2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fb303-5b6063051bb293cc4fcca644c46468f6fdd64802.tar.gz) =
3ed20b873468ba9900df1dd1b33653f997ec13ddd408352da0bc67fe7ef675d428cc016d9256790ee16646430cb5367451d3ed2ee8d30b6c608652613e907cb7
+SHA512 (fb303-bd92ca817da526f9b57faa6b0f70445c80a6318f.tar.gz) =
d3ea819aa8d567faf50fe191e1855f82a19ef9fec9e117267f4e8a8e22967b5efec4c09b6e0c277e21310bc3bde313f07f3ae6f1aab94ae6ccbf2f9a91d077ab