jengelh/libxkbcommon
SHA256
1
0
Fork 0
forked from pool/libxkbcommon
Code Pull Requests Activity

Accepting request 535058 from home:jayvdb:Qt5

Browse Source 
- Allow building x11 subpackage on any distribution

OBS-URL: https://build.opensuse.org/request/show/535058
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=37
This commit is contained in:
Jan Engelhardt 2017-10-19 06:48:02 +00:00 committed by Git OBS Bridge
parent 41554fa5cd
commit e71f75b2be
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libxkbcommon.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 19 01:30:35 UTC 2017 - jayvdb@gmail.com
- Allow building x11 subpackage on any distribution
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 7 16:29:12 UTC 2017 - jengelh@inai.de Mon Aug 7 16:29:12 UTC 2017 - jengelh@inai.de

18
libxkbcommon.spec
View File

@ -15,6 +15,12 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%if ! 0%{?suse_version} || 0%{?suse_version} >= 1315
%bcond_without x11
%else
%bcond_with x11
%endif
Name: libxkbcommon Name: libxkbcommon
Version: 0.7.2 Version: 0.7.2
@ -38,7 +44,7 @@ BuildRequires: xz
BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(xkeyboard-config)
BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(xproto)
%if 0%{?suse_version} >= 1315 %if %{with x11}
BuildRequires: pkgconfig(xcb-xkb) >= 1.10 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
%endif %endif
@ -90,6 +96,7 @@ Wayland and kmscon.
This package contains the development headers for the library found This package contains the development headers for the library found
in libxkbcommon. in libxkbcommon.
%if %{with x11}
%package x11-devel %package x11-devel
Summary: Development files for the libxkbcommon-x11 library Summary: Development files for the libxkbcommon-x11 library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -102,6 +109,7 @@ users make sense of their keyboard input.
This package contains the development headers for the library found This package contains the development headers for the library found
in %name-x11-0. in %name-x11-0.
%endif
%prep %prep
%setup -q %setup -q
@ -110,7 +118,7 @@ in %name-x11-0.
if [ ! -e configure ]; then if [ ! -e configure ]; then
NOCONFIGURE=1 ./autogen.sh; NOCONFIGURE=1 ./autogen.sh;
fi; fi;
%if 0%{?suse_version} >= 1315 %if %{with x11}
extra_opts=--enable-x11 extra_opts=--enable-x11
%else %else
extra_opts=--disable-x11 extra_opts=--disable-x11
@ -137,20 +145,20 @@ rm -f "%buildroot/%_libdir"/*.la;
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE NEWS %doc LICENSE NEWS
%_includedir/pkg/ %_includedir/pkg/
%if 0%{?suse_version} >= 1315 %if %{with x11}
%exclude %_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h %exclude %_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h
%endif %endif
%_libdir/libxkbcommon.so %_libdir/libxkbcommon.so
%_libdir/pkgconfig/xkbcommon.pc %_libdir/pkgconfig/xkbcommon.pc
%if 0%{?suse_version} >= 1315 %if %{with x11}
%files -n libxkbcommon-x11-0 %files -n libxkbcommon-x11-0
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE NEWS %doc LICENSE NEWS
%_libdir/libxkbcommon-x11.so.* %_libdir/libxkbcommon-x11.so.*
%endif %endif
%if 0%{?suse_version} >= 1315 %if %{with x11}
%files x11-devel %files x11-devel
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE NEWS %doc LICENSE NEWS