llyyr/wayland
SHA256
1
0
Fork 0
forked from jengelh/wayland
Code Pull Requests Activity

Rework changelog; rework double Requires for different versions.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=89
This commit is contained in:
Jan Engelhardt 2018-11-21 17:58:49 +00:00 committed by Git OBS Bridge
parent e2d727cc37
commit 018b8881fb
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wayland.changes
View File

@ -1,9 +1,11 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 20 12:57:23 UTC 2018 - sndirsch@suse.com Tue Nov 20 12:57:23 UTC 2018 - sndirsch@suse.com
- Set libwayland-egl1 version to 18.x.x_{%wayland_version} until - Downgrades do not work in SLES service packs, because the SP0
wayland becomes bigger; needed due to Mesa providing this repo remains enabled for SP1. (This is unlike Leap, where a 15.1
package in the past as version 18.0.2/18.1.5 (sle15/TW) system will have no 15.0 directories.) As such, to force the
upgrade from Mesa:libwayland-egl1 to wayland:libwayland-egl1,
the number in wayland is bumped to >18.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 19 17:12:57 UTC 2018 - sndirsch@suse.com Mon Nov 19 17:12:57 UTC 2018 - sndirsch@suse.com

21
wayland.spec
View File

@ -16,19 +16,12 @@
# #
%define _version 1.16.0 %define _version 1.16.0
# Set this to back to _version for SLEap 16.
### Set this to _version (or do a specfile cleanup) once wayland becomes %define eglversion 99~%_version
### bigger. Reason for this: In the past we've built the libwayland-egl1
### package by Mesa (version 18.0.2/18.1.5)
%if 0%{?suse_version} >= 1550
%define eglversion 18.1.5_%{_version}
%else
%define eglversion 18.0.2_%{_version}
%endif
%define lname libwayland0 %define lname libwayland0
Name: wayland Name: wayland
Version: %{_version} Version: %_version
Release: 0 Release: 0
Summary: Wayland Compositor Infrastructure Summary: Wayland Compositor Infrastructure
License: MIT License: MIT
@ -92,7 +85,7 @@ to get buffer for each cursor image.
%package -n libwayland-egl1 %package -n libwayland-egl1
Summary: Additional egl functions for wayland Summary: Additional egl functions for wayland
Group: System/Libraries Group: System/Libraries
Version: %{eglversion} Version: %eglversion
%description -n libwayland-egl1 %description -n libwayland-egl1
This package provides additional functions for EGL-using programs This package provides additional functions for EGL-using programs
@ -116,8 +109,7 @@ Summary: Development files for the Wayland Compositor Infrastructure
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libwayland-client0 = %_version Requires: libwayland-client0 = %_version
Requires: libwayland-cursor0 = %_version Requires: libwayland-cursor0 = %_version
Requires: libwayland-egl1 = %{eglversion} Requires: libwayland-egl1 = %eglversion
Requires: libwayland-egl1 = %_version
Requires: libwayland-server0 = %_version Requires: libwayland-server0 = %_version
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
@ -150,8 +142,7 @@ This subpackage contains the documentation to Wayland.
%prep %prep
%setup -q %setup -q
# ugly, I know :-( sed -i 's/<eglversion>/%eglversion/' "%_sourcedir/baselibs.conf"
sed -i 's/<eglversion>/%{eglversion}/' "%{_sourcedir}/baselibs.conf"
%build %build
if [ ! -e configure ]; then if [ ! -e configure ]; then