From 0724178eae97107b89eb5a864bd053c32cb00be180856be27ca79c17104f123f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 14 Dec 2018 10:24:30 +0000 Subject: [PATCH 1/2] Accepting request 658008 from home:AndreasStieger:branches:Archiving brotli 1.0.7 OBS-URL: https://build.opensuse.org/request/show/658008 OBS-URL: https://build.opensuse.org/package/show/Archiving/brotli?expand=0&rev=14 --- brotli-1.0.5.tar.gz | 3 --- brotli-1.0.7.tar.gz | 3 +++ brotli.changes | 11 +++++++++++ brotli.spec | 36 ++++++++++++++++-------------------- 4 files changed, 30 insertions(+), 23 deletions(-) delete mode 100644 brotli-1.0.5.tar.gz create mode 100644 brotli-1.0.7.tar.gz diff --git a/brotli-1.0.5.tar.gz b/brotli-1.0.5.tar.gz deleted file mode 100644 index c70a6cb..0000000 --- a/brotli-1.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d5bedd48edb909fe3b87cb99f7d139b987ef6f1616b7e22d74e928270a2fd20 -size 23825684 diff --git a/brotli-1.0.7.tar.gz b/brotli-1.0.7.tar.gz new file mode 100644 index 0000000..98f9eb9 --- /dev/null +++ b/brotli-1.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c +size 23827908 diff --git a/brotli.changes b/brotli.changes index be55a08..6b8a576 100644 --- a/brotli.changes +++ b/brotli.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Dec 14 10:06:08 UTC 2018 - astieger@suse.com + +- brotli 1.0.7: + * faster decoding on ARM + * improved precision of window size calculation in CLI +- includes changes from 1.0.6: + * fix unaligned 64-bit accesses on AArch32 + * add ASAN/MSAN unaligned read specializations + * fix JDK 8<->9 incompatibility + ------------------------------------------------------------------- Wed Jul 25 13:14:15 UTC 2018 - bjorn.lie@gmail.com diff --git a/brotli.spec b/brotli.spec index fb7560d..2d0ab37 100644 --- a/brotli.spec +++ b/brotli.spec @@ -18,21 +18,19 @@ %define sover 1 - Name: brotli -Version: 1.0.5 +Version: 1.0.7 Release: 0 Summary: Lossless Compression Algorithm License: MIT Group: Productivity/Archiving/Compression -Url: https://github.com/google/brotli +URL: https://github.com/google/brotli Source0: https://github.com/google/brotli/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source99: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.6 BuildRequires: gcc-c++ BuildRequires: gzip -BuildRequires: pkg-config +BuildRequires: pkgconfig %description This package contains the brotli command line utility to compress and decompress data with the brotli compression algorithm. @@ -74,12 +72,12 @@ Group: Development/Libraries/C and C++ Requires: libbrotlicommon%{sover} = %{version}-%{release} Requires: libbrotlidec%{sover} = %{version}-%{release} Requires: libbrotlienc%{sover} = %{version}-%{release} -Provides: libbrotlicommon-devel = %version-%release -Provides: libbrotlidec-devel = %version-%release -Provides: libbrotlienc-devel = %version-%release -Obsoletes: libbrotlicommon-devel < %version-%release -Obsoletes: libbrotlidec-devel < %version-%release -Obsoletes: libbrotlienc-devel < %version-%release +Provides: libbrotlicommon-devel = %{version}-%{release} +Provides: libbrotlidec-devel = %{version}-%{release} +Provides: libbrotlienc-devel = %{version}-%{release} +Obsoletes: libbrotlicommon-devel < %{version}-%{release} +Obsoletes: libbrotlidec-devel < %{version}-%{release} +Obsoletes: libbrotlienc-devel < %{version}-%{release} %description -n libbrotli-devel Development and headers files for (de)compressing data using the @@ -102,12 +100,12 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932. rm %{buildroot}%{_libdir}/libbrotli*-static.a %if 0%{?suse_version} > 1315 for i in docs/{brotli.1,decode.h.3,encode.h.3,types.h.3}; do - install -D -t %{buildroot}%{_datadir}/man/man$(echo $i | sed 's:.*\.\([^\.]\)$:\1:') $i + install -D -t %{buildroot}%{_mandir}/man$(echo $i | sed 's:.*\.\([^\.]\)$:\1:') $i done %else -mkdir -p %{buildroot}%{_datadir}/man/man{1,3} +mkdir -p %{buildroot}%{_mandir}/man{1,3} for i in docs/{brotli.1,decode.h.3,encode.h.3,types.h.3}; do - cp $i %{buildroot}%{_datadir}/man/man$(echo $i | sed 's:.*\.\([^\.]\)$:\1:') + cp $i %{buildroot}%{_mandir}/man$(echo $i | sed 's:.*\.\([^\.]\)$:\1:') done %endif @@ -116,18 +114,16 @@ done %post -n libbrotlicommon%{sover} -p /sbin/ldconfig %postun -n libbrotlicommon%{sover} -p /sbin/ldconfig - %post -n libbrotlidec%{sover} -p /sbin/ldconfig %postun -n libbrotlidec%{sover} -p /sbin/ldconfig - %post -n libbrotlienc%{sover} -p /sbin/ldconfig %postun -n libbrotlienc%{sover} -p /sbin/ldconfig %files %defattr(0644,root,root,755) -%doc LICENSE -%attr(755,root,root) /usr/bin/brotli -%{_mandir}/man1/brotli.1%{ext_man} +%license LICENSE +%attr(755,root,root) %{_bindir}/brotli +%{_mandir}/man1/brotli.1%{?ext_man} %files -n libbrotlicommon%{sover} %defattr(0644,root,root,755) @@ -148,6 +144,6 @@ done %{_libdir}/libbrotlidec.so %{_libdir}/libbrotlienc.so %{_libdir}/pkgconfig/*.pc -%{_mandir}/man3/*.3%{ext_man} +%{_mandir}/man3/*.3%{?ext_man} %changelog From f6acf6de255e9c08661ad450dd7841c35c478a0df294f75165586c7bf6d43334 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 14 Dec 2018 11:34:42 +0000 Subject: [PATCH 2/2] - Avoid bashisms, install manpages without +x bit, get rid of wrap descriptions, feed through cleaner. OBS-URL: https://build.opensuse.org/package/show/Archiving/brotli?expand=0&rev=15 --- brotli.changes | 6 +++ brotli.spec | 136 ++++++++++++++++++++++++------------------------- 2 files changed, 73 insertions(+), 69 deletions(-) diff --git a/brotli.changes b/brotli.changes index 6b8a576..24da558 100644 --- a/brotli.changes +++ b/brotli.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 14 11:01:35 UTC 2018 - Jan Engelhardt + +- Avoid bashisms, install manpages without +x bit, get rid of + wrap descriptions, feed through cleaner. + ------------------------------------------------------------------- Fri Dec 14 10:06:08 UTC 2018 - astieger@suse.com diff --git a/brotli.spec b/brotli.spec index 2d0ab37..395f701 100644 --- a/brotli.spec +++ b/brotli.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,43 +25,51 @@ Summary: Lossless Compression Algorithm License: MIT Group: Productivity/Archiving/Compression URL: https://github.com/google/brotli -Source0: https://github.com/google/brotli/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source: https://github.com/google/brotli/archive/v%version.tar.gz#/%name-%version.tar.gz Source99: baselibs.conf BuildRequires: cmake >= 2.8.6 BuildRequires: gcc-c++ BuildRequires: gzip -BuildRequires: pkgconfig +BuildRequires: pkg-config %description -This package contains the brotli command line utility to compress and decompress data with the brotli compression algorithm. +This package contains the brotli command line utility to compress and +decompress data with the brotli compression algorithm. -Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant -of the LZ77 algorithm, Huffman coding and 2nd order context modeling, with a compression ratio comparable to the best -currently available general-purpose compression methods. It is similar in speed with deflate but offers more dense compression. +Brotli is a generic-purpose lossless compression algorithm that +compresses data using a combination of a modern variant of the LZ77 +algorithm, Huffman coding and 2nd order context modeling, with a +compression ratio comparable to the best currently available +general-purpose compression methods. It is similar in speed with +deflate but offers more dense compression. -The specification of the Brotli Compressed Data Format is defined in RFC 7932. +The specification of the Brotli Compressed Data Format is defined in +RFC 7932. -%package -n libbrotlicommon%{sover} +%package -n libbrotlicommon%sover Summary: Common Library for Brotli Compression Group: System/Libraries -%description -n libbrotlicommon%{sover} -Common library for the Brotli general purpose lossless data compression algorithm. +%description -n libbrotlicommon%sover +Common library for the Brotli general purpose lossless data +compression algorithm. -%package -n libbrotlidec%{sover} +%package -n libbrotlidec%sover Summary: Library for Brotli Decompression Group: System/Libraries -%description -n libbrotlidec%{sover} -Decompression library for the Brotli general purpose lossless data compression algorithm. +%description -n libbrotlidec%sover +Decompression library for the Brotli general purpose lossless data +compression algorithm. -The specification of the Brotli Compressed Data Format is defined in RFC 7932. +The specification of the Brotli Compressed Data Format is defined in +RFC 7932. -%package -n libbrotlienc%{sover} +%package -n libbrotlienc%sover Summary: Library for Brotli Compression Group: System/Libraries -%description -n libbrotlienc%{sover} +%description -n libbrotlienc%sover Compression library for the Brotli general purpose lossless data compression algorithm. The specification of the Brotli Compressed Data Format is defined in RFC 7932. @@ -69,81 +77,71 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932. %package -n libbrotli-devel Summary: Development and Header Files for Brotli Compression Group: Development/Libraries/C and C++ -Requires: libbrotlicommon%{sover} = %{version}-%{release} -Requires: libbrotlidec%{sover} = %{version}-%{release} -Requires: libbrotlienc%{sover} = %{version}-%{release} -Provides: libbrotlicommon-devel = %{version}-%{release} -Provides: libbrotlidec-devel = %{version}-%{release} -Provides: libbrotlienc-devel = %{version}-%{release} -Obsoletes: libbrotlicommon-devel < %{version}-%{release} -Obsoletes: libbrotlidec-devel < %{version}-%{release} -Obsoletes: libbrotlienc-devel < %{version}-%{release} +Requires: libbrotlicommon%sover = %version-%release +Requires: libbrotlidec%sover = %version-%release +Requires: libbrotlienc%sover = %version-%release +Provides: libbrotlicommon-devel = %version-%release +Provides: libbrotlidec-devel = %version-%release +Provides: libbrotlienc-devel = %version-%release +Obsoletes: libbrotlicommon-devel < %version-%release +Obsoletes: libbrotlidec-devel < %version-%release +Obsoletes: libbrotlienc-devel < %version-%release %description -n libbrotli-devel -Development and headers files for (de)compressing data using the -Brotli general purpose lossless compression algorithm. +Development and headers files for (de)compressing data using the Brotli general +purpose lossless compression algorithm. The specification of the Brotli Compressed Data Format is defined in RFC 7932. %prep -%setup -q +%autosetup -p1 %build -%cmake -DCMAKE_INSTALL_PREFIX:PATH="%{_prefix}" \ - -DCMAKE_INSTALL_LIBDIR:PATH="%{_libdir}" \ - -DBROTLI_DISABLE_TESTS:BOOL=off \ - -DCMAKE_SKIP_RPATH:BOOL=off +%cmake %make_jobs %install %cmake_install -rm %{buildroot}%{_libdir}/libbrotli*-static.a -%if 0%{?suse_version} > 1315 -for i in docs/{brotli.1,decode.h.3,encode.h.3,types.h.3}; do - install -D -t %{buildroot}%{_mandir}/man$(echo $i | sed 's:.*\.\([^\.]\)$:\1:') $i -done -%else -mkdir -p %{buildroot}%{_mandir}/man{1,3} -for i in docs/{brotli.1,decode.h.3,encode.h.3,types.h.3}; do - cp $i %{buildroot}%{_mandir}/man$(echo $i | sed 's:.*\.\([^\.]\)$:\1:') -done -%endif +rm %buildroot/%_libdir/libbrotli*-static.a +mkdir -p "%buildroot/%_mandir/man1" "%buildroot/%_mandir/man3" +install -pm0644 docs/*.1 "%buildroot/%_mandir/man1/" +install -pm0644 docs/*.3 "%buildroot/%_mandir/man3/" %check %ctest -%post -n libbrotlicommon%{sover} -p /sbin/ldconfig -%postun -n libbrotlicommon%{sover} -p /sbin/ldconfig -%post -n libbrotlidec%{sover} -p /sbin/ldconfig -%postun -n libbrotlidec%{sover} -p /sbin/ldconfig -%post -n libbrotlienc%{sover} -p /sbin/ldconfig -%postun -n libbrotlienc%{sover} -p /sbin/ldconfig +%post -n libbrotlicommon%sover -p /sbin/ldconfig +%postun -n libbrotlicommon%sover -p /sbin/ldconfig +%post -n libbrotlidec%sover -p /sbin/ldconfig +%postun -n libbrotlidec%sover -p /sbin/ldconfig +%post -n libbrotlienc%sover -p /sbin/ldconfig +%postun -n libbrotlienc%sover -p /sbin/ldconfig %files -%defattr(0644,root,root,755) +%defattr(-,root,root) %license LICENSE -%attr(755,root,root) %{_bindir}/brotli -%{_mandir}/man1/brotli.1%{?ext_man} +%_bindir/brotli +%_mandir/man1/brotli.1* -%files -n libbrotlicommon%{sover} -%defattr(0644,root,root,755) -%{_libdir}/libbrotlicommon.so.* +%files -n libbrotlicommon%sover +%defattr(-,root,root) +%_libdir/libbrotlicommon.so.* -%files -n libbrotlidec%{sover} -%defattr(0644,root,root,755) -%{_libdir}/libbrotlidec.so.* +%files -n libbrotlidec%sover +%defattr(-,root,root) +%_libdir/libbrotlidec.so.* -%files -n libbrotlienc%{sover} -%defattr(0644,root,root,755) -%{_libdir}/libbrotlienc.so.* +%files -n libbrotlienc%sover +%defattr(-,root,root) +%_libdir/libbrotlienc.so.* %files -n libbrotli-devel -%defattr(0644,root,root,755) -%{_includedir}/brotli/ -%{_libdir}/libbrotlicommon.so -%{_libdir}/libbrotlidec.so -%{_libdir}/libbrotlienc.so -%{_libdir}/pkgconfig/*.pc -%{_mandir}/man3/*.3%{?ext_man} +%defattr(-,root,root) +%_includedir/brotli/ +%_libdir/libbrotlicommon.so +%_libdir/libbrotlidec.so +%_libdir/libbrotlienc.so +%_libdir/pkgconfig/*.pc +%_mandir/man3/*.3* %changelog