- updated to 0.4.0; added -x11* subpackages

diff --git a/xorg-lib-libxkbcommon.spec b/xorg-lib-libxkbcommon.spec
index 62827c5ebcaf13c707e99171dd72b0e8a5b3e6c7..160b2b4c9aff2d89615ef48263051c2353624311 100644 (file)
--- a/xorg-lib-libxkbcommon.spec
+++ b/xorg-lib-libxkbcommon.spec
@@ -1,12 +1,12 @@
 Summary:       xkbcommon library - keymap compiler and support library
 Summary(pl.UTF-8):     Biblioteka xkbcommon - kompilatora i obsługi map klawiszy
 Name:          xorg-lib-libxkbcommon
-Version:       0.3.2
+Version:       0.4.0
 Release:       1
 License:       MIT
 Group:         X11/Libraries
 Source0:       http://xkbcommon.org/download/libxkbcommon-%{version}.tar.xz
-# Source0-md5: 935cf416354bf05210de2e389484f7e8
+# Source0-md5: bb782f1700e45b4f57c84ef513e3cf85
 URL:           http://xkbcommon.org/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake
@@ -14,6 +14,7 @@ BuildRequires:        bison
 BuildRequires: doxygen
 BuildRequires: flex
 BuildRequires: libtool >= 2:2.0
+BuildRequires: libxcb-devel >= 1.10
 BuildRequires: pkgconfig >= 1:0.19
 BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-proto-kbproto-devel >= 1.0.4
@@ -38,14 +39,10 @@ Group:              X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description devel
-xkbcommon library.
-
 This package contains the header files needed to develop programs that
 use libxkbcommon.
 
 %description devel -l pl.UTF-8
-Biblioteka xkbcommon.
-
 Pakiet zawiera pliki nagłówkowe niezbędne do kompilowania programów
 używających biblioteki libxkbcommon.
 
@@ -56,15 +53,61 @@ Group:              X11/Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-xkbcommon library.
-
 This package contains the static libxkbcommon library.
 
 %description static -l pl.UTF-8
-Biblioteka xkbcommon.
-
 Pakiet zawiera statyczną bibliotekę libxkbcommon.
 
+%package x11
+Summary:       X11 support for XKB library
+Summary(pl.UTF-8):     Obsługa X11 dla biblioteki XKB
+Group:         X11/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libxcb >= 1.10
+
+%description x11
+X11 support for XKB library.
+
+%description x11 -l pl.UTF-8
+Obsługa X11 dla biblioteki XKB.
+
+%package x11-devel
+Summary:       Header file for libxkbcommon-x11 library
+Summary(pl.UTF-8):     Plik nagłówkowy biblioteki libxkbcommon-x11
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-x11 = %{version}-%{release}
+Requires:      libxcb-devel >= 1.10
+
+%description x11-devel
+Header file for libxkbcommon-x11 library.
+
+%description x11-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki libxkbcommon-x11.
+
+%package x11-static
+Summary:       Static libxkbcommon-x11 library
+Summary(pl.UTF-8):     Statyczna biblioteka libxkbcommon-x11
+Group:         X11/Development/Libraries
+Requires:      %{name}-x11-devel = %{version}-%{release}
+
+%description x11-static
+Static libxkbcommon-x11 library.
+
+%description x11-static -l pl.UTF-8
+Statyczna biblioteka libxkbcommon-x11.
+
+%package apidocs
+Summary:       API documentation for libxkbcommon libraries
+Summary(pl.UTF-8):     Dokumentacja API bibliotek libxkbcommon
+Group:         Documentation
+
+%description apidocs
+API documentation for libxkbcommon libraries.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API bibliotek libxkbcommon.
+
 %prep
 %setup -q -n libxkbcommon-%{version}
 
@@ -85,8 +128,8 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libxkbcommon.la
-# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libxkbcommon*.la
+# packaged as %doc in -apidocs
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libxkbcommon
 
 %clean
@@ -95,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post  x11 -p /sbin/ldconfig
+%postun x11 -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc COPYING NEWS README
@@ -103,11 +149,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/html/*
 %attr(755,root,root) %{_libdir}/libxkbcommon.so
-%{_includedir}/xkbcommon
+%dir %{_includedir}/xkbcommon
+%{_includedir}/xkbcommon/xkbcommon.h
+%{_includedir}/xkbcommon/xkbcommon-compat.h
+%{_includedir}/xkbcommon/xkbcommon-keysyms.h
+%{_includedir}/xkbcommon/xkbcommon-names.h
 %{_pkgconfigdir}/xkbcommon.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libxkbcommon.a
+
+%files x11
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libxkbcommon-x11.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxkbcommon-x11.so.0
+
+%files x11-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libxkbcommon-x11.so
+%{_includedir}/xkbcommon/xkbcommon-x11.h
+%{_pkgconfigdir}/xkbcommon-x11.pc
+
+%files x11-static
+%defattr(644,root,root,755)
+%{_libdir}/libxkbcommon-x11.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/html/*