folly:

- Put static cmake support files in its own directory
- Add most folly BRs as folly-devel requirements, as dependent packages will need them

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>

1 files changed, 28 insertions, 6 deletions

diff --git a/libdevel/folly.spec b/libdevel/folly.spec
index 9b8bff0..3e3888b 100644
--- a/libdevel/folly.spec
+++ b/libdevel/folly.spec
@@ -8,7 +8,7 @@
 
 Name:           folly
 Version:        2020.10.19.00
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An open-source C++ library developed and used at Facebook
 
 License:        ASL 2.0
@@ -18,8 +18,7 @@ Source0:        https://github.com/facebook/folly/releases/download/v%{version}/
 Patch0:         https://github.com/facebook/folly/commit/81e350e10b855e5ec48430677bc82d8f7e84015b.patch#/folly-v%{version}-fix_i686.patch
 Patch1:         https://github.com/facebook/folly/commit/3b1bdb98c3e2ca1e18db4a74c2674f22a7d05b48.patch#/folly-v%{version}-shared_pic.patch
 Patch2:         https://github.com/facebook/folly/commit/f817aff73bea2ce956ec2212c34d12cd206f31cf.patch#/folly-v%{version}-shared_version.patch
-# being submitted internally
-Patch3:         folly-v%{version}-fix_pkgconfig_version.patch
+Patch3:         https://github.com/facebook/folly/commit/eaee7b4baed2871ea437a41bbcba98211d606718.patch#/folly-v%{version}-fix_pkgconfig_version.patch
 
 # Folly is known not to work on big-endian CPUs
 # will file a proper blocking bug once this is imported
@@ -56,7 +55,6 @@ BuildRequires:  python3-devel
 BuildRequires:  snappy-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
-#Requires:       
 
 %description
 Folly (acronymed loosely after Facebook Open Source Library) is a library of
@@ -80,7 +78,26 @@ Folly.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       binutils-devel%{?_isa}
+Requires:       boost-devel%{?_isa}
+Requires:       bzip2-devel%{?_isa}
 Requires:       cmake-filesystem
+Requires:       double-conversion-devel%{?_isa}
+Requires:       fmt-devel%{?_isa}
+Requires:       glog-devel%{?_isa}
+Requires:       gmock-devel%{?_isa}
+Requires:       libaio-devel%{?_isa}
+Requires:       libdwarf-devel%{?_isa}
+Requires:       libevent-devel%{?_isa}
+Requires:       libsodium-devel%{?_isa}
+Requires:       libunwind-devel%{?_isa}
+Requires:       liburing-devel%{?_isa} >= 0.7-3
+Requires:       libzstd-devel%{?_isa}
+Requires:       lz4-devel%{?_isa}
+Requires:       openssl-devel%{?_isa}
+Requires:       snappy-devel%{?_isa}
+Requires:       xz-devel%{?_isa}
+Requires:       zlib-devel%{?_isa}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -108,7 +125,7 @@ pushd %{_shared_builddir}
 %if %{with python}
   -DPYTHON_EXTENSIONS=ON \
 %endif
-  -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/folly \
+  -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name} \
   -DPACKAGE_VERSION=%{version}
 %cmake_build
 popd
@@ -122,7 +139,7 @@ popd
 %cmake \
 %endif
   -DBUILD_SHARED_LIBS=OFF \
-  -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/folly \
+  -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name}-static \
   -DPACKAGE_VERSION=%{version}
 %cmake_build
 
@@ -155,9 +172,14 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %files static
 %{_libdir}/*.a
+%{_libdir}/cmake/%{name}-static
 
 
 %changelog
+* Thu Oct 22 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.10.19.00-4
+- Put static cmake support files in its own directory
+- Add most folly BRs as folly-devel requirements, as dependent packages will need them
+
 * Wed Oct 21 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.10.19.00-3
 - Provide both shared and static libraries