Accepting request 214568 from home:scarabeus_iv

- Version bump to 1.3.93: * Various bugfixes to another RC release - Add patch wayland-1.3.93-resourcestest.patch fixing tests from upstream git - Cleanup the spec with spec-cleaner - Always run tests do not conditionalize them. They wether fail or not - Add missing dep on xsltproc as per configure OBS-URL: https://build.opensuse.org/request/show/214568 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=42
2014-01-21 12:04:42 +00:00 · 2014-01-21 12:04:42 +00:00 · 7924f39aa7
commit 7924f39aa7
parent 65c8ca47ff
5 changed files with 85 additions and 39 deletions
--- a/wayland-1.3.91.tar.xz
+++ b/wayland-1.3.91.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:209800291d73c607baacd398b16c1d9f8e0090514e3f64718a6b420d640ce7c7
-size 421068
--- a/wayland-1.3.93-resourcestest.patch
+++ b/wayland-1.3.93-resourcestest.patch
@ -0,0 +1,33 @@
+From 3b8a1c7fed80dc9465115888610b82cd2fed1bd0 Mon Sep 17 00:00:00 2001
+From: Kristian Høgsberg <krh@bitplanet.net>
+Date: Mon, 20 Jan 2014 23:07:55 +0000
+Subject: resources-test: Don't send invalid event
+
+Even if nothing receives the even, the arguments still need to be valid.
+The test is sending out event 0 from the wl_display interface, which is
+the error event.  This requires arg 0 to be a valid object and arg 2 to
+be a non-null string.  The test just leaves that undefined, causing
+intermittent test failures.
+
+As it is, the resource destroy test doesn't need to send an event to
+validate the various resource destroy hooks, so we can just remove the
+call to wl_resource_post_event() alltogether.
+
+Thanks to Matt Turner <mattst88@gmail.com> for pointing out the failure.
+---
+diff --git a/tests/resources-test.c b/tests/resources-test.c
+index 514c031..a6ce3ae 100644
+--- a/tests/resources-test.c
+++ b/tests/resources-test.c
+@@ -107,9 +107,6 @@ TEST(destroy_res_tst)
+ 	wl_resource_set_implementation(res, NULL, &destroyed, res_destroy_func);
+ 	wl_resource_add_destroy_listener(res, &destroy_listener);
+ 
+-	/* without implementation this should be ignored .. */
+-	wl_resource_post_event(res, 0);
+-
+ 	id = wl_resource_get_id(res);
+ 	link = wl_resource_get_link(res);
+ 	assert(link);
+--
+cgit v0.9.0.2-2-gbebe
--- a/wayland-1.3.93.tar.xz
+++ b/wayland-1.3.93.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98b8eda896b1e33a4e301ef81c233afa117ea031f3e3f2cb71108ff936d68cab
+size 421292
--- a/wayland.changes
+++ b/wayland.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jan 21 11:10:29 UTC 2014 - tchvatal@suse.com
+
+- Version bump to 1.3.93:
+  * Various bugfixes to another RC release
+- Add patch wayland-1.3.93-resourcestest.patch fixing tests from
+  upstream git
+- Cleanup the spec with spec-cleaner
+- Always run tests do not conditionalize them. They wether fail or
+  not
+- Add missing dep on xsltproc as per configure
+
 -------------------------------------------------------------------
 Tue Dec 24 21:15:33 UTC 2013 - jengelh@inai.de

--- a/wayland.spec
+++ b/wayland.spec
@ -1,7 +1,7 @@
 #
 # spec file for package wayland
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@ -16,29 +16,30 @@
 #


-Name:           wayland
 %define lname	libwayland0
-Version:        1.3.91
+Name:           wayland
+Version:        1.3.93
 Release:        0
 Summary:        Wayland Compositor Infrastructure
 License:        HPND
 Group:          Development/Libraries/C and C++
 Url:            http://wayland.freedesktop.org/
-
 #Git-Clone:	git://anongit.freedesktop.org/wayland/wayland
 #Git-Web:	http://cgit.freedesktop.org/wayland/wayland/
