Hello community, here is the log from the commit of package libxkbcommon for openSUSE:Factory checked in at 2017-10-28 14:17:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxkbcommon (Old) and /work/SRC/openSUSE:Factory/.libxkbcommon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxkbcommon" Sat Oct 28 14:17:09 2017 rev:20 rq:535177 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libxkbcommon/libxkbcommon.changes 2017-08-12 20:03:12.541736251 +0200 +++ /work/SRC/openSUSE:Factory/.libxkbcommon.new/libxkbcommon.changes 2017-10-28 14:17:09.961464556 +0200 @@ -1,0 +2,5 @@ +Thu Oct 19 01:30:35 UTC 2017 - [email protected] + +- Allow building x11 subpackage on any distribution + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxkbcommon.spec ++++++ --- /var/tmp/diff_new_pack.Aa14Ba/_old 2017-10-28 14:17:10.577442030 +0200 +++ /var/tmp/diff_new_pack.Aa14Ba/_new 2017-10-28 14:17:10.581441884 +0200 @@ -16,6 +16,12 @@ # +%if ! 0%{?suse_version} || 0%{?suse_version} >= 1315 +%bcond_without x11 +%else +%bcond_with x11 +%endif + Name: libxkbcommon Version: 0.7.2 Release: 0 @@ -38,7 +44,7 @@ BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xproto) -%if 0%{?suse_version} >= 1315 +%if %{with x11} BuildRequires: pkgconfig(xcb-xkb) >= 1.10 %endif @@ -108,20 +114,20 @@ %build if [ ! -e configure ]; then - NOCONFIGURE=1 ./autogen.sh; -fi; -%if 0%{?suse_version} >= 1315 + NOCONFIGURE=1 ./autogen.sh +fi +%if %{with x11} extra_opts=--enable-x11 %else extra_opts=--disable-x11 %endif # Ensure people will use pkgconfig to locate headers. -%configure --disable-static --includedir="%_includedir/pkg/%name" $extra_opts +%configure --disable-static --includedir="%_includedir/%name" $extra_opts make %{?_smp_mflags} V=1 %install -make install DESTDIR="%buildroot"; -rm -f "%buildroot/%_libdir"/*.la; +%make_install +rm -f "%buildroot/%_libdir"/*.la %post -n libxkbcommon0 -p /sbin/ldconfig %postun -n libxkbcommon0 -p /sbin/ldconfig @@ -136,28 +142,25 @@ %files devel %defattr(-,root,root) %doc LICENSE NEWS -%_includedir/pkg/ -%if 0%{?suse_version} >= 1315 -%exclude %_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h +%_includedir/%name/ +%if %{with x11} +%exclude %_includedir/%name/xkbcommon/xkbcommon-x11.h %endif %_libdir/libxkbcommon.so %_libdir/pkgconfig/xkbcommon.pc -%if 0%{?suse_version} >= 1315 +%if %{with x11} %files -n libxkbcommon-x11-0 %defattr(-,root,root) %doc LICENSE NEWS %_libdir/libxkbcommon-x11.so.* -%endif -%if 0%{?suse_version} >= 1315 %files x11-devel %defattr(-,root,root) %doc LICENSE NEWS -%dir %_includedir/pkg -%dir %_includedir/pkg/%name -%dir %_includedir/pkg/%name/xkbcommon -%_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h +%dir %_includedir/%name +%dir %_includedir/%name/xkbcommon +%_includedir/%name/xkbcommon/xkbcommon-x11.h %_libdir/libxkbcommon-x11.so %_libdir/pkgconfig/xkbcommon-x11.pc %endif
