From 9d847be79cbbfb9acb81feedd3bd9a4266b6b6b59013c5322ae6dc0d165f3ff1 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 3 Jan 2018 20:26:39 +0000
Subject: [PATCH] - Merge devel subpackages as libbrotli-devel

OBS-URL: https://build.opensuse.org/package/show/Archiving/brotli?expand=0&rev=3
---
 brotli.changes |  5 +++++
 brotli.spec    | 60 ++++++++++++++------------------------------------
 2 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/brotli.changes b/brotli.changes
index 247d4d6..f51e336 100644
--- a/brotli.changes
+++ b/brotli.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  3 20:25:21 UTC 2018 - jengelh@inai.de
+
+- Merge devel subpackages as libbrotli-devel
+
 -------------------------------------------------------------------
 Sat Dec 30 00:16:35 UTC 2017 - jengelh@inai.de
 
diff --git a/brotli.spec b/brotli.spec
index 15eaef5..2172399 100644
--- a/brotli.spec
+++ b/brotli.spec
@@ -47,16 +47,6 @@ Group:		System/Libraries
 %description -n libbrotlicommon%{_soname}
 Common library for the Brotli general purpose lossless data compression algorithm.
 
-%package -n libbrotlicommon-devel
-Summary:        Common Development Files and Headers for Brotli
-Group:          Development/Libraries/C and C++
-Requires:       libbrotlicommon%{_soname} = %{version}-%{release}
-
-%description -n libbrotlicommon-devel
-Common development and header files for the Brotli general purpose lossless data compression algorithm.
-
-The specification of the Brotli Compressed Data Format is defined in RFC 7932.
-
 %package -n libbrotlidec%{_soname}
 Summary:        Library for Brotli Decompression
 Group:          System/Libraries
@@ -66,17 +56,6 @@ Decompression library for the Brotli general purpose lossless data compression a
 
 The specification of the Brotli Compressed Data Format is defined in RFC 7932.
 
-%package -n libbrotlidec-devel
-Summary:        Development and Header Files for Brotli Decompression
-Group:          Development/Libraries/C and C++
-Requires:       libbrotlidec%{_soname} = %{version}-%{release}
-
-%description -n libbrotlidec-devel
-Development and header files for decompressing data compressed with the Brotli general purpose lossless
-data compression algorithm.
-
-The specification of the Brotli Compressed Data Format is defined in RFC 7932.
-
 %package -n libbrotlienc%{_soname}
 Summary:        Library for Brotli Compression
 Group:          System/Libraries
@@ -86,13 +65,20 @@ Compression library for the Brotli general purpose lossless data compression alg
 
 The specification of the Brotli Compressed Data Format is defined in RFC 7932.
 
-%package -n libbrotlienc-devel
+%package -n libbrotli-devel
 Summary:        Development and Header Files for Brotli Compression
 Group:          Development/Libraries/C and C++
 Requires:       libbrotlienc%{_soname} = %{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 libbrotlienc-devel
-Development and headers files for compressing data using the Brotli general purpose lossless data compression algorithm.
+%description -n libbrotli-devel
+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.
 
@@ -143,35 +129,21 @@ make test
 %defattr(0644,root,root,755)
 %{_libdir}/libbrotlicommon.so.*
 
-%files -n libbrotlicommon-devel
-%defattr(0644,root,root,755)
-%{_libdir}/libbrotlicommon.so
-%{_libdir}/pkgconfig/libbrotlicommon.pc
-%dir %{_includedir}/brotli
-%{_includedir}/brotli/port.h
-%{_includedir}/brotli/types.h
-%{_mandir}/man3/types.h.3%{ext_man}
-
 %files -n libbrotlidec%{_soname}
 %defattr(0644,root,root,755)
 %{_libdir}/libbrotlidec.so.*
 
-%files -n libbrotlidec-devel
-%defattr(0644,root,root,755)
-%{_libdir}/libbrotlidec.so
-%{_libdir}/pkgconfig/libbrotlidec.pc
-%{_includedir}/brotli/decode.h
-%{_mandir}/man3/decode.h.3%{ext_man}
-
 %files -n libbrotlienc%{_soname}
 %defattr(0644,root,root,755)
 %{_libdir}/libbrotlienc.so.*
 
-%files -n libbrotlienc-devel
+%files -n libbrotli-devel
 %defattr(0644,root,root,755)
+%{_includedir}/brotli/
+%{_libdir}/libbrotlicommon.so
+%{_libdir}/libbrotlidec.so
 %{_libdir}/libbrotlienc.so
-%{_libdir}/pkgconfig/libbrotlienc.pc
-%{_includedir}/brotli/encode.h
-%{_mandir}/man3/encode.h.3%{ext_man}
+%{_libdir}/pkgconfig/*.pc
+%{_mandir}/man3/*.3%{ext_man}
 
 %changelog