diff --git a/libxkbcommon.changes b/libxkbcommon.changes index ee22890..d546bbc 100644 --- a/libxkbcommon.changes +++ b/libxkbcommon.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 9 16:36:07 UTC 2014 - jengelh@inai.de + +- Switch to library versioning as described in Shared Library + Packaging guidelines. This permits installation of multiple + libxkbcommons. + ------------------------------------------------------------------- Thu Aug 21 19:31:26 UTC 2014 - dimstar@opensuse.org diff --git a/libxkbcommon.spec b/libxkbcommon.spec index 536e7d8..fed5567 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -19,6 +19,7 @@ Name: libxkbcommon Version: 0.4.3 Release: 0 +%define lver 0_4_3 Summary: Library for handling xkb descriptions License: MIT Group: Development/Libraries/C and C++ @@ -51,11 +52,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 libxkbcommon0 +%package -n libxkbcommon-%lver Summary: Library for handling xkb descriptions Group: System/Libraries -%description -n libxkbcommon0 +%description -n libxkbcommon-%lver 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 @@ -64,18 +65,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 libxkbcommon-x11-0 +%package -n libxkbcommon-x11-%lver Summary: Library for handling xkb descriptions using XKB-X11 Group: System/Libraries -%description -n libxkbcommon-x11-0 +%description -n libxkbcommon-x11-%lver 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: libxkbcommon0 = %version-%release +Requires: libxkbcommon-%lver = %version-%release %description devel xkbcommon is a keymap handling library, which can parse XKB @@ -92,7 +93,7 @@ in libxkbcommon. %package x11-devel Summary: Development files for the libxkbcommon-x11 library Group: Development/Libraries/C and C++ -Requires: libxkbcommon-x11-0 = %version-%release +Requires: libxkbcommon-x11-%lver = %version-%release %description x11-devel xkbcommon is a keymap handling library, which can parse XKB @@ -116,24 +117,21 @@ extra_opts=--disable-x11 %endif # Ensure people will use pkgconfig to locate headers. %configure --disable-static --includedir="%_includedir/pkg/%name" $extra_opts -# libxkbcommon has added symbols between 0.2.0..0.4.2 without maintenance; -# force some versioning. -echo "V_%version { global: *; };" >xkb.sym -make %{?_smp_mflags} V=1 LDFLAGS="-Wl,--version-script=$PWD/xkb.sym" +make %{?_smp_mflags} V=1 AM_LDFLAGS="-release %version" %install make install DESTDIR="%buildroot"; rm -f "%buildroot/%_libdir"/*.la; -%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 +%post -n libxkbcommon-%lver -p /sbin/ldconfig +%postun -n libxkbcommon-%lver -p /sbin/ldconfig +%post -n libxkbcommon-x11-%lver -p /sbin/ldconfig +%postun -n libxkbcommon-x11-%lver -p /sbin/ldconfig -%files -n libxkbcommon0 +%files -n libxkbcommon-%lver %defattr(-,root,root) %doc COPYING NEWS -%_libdir/libxkbcommon.so.0* +%_libdir/libxkbcommon-%version.so %files devel %defattr(-,root,root) @@ -146,10 +144,10 @@ rm -f "%buildroot/%_libdir"/*.la; %_libdir/pkgconfig/xkbcommon.pc %if 0%{?suse_version} >= 1315 -%files -n libxkbcommon-x11-0 +%files -n libxkbcommon-x11-%lver %defattr(-,root,root) %doc COPYING NEWS -%_libdir/libxkbcommon-x11.so.* +%_libdir/libxkbcommon-x11-%version.so %endif %if 0%{?suse_version} >= 1315