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

Accepting request 229335 from home:mlin7442:branches:X11:Wayland

Browse Source 
replace %suse_version >= 1320 to 1315 in order to build -x11 package for SLE12

OBS-URL: https://build.opensuse.org/request/show/229335
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=10
This commit is contained in:
Jan Engelhardt 2014-04-08 08:41:58 +00:00 committed by Git OBS Bridge
parent 75e60e063f
commit 0373d8cd5f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libxkbcommon.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 8 06:02:33 UTC 2014 - mlin@suse.com
- Replace %suse_version >= 1320 to 1315 in order to build -x11 package
for SLE12
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 4 01:16:43 UTC 2014 - hrvoje.senjan@gmail.com Fri Apr 4 01:16:43 UTC 2014 - hrvoje.senjan@gmail.com

10
libxkbcommon.spec
View File

@ -38,7 +38,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} >= 1320 %if 0%{?suse_version} >= 1315
BuildRequires: pkgconfig(xcb-xkb) >= 1.10 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
%endif %endif
@ -109,7 +109,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} >= 1320 %if 0%{?suse_version} >= 1315
extra_opts= extra_opts=
%else %else
extra_opts=--disable-x11 extra_opts=--disable-x11
@ -134,19 +134,19 @@ rm -f "%buildroot/%_libdir"/*.la;
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%_includedir/pkg/ %_includedir/pkg/
%if 0%{?suse_version} >= 1320 %if 0%{?suse_version} >= 1315
%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} >= 1320 %if 0%{?suse_version} >= 1315
%files -n libxkbcommon-x11-0 %files -n libxkbcommon-x11-0
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libxkbcommon-x11.so.* %_libdir/libxkbcommon-x11.so.*
%endif %endif
%if 0%{?suse_version} >= 1320 %if 0%{?suse_version} >= 1315
%files x11-devel %files x11-devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %_includedir/pkg %dir %_includedir/pkg