- updated brotli to release 0.5.2 and libbrotli to recent snapshot

diff --git a/brotli.spec b/brotli.spec
index d7737709efd7ac53d1155cd218a62fd7b7f13604..06798e448f2027c51e38584d8e77a3dd94be14d4 100644 (file)
--- a/brotli.spec
+++ b/brotli.spec
@@ -7,16 +7,16 @@
 Summary:       Brotli - generic-purpose lossless compression algorithm
 Summary(pl.UTF-8):     Brotli - algorytm bezstratnej kompresji ogólnego przeznaczenia
 Name:          brotli
-Version:       0.2.0
+Version:       0.5.2
 Release:       1
 License:       Apache v2.0
 Group:         Libraries
 #Source0Download: https://github.com/google/brotli/releases
-Source0:       https://github.com/google/brotli/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 6c84662ca13693967cb0a950d15873e7
+Source0:       https://github.com/google/brotli/archive/v%{version}/Brotli-%{version}.tar.gz
+# Source0-md5: e7a6c1fe7795475f4273ee4c36a3ad5c
 # metapackage to build shared libraries from brotli sources
-Source1:       https://github.com/bagder/libbrotli/archive/851122b665cde2374387c595ae3dc3369bf8ea05/libbrotli-20151022.tar.gz
-# Source1-md5: 6f6186f75a2b9385d20f9c9052965be2
+Source1:       https://github.com/bagder/libbrotli/archive/ccb89e138b0948d7c353bc508b0d8fc584e01ff2/libbrotli-20160820.tar.gz
+# Source1-md5: 27b5dba9342cf6461c5847667f7340e2
 Patch0:                libbrotli-update.patch
 URL:           https://github.com/google/brotli/
 BuildRequires: autoconf >= 2.57
@@ -140,7 +140,7 @@ CXX="%{__cxx}" \
 CFLAGS="%{rpmcflags}" \
 CXXFLAGS="%{rpmcxxflags}" \
 CPPFLAGS="%{rpmcppflags}" \
-%{__make} -C tools
+%{__make}
 
 %if %{with python2}
 %py_build
@@ -155,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C libbrotli/build install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install -D tools/bro $RPM_BUILD_ROOT%{_bindir}/bro
+install -D bin/bro $RPM_BUILD_ROOT%{_bindir}/bro
 
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libbrotli*.la
@@ -175,7 +175,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.md docs/draft-alakuijala-brotli-04.txt
+%doc README.md docs/brotli-comparison-study-2015-09-22.pdf
 %attr(755,root,root) %{_bindir}/bro
 
 %files -n libbrotli
@@ -204,12 +204,12 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python-brotli
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/brotli.so
-%{py_sitedir}/Brotli-0.1.0-py*.egg-info
+%{py_sitedir}/Brotli-0.5.2-py*.egg-info
 %endif
 
 %if %{with python3}
 %files -n python3-brotli
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py3_sitedir}/brotli.cpython-*.so
-%{py3_sitedir}/Brotli-0.1.0-py*.egg-info
+%{py3_sitedir}/Brotli-0.5.2-py*.egg-info
 %endif

diff --git a/libbrotli-update.patch b/libbrotli-update.patch
index 7ce43002c4f16ae2e8b71b2858e116cb971efb34..b2a8c77535c84245b768fe59432a23c59f969965 100644 (file)
--- a/libbrotli-update.patch
+++ b/libbrotli-update.patch
@@ -1,40 +1,11 @@
---- libbrotli/Makefile.am.orig 2015-10-21 23:26:03.000000000 +0200
-+++ libbrotli/Makefile.am      2015-12-27 14:54:54.463549931 +0100
-@@ -5,16 +5,14 @@
- lib_LTLIBRARIES = libbrotlidec.la libbrotlienc.la
- 
- DECODE = brotli/dec/bit_reader.c brotli/dec/decode.c          \
--  brotli/dec/huffman.c brotli/dec/state.c brotli/dec/streams.c        \
--  brotli/dec/dictionary.c
-+  brotli/dec/huffman.c brotli/dec/state.c brotli/dec/streams.c
- 
- ENCODE = brotli/enc/backward_references.cc brotli/enc/histogram.cc    \
-  brotli/enc/block_splitter.cc brotli/enc/literal_cost.cc              \
-  brotli/enc/brotli_bit_stream.cc brotli/enc/metablock.cc              \
-  brotli/enc/encode.cc brotli/enc/static_dict.cc                               \
-  brotli/enc/encode_parallel.cc brotli/enc/streams.cc                  \
-- brotli/enc/entropy_encode.cc brotli/enc/dictionary.cc                        \
-- brotli/enc/utf8_util.cc
-+ brotli/enc/entropy_encode.cc
- 
- DECODEHEADERS = brotli/dec/decode.h brotli/dec/state.h                        \
-  brotli/dec/streams.h brotli/dec/types.h brotli/dec/bit_reader.h      \
-@@ -31,7 +29,7 @@
-  brotli/enc/literal_cost.h brotli/enc/cluster.h brotli/enc/bit_cost.h   \
-  brotli/enc/entropy_encode.h brotli/enc/brotli_bit_stream.h             \
-  brotli/enc/write_bits.h brotli/enc/static_dict_lut.h                   \
-- brotli/enc/encode_parallel.h brotli/enc/types.h
-+ brotli/enc/encode_parallel.h
- 
- EXTRA_DIST = AUTHORS README
- 
---- libbrotli/configure.ac.orig        2015-10-21 23:26:03.000000000 +0200
-+++ libbrotli/configure.ac     2015-12-27 14:49:22.816897181 +0100
+diff -urp libbrotli.orig/configure.ac libbrotli/configure.ac
+--- libbrotli.orig/configure.ac        2016-08-15 12:08:53.000000000 +0000
++++ libbrotli/configure.ac     2016-08-20 11:21:53.994554000 +0000
 @@ -1,6 +1,6 @@
  AC_PREREQ(2.57)
  
 -AC_INIT([libbrotli], [0.1.0], [-])
-+AC_INIT([libbrotli], [0.2.0], [-])
++AC_INIT([libbrotli], [0.5.2], [-])
  AC_CONFIG_SRCDIR([brotli/dec/decode.h])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_MACRO_DIR([m4])