From d4b12164549970373aadedd6bccfc1b018393457 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Fri, 20 Mar 2015 16:56:19 +0200
Subject: [PATCH] up to 0.31.0

---
 folly.spec            | 42 +++++++++++------------------
 install-headers.patch | 61 -------------------------------------------
 2 files changed, 15 insertions(+), 88 deletions(-)
 delete mode 100644 install-headers.patch

diff --git a/folly.spec b/folly.spec
index 01bd99c..aff2dc5 100644
--- a/folly.spec
+++ b/folly.spec
@@ -1,18 +1,17 @@
+# TODO
+# - add testing
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static libraries
 
 Summary:	Library of C++11 components designed with practicality and efficiency in mind
 Name:		folly
-Version:	0.1
-Release:	0.9
+Version:	0.31.0
+Release:	1
 License:	Apache v2.0
 Group:		Libraries
-Source0:	https://github.com/facebook/folly/archive/master/%{name}.tar.gz
-# Source0-md5:	d7ff084fbd77dc34bfd9469c7a974547
-Patch0:		https://github.com/facebook/folly/pull/29.patch
-# Patch0-md5:	8745f0742d7199a5d3b2864620812f89
-Patch1:		install-headers.patch
+Source0:	https://github.com/facebook/folly/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	40c654db9055e9dd735907b0a430c16b
 URL:		https://github.com/facebook/folly/blob/master/folly/docs/Overview.md
 BuildRequires:	boost-devel >= 1.20.0
 BuildRequires:	double-conversion-devel
@@ -21,9 +20,13 @@ BuildRequires:	gflags-devel
 BuildRequires:	glog-devel
 BuildRequires:	gtest-devel >= 1.6.0
 BuildRequires:	libstdc++-devel
+BuildRequires:	rpmbuild(macros) >= 1.583
 ExclusiveArch:	%{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# missing openssl linking
+%define		skip_post_check_so	libfolly.so.31.0.0
+
 %description
 Folly (acronymed loosely after Facebook Open Source Library) is a
 library of C++11 components designed with practicality and efficiency
@@ -62,13 +65,9 @@ Static %{name} library.
 Statyczna biblioteka %{name}.
 
 %prep
-%setup -qc
-mv folly-*/* .
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
-# this is gtest-1.6 seem to work
-ln -s %{_usrsrc}/gtest folly/test/gtest-1.6.0
+#ln -s %{_usrsrc}/gtest folly/test/gtest-1.7.0
 
 %build
 cd folly
@@ -77,7 +76,6 @@ cd folly
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-CPPFLAGS="%{rpmcppflags} -I/usr/include/double-conversion"
 %configure \
 	%{!?with_static_libs:--disable-static}
 %{__make}
@@ -88,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # these aren't supposed to be installed!
-rm $RPM_BUILD_ROOT%{_libdir}/libgtest*
+#rm $RPM_BUILD_ROOT%{_libdir}/libgtest*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,24 +98,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README LICENSE
 %attr(755,root,root) %{_libdir}/libfolly.so.*.*.*
-%ghost %{_libdir}/libfolly.so.0
+%ghost %{_libdir}/libfolly.so.31
 %attr(755,root,root) %{_libdir}/libfollybenchmark.so.*.*.*
-%ghost %{_libdir}/libfollybenchmark.so.0
-%attr(755,root,root) %{_libdir}/libfollyfingerprint.so.*.*.*
-%ghost %{_libdir}/libfollyfingerprint.so.0
-%attr(755,root,root) %{_libdir}/libfollytimeout_queue.so.*.*.*
-%ghost %{_libdir}/libfollytimeout_queue.so.0
+%ghost %{_libdir}/libfollybenchmark.so.31
 
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/libfolly.so
 %{_libdir}/libfollybenchmark.so
-%{_libdir}/libfollyfingerprint.so
-%{_libdir}/libfollytimeout_queue.so
 %{_libdir}/libfolly.la
 %{_libdir}/libfollybenchmark.la
-%{_libdir}/libfollyfingerprint.la
-%{_libdir}/libfollytimeout_queue.la
 %{_includedir}/folly
 
 %if %{with static_libs}
@@ -125,6 +115,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libfolly.a
 %{_libdir}/libfollybenchmark.a
-%{_libdir}/libfollyfingerprint.a
-%{_libdir}/libfollytimeout_queue.a
 %endif
diff --git a/install-headers.patch b/install-headers.patch
deleted file mode 100644
index 3efe2f9..0000000
--- a/install-headers.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- folly-0.1/folly/Makefile.am	2013-10-06 18:16:51.140695708 +0300
-+++ folly-0.1/folly/Makefile.am	2013-10-06 18:18:18.131398586 +0300
-@@ -26,19 +26,25 @@
- 	ConcurrentSkipList.h \
- 	ConcurrentSkipList-inl.h \
- 	Conv.h \
-+	CpuId.h \
- 	detail/AtomicHashUtils.h \
- 	detail/BitIteratorDetail.h \
-+	detail/BitsDetail.h \
- 	detail/DiscriminatedPtrDetail.h \
- 	detail/FingerprintPolynomial.h \
- 	detail/GroupVarintDetail.h \
- 	detail/SlowFingerprint.h \
-+	detail/Stats.h \
- 	detail/ThreadLocalDetail.h \
- 	DiscriminatedPtr.h \
-+	DynamicConverter.h \
-+	Exception.h \
- 	dynamic.h \
- 	dynamic-inl.h \
- 	eventfd.h \
- 	FBString.h \
- 	FBVector.h \
-+	FileUtil.h \
- 	Fingerprint.h \
- 	folly-config.h \
- 	Foreach.h \
-@@ -51,10 +57,13 @@
- 	Histogram-inl.h \
- 	IntrusiveList.h \
- 	json.h \
-+	Lazy.h \
- 	Likely.h \
- 	Logging.h \
- 	Malloc.h \
- 	MapUtil.h \
-+	Memory.h \
-+	Optional.h \
- 	PackedSyncPtr.h \
- 	Portability.h \
- 	Preprocessor.h \
-@@ -68,6 +77,10 @@
- 	sorted_vector_types.h \
- 	SpookyHashV1.h \
- 	SpookyHashV2.h \
-+	stats/BucketedTimeSeries.h \
-+	stats/Histogram-defs.h \
-+	stats/Histogram.h \
-+	stats/MultiLevelTimeSeries.h \
- 	StlAllocator.h \
- 	String.h \
- 	String-inl.h \
-@@ -83,6 +96,7 @@
- 	ThreadLocal.h \
- 	TimeoutQueue.h \
- 	Traits.h \
-+	Varint.h \
- 	Unicode.h
- 
- FormatTables.cpp: build/generate_format_tables.py
-- 
2.43.0