-Source:         http://wayland.freedesktop.org/releases/%name-%version.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source:         http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
+Patch0:         wayland-1.3.93-resourcestest.patch
 #git#BuildRequires:  autoconf >= 2.64
 #git#BuildRequires:  automake >= 1.11
 #git#BuildRequires:  libtool >= 2.2
 BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  libexpat-devel
 BuildRequires:  libxml2-tools
+BuildRequires:  libxslt-tools
 BuildRequires:  pkgconfig
 BuildRequires:  xz
+BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(libffi)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
 Wayland is a protocol for a compositor to talk to its clients as well
@ -85,9 +86,9 @@ fullscreen) or other display servers.
 %package devel
 Summary:        Development files for the Wayland Compositor Infrastructure
 Group:          Development/Libraries/C and C++
-Requires:       libwayland-client0 = %version
-Requires:       libwayland-cursor0 = %version
-Requires:       libwayland-server0 = %version
+Requires:       libwayland-client0 = %{version}
+Requires:       libwayland-cursor0 = %{version}
+Requires:       libwayland-server0 = %{version}

 %description devel
 Wayland is a protocol for a compositor to talk to its clients as well
@ -102,61 +103,61 @@ to develop applications that require these.

 %prep
 %setup -q
+%patch0 -p1

 %build
 if [ ! -e configure ]; then
 	autoreconf -fi;
 fi;
-# Ensure people will use pkgconfig to locate headers
-%configure --disable-static --includedir="%_includedir/pkg/%name"
-make %{?_smp_mflags}
+%configure --disable-static --includedir="%{_includedir}/pkg/%{name}"
+make %{?_smp_mflags} V=1

 %install
-b="%buildroot";
-make install DESTDIR="$b";
-rm -f "$b/%_libdir"/*.la;
-%fdupes %buildroot/%_prefix
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
+%fdupes %{buildroot}/%{_prefix}

 %check
 %if !0%{?qemu_user_space_build}
-mkdir -m go-rwx xdg
+mkdir xdg
+chmod 700 xdg
 export XDG_RUNTIME_DIR="$PWD/xdg"
-if ! make check %{?_smp_mflags}; then
-	cat tests/test-suite.log
-	prj="%_project"
-	# Ignore testsuite errors in the develprj
-	if [ "${prj:0:8}" = "openSUSE" ]; then exit 1; fi
-fi
+make check %{?_smp_mflags} V=1
 %endif

 %post -n libwayland-client0 -p /sbin/ldconfig
+
 %postun -n libwayland-client0 -p /sbin/ldconfig
+
 %post -n libwayland-cursor0 -p /sbin/ldconfig
+
 %postun -n libwayland-cursor0 -p /sbin/ldconfig
+
 %post -n libwayland-server0 -p /sbin/ldconfig
+
 %postun -n libwayland-server0 -p /sbin/ldconfig

 %files -n libwayland-client0
 %defattr(-,root,root)
-%_libdir/libwayland-client.so.0*
+%{_libdir}/libwayland-client.so.0*

 %files -n libwayland-cursor0
 %defattr(-,root,root)
-%_libdir/libwayland-cursor.so.0*
+%{_libdir}/libwayland-cursor.so.0*

 %files -n libwayland-server0
 %defattr(-,root,root)
-%_libdir/libwayland-server.so.0*
+%{_libdir}/libwayland-server.so.0*

 %files devel
 %defattr(-,root,root)
-%_bindir/wayland-scanner
-%_includedir/pkg/
-%_libdir/libwayland-*.so
-%_libdir/pkgconfig/wayland-*.pc
-%_datadir/aclocal/
-%_datadir/pkgconfig/wayland-*.pc
-%_datadir/wayland/
-%_mandir/man3/wl_*.3*
+%{_bindir}/wayland-scanner
+%{_includedir}/pkg/
+%{_libdir}/libwayland-*.so
+%{_libdir}/pkgconfig/wayland-*.pc
+%{_datadir}/aclocal/
+%{_datadir}/pkgconfig/wayland-*.pc
+%{_datadir}/wayland/
+%{_mandir}/man3/wl_*.3*

 %changelog