- appriopriate wayland-egl has been released (in Mesa 9.0); completed 0.95.0 update

diff --git a/weston.spec b/weston.spec
index 93887b7c57bb4252f333a8f79200404f8d6bdc3b..48c4ee7d724a582be558165fe590d2a202daee71 100644 (file)
--- a/weston.spec
+++ b/weston.spec
@@ -7,13 +7,13 @@
 %bcond_without wlaunch         # weston launch
 %bcond_without xwayland        # X server launcher
 %bcond_without sclients        # simple clients
-%bcond_with    clients         # non-simple + full GL clients
+%bcond_without clients         # non-simple + full GL clients
 #
 Summary:       Weston - Wayland demos
 Summary(pl.UTF-8):     Weston - programy demonstracyjne dla protokołu Wayland
 Name:          weston
 Version:       0.95.0
-Release:       0.1
+Release:       1
 License:       MIT
 Group:         Applications
 Source0:       http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
@@ -22,7 +22,7 @@ URL:          http://wayland.freedesktop.org/
 BuildRequires: Mesa-libEGL-devel >= 7.10
 BuildRequires: Mesa-libGLES-devel
 # for wayland and sclients, but also desktop-shell, which is always enabled
-BuildRequires: Mesa-libwayland-egl-devel >= 8.1
+BuildRequires: Mesa-libwayland-egl-devel >= 9
 BuildRequires: cairo-devel >= 1.10.0
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -32,11 +32,12 @@ BuildRequires:      pkgconfig
 BuildRequires: tar >= 1:1.22
 # wayland-server always; wayland-client if with_wayland || with_sclients || with_clients; wayland-cursor if with_clients
 BuildRequires: wayland-devel = 0.95.0
+BuildRequires: xorg-lib-libxkbcommon-devel
 BuildRequires: xz
 %if %{with drm}
 BuildRequires: Mesa-libgbm-devel
 BuildRequires: mtdev-devel >= 1.1.0
-BuildRequires: udev-devel >= 136
+BuildRequires: udev-devel >= 1:136
 BuildRequires: libdrm-devel >= 2.4.30
 %endif
 %if %{with openwfd}
@@ -55,13 +56,15 @@ BuildRequires:      systemd-devel
 %endif
 %if %{with xwayland}
 BuildRequires: libxcb-devel
+BuildRequires: pkgconfig(cairo-xcb)
+BuildRequires: xorg-lib-libXcursor-devel
 %endif
 %if %{with clients}
-# optionally cairo-egl >= 1.11.3, [cairo-gl or cairo-glesv2]
+BuildRequires: cairo-devel >= 1.11.3
 BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: glib2-devel >= 2.0
+BuildRequires: pkgconfig(cairo-egl) >= 1.11.3
 BuildRequires: poppler-glib-devel
-BuildRequires  xorg-lib-libxkbcommon-devel
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -107,11 +110,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
+%attr(755,root,root) %{_bindir}/wcap-decode
 # composer
 %attr(755,root,root) %{_bindir}/weston
+%if %{with wlaunch}
+%attr(755,root,root) %{_bindir}/weston-launch
+%endif
 %if %{with clients}
 %attr(755,root,root) %{_bindir}/weston-terminal
 %attr(755,root,root) %{_libexecdir}/weston-desktop-shell
+%attr(755,root,root) %{_libexecdir}/weston-screensaver
+%attr(755,root,root) %{_libexecdir}/weston-screenshooter
 %attr(755,root,root) %{_libexecdir}/weston-tablet-shell
 %endif
 %dir %{_libdir}/weston
@@ -127,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with x11}
 %attr(755,root,root) %{_libdir}/weston/x11-backend.so
 %endif
+%if %{with xwayland}
+%attr(755,root,root) %{_libdir}/weston/xwayland.so
+%endif
 %attr(755,root,root) %{_libdir}/weston/desktop-shell.so
 %attr(755,root,root) %{_libdir}/weston/tablet-shell.so
 %{_datadir}/weston
@@ -137,16 +149,17 @@ rm -rf $RPM_BUILD_ROOT
 #%attr(755,root,root) %{_bindir}/simple-shm
 #%attr(755,root,root) %{_bindir}/simple-touch
 %if %{with clients}
+#%attr(755,root,root) %{_bindir}/clickdot
 #%attr(755,root,root) %{_bindir}/dnd
+#%attr(755,root,root) %{_bindir}/editor
 #%attr(755,root,root) %{_bindir}/eventdemo
 #%attr(755,root,root) %{_bindir}/flower
 #%attr(755,root,root) %{_bindir}/image
+#%attr(755,root,root) %{_bindir}/keyboard
 #%attr(755,root,root) %{_bindir}/resizor
-#%attr(755,root,root) %{_bindir}/screenshot
 #%attr(755,root,root) %{_bindir}/smoke
 # "full GL" clients
 #%attr(755,root,root) %{_bindir}/gears
-#%attr(755,root,root) %{_bindir}/wscreensaver
 # poppler
 #%attr(755,root,root) %{_bindir}/view
 %endif