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

Accepting request 535177 from X11:Wayland

Browse Source 
- Allow building x11 subpackage on any distribution

OBS-URL: https://build.opensuse.org/request/show/535177
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libxkbcommon?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2017-10-28 12:17:09 +00:00 committed by Git OBS Bridge
commit a49b93bbc8
2 changed files with 25 additions and 17 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

37
libxkbcommon.spec
View File

@ -16,6 +16,12 @@
# #
%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
Release: 0 Release: 0
@ -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
@ -108,20 +114,20 @@ in %name-x11-0.
%build %build
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
%endif %endif
# Ensure people will use pkgconfig to locate headers. # 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 make %{?_smp_mflags} V=1
%install %install
make install DESTDIR="%buildroot"; %make_install
rm -f "%buildroot/%_libdir"/*.la; rm -f "%buildroot/%_libdir"/*.la
%post -n libxkbcommon0 -p /sbin/ldconfig %post -n libxkbcommon0 -p /sbin/ldconfig
%postun -n libxkbcommon0 -p /sbin/ldconfig %postun -n libxkbcommon0 -p /sbin/ldconfig
@ -136,28 +142,25 @@ rm -f "%buildroot/%_libdir"/*.la;
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE NEWS %doc LICENSE NEWS
%_includedir/pkg/ %_includedir/%name/
%if 0%{?suse_version} >= 1315 %if %{with x11}
%exclude %_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h %exclude %_includedir/%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
%if 0%{?suse_version} >= 1315
%files x11-devel %files x11-devel
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE NEWS %doc LICENSE NEWS
%dir %_includedir/pkg %dir %_includedir/%name
%dir %_includedir/pkg/%name %dir %_includedir/%name/xkbcommon
%dir %_includedir/pkg/%name/xkbcommon %_includedir/%name/xkbcommon/xkbcommon-x11.h
%_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h
%_libdir/libxkbcommon-x11.so %_libdir/libxkbcommon-x11.so
%_libdir/pkgconfig/xkbcommon-x11.pc %_libdir/pkgconfig/xkbcommon-x11.pc
%endif %endif