From 9c82b951466f2bb889d2a04b239c35410fa92a3cae44f8bf27ad958e8c1f47fa Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 24 Jul 2018 08:43:35 +0000 Subject: [PATCH 1/2] Accepting request 624953 from home:pluskalm:branches:Archiving - Use cmake macros for building and tests OBS-URL: https://build.opensuse.org/request/show/624953 OBS-URL: https://build.opensuse.org/package/show/Archiving/brotli?expand=0&rev=11 --- brotli.changes | 5 +++++ brotli.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/brotli.changes b/brotli.changes index a895660..76b6883 100644 --- a/brotli.changes +++ b/brotli.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 24 07:55:04 UTC 2018 - mpluskal@suse.com + +- Use cmake macros for building and tests + ------------------------------------------------------------------- Thu Jun 28 11:04:51 UTC 2018 - mpluskal@suse.com diff --git a/brotli.spec b/brotli.spec index 84940aa..195b8b7 100644 --- a/brotli.spec +++ b/brotli.spec @@ -94,7 +94,7 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932. -DCMAKE_INSTALL_LIBDIR:PATH="%{_libdir}" \ -DBROTLI_DISABLE_TESTS:BOOL=off \ -DCMAKE_SKIP_RPATH:BOOL=off -make %{?_smp_mflags} +%make_jobs %install %cmake_install @@ -111,8 +111,7 @@ done %endif %check -cd build -make test +%ctest %post -n libbrotlicommon%{sover} -p /sbin/ldconfig %postun -n libbrotlicommon%{sover} -p /sbin/ldconfig From efe0a11192556b629c294b82c3cda63df302e7ca8342aa38c145f244e2ca8fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 25 Jul 2018 13:33:43 +0000 Subject: [PATCH 2/2] Accepting request 625287 from home:iznogood:branches:Archiving - Add baselibs.conf, build 32bit library support. OBS-URL: https://build.opensuse.org/request/show/625287 OBS-URL: https://build.opensuse.org/package/show/Archiving/brotli?expand=0&rev=12 --- baselibs.conf | 4 ++++ brotli.changes | 5 +++++ brotli.spec | 1 + 3 files changed, 10 insertions(+) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..d8e03b8 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,4 @@ +libbrotlicommon1 +libbrotlidec1 +libbrotlienc1 + diff --git a/brotli.changes b/brotli.changes index 76b6883..be55a08 100644 --- a/brotli.changes +++ b/brotli.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 25 13:14:15 UTC 2018 - bjorn.lie@gmail.com + +- Add baselibs.conf, build 32bit library support. + ------------------------------------------------------------------- Tue Jul 24 07:55:04 UTC 2018 - mpluskal@suse.com diff --git a/brotli.spec b/brotli.spec index 195b8b7..fb7560d 100644 --- a/brotli.spec +++ b/brotli.spec @@ -27,6 +27,7 @@ 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 +Source99: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.6 BuildRequires: gcc-c++