Kill %lname when there is more than one library.

Give the libxkbcommon-x11 subpackages a better description.
%post does not need to be guarded.

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=6
This commit is contained in:
Jan Engelhardt 2014-03-08 19:04:36 +00:00 committed by Git OBS Bridge
parent 4d1405b680
commit d7e0047fcb

View File

@ -17,7 +17,6 @@
Name: libxkbcommon
%define lname libxkbcommon0
Version: 0.4.0
Release: 0
Summary: Library for handling xkb descriptions
@ -52,11 +51,11 @@ should be perfectly usable for client toolkits, as well as alternative
windowing systems, compositors and system-level clients such as
Wayland and kmscon.
%package -n %lname
%package -n libxkbcommon0
Summary: Library for handling xkb descriptions
Group: System/Libraries
%description -n %lname
%description -n libxkbcommon0
xkbcommon is a keymap handling library, which can parse XKB
descriptions (e.g. from xkeyboard-config), and use this to help its
users make sense of their keyboard input. Unfortunately, X11's
@ -65,19 +64,18 @@ should be perfectly usable for client toolkits, as well as alternative
windowing systems, compositors and system-level clients such as
Wayland and kmscon.
%package -n %name-x11-0
Summary: Library for handling xkb descriptions
%package -n libxkbcommon-x11-0
Summary: Library for handling xkb descriptions using XKB-X11
Group: System/Libraries
%description -n %name-x11-0
xkbcommon is a keymap handling library, which can parse XKB
descriptions (e.g. from xkeyboard-config), and use this to help its
users make sense of their keyboard input.
%description -n libxkbcommon-x11-0
An addon library that supports creating keymaps with the XKB X11
protocol by querying the X server directly.
%package devel
Summary: Development files for the libxkbcommon library
Group: Development/Libraries/C and C++
Requires: %lname = %version
Requires: libxkbcommon0 = %version-%release
%description devel
xkbcommon is a keymap handling library, which can parse XKB
@ -89,12 +87,12 @@ windowing systems, compositors and system-level clients such as
Wayland and kmscon.
This package contains the development headers for the library found
in %lname.
in libxkbcommon.
%package x11-devel
Summary: Development files for the libxkbcommon library
Summary: Development files for the libxkbcommon-x11 library
Group: Development/Libraries/C and C++
Requires: %name-x11-0 = %version
Requires: libxkbcommon-x11-0 = %version-%release
%description x11-devel
xkbcommon is a keymap handling library, which can parse XKB
@ -124,15 +122,12 @@ make %{?_smp_mflags} V=1;
make install DESTDIR="%buildroot";
rm -f "%buildroot/%_libdir"/*.la;
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%post -n libxkbcommon0 -p /sbin/ldconfig
%postun -n libxkbcommon0 -p /sbin/ldconfig
%post -n libxkbcommon-x11-0 -p /sbin/ldconfig
%postun -n libxkbcommon-x11-0 -p /sbin/ldconfig
%if 0%{?suse_version} >= 1320
%post -n %name-x11-0 -p /sbin/ldconfig
%postun -n %name-x11-0 -p /sbin/ldconfig
%endif
%files -n %lname
%files -n libxkbcommon0
%defattr(-,root,root)
%_libdir/libxkbcommon.so.0*
@ -146,12 +141,17 @@ rm -f "%buildroot/%_libdir"/*.la;
%_libdir/pkgconfig/xkbcommon.pc
%if 0%{?suse_version} >= 1320
%files -n %name-x11-0
%files -n libxkbcommon-x11-0
%defattr(-,root,root)
%_libdir/libxkbcommon-x11.so.*
%endif
%if 0%{?suse_version} >= 1320
%files x11-devel
%defattr(-,root,root)
%dir %_includedir/pkg
%dir %_includedir/pkg/%name
%dir %_includedir/pkg/%name/xkbcommon
%_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h
%_libdir/libxkbcommon-x11.so
%_libdir/pkgconfig/xkbcommon-x11.pc