Accepting request 284079 from X11:Wayland

- Update to new upstream prerelease 1.6.92
* More documentation updates
(but we're not building them anymore now ;-)

OBS-URL: https://build.opensuse.org/request/show/284079
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wayland?expand=0&rev=20

wayland-1.6.91.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb8b4ecdab1e8bba2bd01fc564e4b198c57a82da6f77d5ddaadb0ec73daa5283
-size 427816

wayland-1.6.92.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c3e823c9bd4b36c5c63549be8b9a3af386d0a2477b65ae2f7a8a2387e0e0c4b
+size 363868

wayland.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb  2 10:20:12 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream prerelease 1.6.92
+* More documentation updates
+
 -------------------------------------------------------------------
 Tue Jan 27 21:19:36 UTC 2015 - jengelh@inai.de
 

wayland.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package wayland
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,12 @@
 
 %define lname	libwayland0
 Name:           wayland
-Version:        1.6.91
+Version:        1.6.92
 Release:        0
 Summary:        Wayland Compositor Infrastructure
 License:        HPND
 Group:          Development/Libraries/C and C++
-URL:            http://wayland.freedesktop.org/
+Url:            http://wayland.freedesktop.org/
 
 #Git-Clone:	git://anongit.freedesktop.org/wayland/wayland
 #Git-Web:	http://cgit.freedesktop.org/wayland/wayland/
@@ -32,15 +32,18 @@ Source3:        baselibs.conf
 #git#BuildRequires:  autoconf >= 2.64
 #git#BuildRequires:  automake >= 1.11
 #git#BuildRequires:  libtool >= 2.2
-BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  libxml2-tools
 BuildRequires:  libxslt-tools
-BuildRequires:  pkgconfig
+BuildRequires:  pkg-config
-BuildRequires:  xz xmlto
+BuildRequires:  xz
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(libffi)
-BuildRoot:      %_tmppath/%name-%version-build
+%define with_doc 0
+%if 0%with_doc
+BuildRequires:  doxygen graphviz-gnome xmlto
+%endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Wayland is a protocol for a compositor to talk to its clients as well
@@ -118,8 +121,12 @@ if [ ! -e configure ]; then
 	autoreconf -fi;
 fi;
 %configure --disable-static --includedir="%_includedir/%name" \
+%if %with_doc
 	--docdir="%_defaultdocdir/%name"
-make %{?_smp_mflags} V=1
+%else
+	--disable-documentation
+%endif
+make %{?_smp_mflags}
 
 %install
 make DESTDIR="%buildroot" install %{?_smp_mflags}
@@ -128,10 +135,10 @@ find "%buildroot" -type f -name "*.la" -delete -print
 
 %check
 %if !0%{?qemu_user_space_build}
-mkdir xdg
+mkdir -p xdg/wayland-tests
-chmod 700 xdg
+chmod 700 xdg xdg/wayland-tests
 export XDG_RUNTIME_DIR="$PWD/xdg"
-if ! make check %{?_smp_mflags} V=1; then
+if ! make check V=1; then
 	cat test-suite.log
 	exit 1
 fi
@@ -165,10 +172,12 @@ fi
 %_datadir/aclocal/
 #%_datadir/pkgconfig/wayland-*.pc
 %_datadir/wayland/
-%_mandir/man3/wl_*.3*
 
+%if %with_doc
 %files doc
 %defattr(-,root,root)
-%_docdir/wayland/
+%_mandir/man3/wl*.3*
+%_docdir/%name/
+%endif
 
 %changelog