From 95b1d7ea4be75cde46ff3fb6d7b36361092517ee Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Tue, 24 Apr 2012 16:54:19 +0100
Subject: [PATCH] Update to a git snapshot based on 0.89.0

---
 wayland-install-compositor.patch | 18 ------------------
 wayland-no-clients.patch         | 18 ------------------
 wayland.spec                     | 12 +++++++++---
 3 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 wayland-install-compositor.patch
 delete mode 100644 wayland-no-clients.patch

diff --git a/wayland-install-compositor.patch b/wayland-install-compositor.patch
deleted file mode 100644
index 60bc8f2..0000000
--- a/wayland-install-compositor.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up wayland-20101123/compositor/Makefile.am.jx wayland-20101123/compositor/Makefile.am
---- wayland-20101123/compositor/Makefile.am.jx	2010-11-22 21:54:15.000000000 -0500
-+++ wayland-20101123/compositor/Makefile.am	2010-11-23 10:46:02.000000000 -0500
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = compositor
-+bin_PROGRAMS = compositor
- 
- INCLUDES =					\
- 	-I$(top_srcdir)/wayland			\
-@@ -22,7 +22,7 @@ compositor_SOURCES =				\
- 	drm.c					\
- 	shm.c
- 
--udevdir = $(sysconfdir)/udev
-+udevdir = $(sysconfdir)/udev/rules.d
- 
- dist_udev_DATA =				\
- 	70-wayland.rules
diff --git a/wayland-no-clients.patch b/wayland-no-clients.patch
deleted file mode 100644
index 49a4323..0000000
--- a/wayland-no-clients.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up wayland-20101111/configure.ac.jx wayland-20101111/configure.ac
---- wayland-20101111/configure.ac.jx	2010-11-10 08:42:17.000000000 -0500
-+++ wayland-20101111/configure.ac	2010-11-11 17:12:56.000000000 -0500
-@@ -57,6 +57,5 @@ AC_CONFIG_FILES([wayland/wayland-server.
- 		 Makefile
- 		 wayland/Makefile
- 		 compositor/Makefile
--		 clients/Makefile
- 		 data/Makefile])
- AC_OUTPUT
-diff -up wayland-20101111/Makefile.am.jx wayland-20101111/Makefile.am
---- wayland-20101111/Makefile.am.jx	2010-11-10 08:42:17.000000000 -0500
-+++ wayland-20101111/Makefile.am	2010-11-11 17:13:07.000000000 -0500
-@@ -1,3 +1,3 @@
--SUBDIRS = wayland compositor clients data
-+SUBDIRS = wayland compositor data
- 
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/wayland.spec b/wayland.spec
index cc5f131..5bf7591 100644
--- a/wayland.spec
+++ b/wayland.spec
@@ -1,7 +1,7 @@
-#global gitdate 20120217
+%global gitdate 20120424
 
 Name:           wayland
-Version:        0.85.0
+Version:        0.89.0
 Release:        1%{?gitdate:.%{gitdate}}%{?dist}
 Summary:        Wayland Compositor Infrastructure
 
@@ -18,6 +18,7 @@ Source1:        make-git-snapshot.sh
 BuildRequires:  autoconf automake libtool
 BuildRequires:  pkgconfig(libffi)
 BuildRequires:  expat-devel
+BuildRequires:  libxslt
 
 Provides:       %{name}-common = %{version}-%{release}
 Obsoletes:      %{name}-common < 0.85.0
@@ -69,7 +70,7 @@ rm spec/.gitignore
 
 %build
 autoreconf -v --install
-%configure --disable-static
+%configure --disable-static --enable-documentation
 make %{?_smp_mflags}
 
 
@@ -92,12 +93,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README TODO spec
+%doc %{_datadir}/doc/wayland/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/wayland-scanner
 %{_includedir}/wayland-util.h
 %{_includedir}/wayland-egl.h
+%{_includedir}/wayland-version.h
 %{_datadir}/aclocal/wayland-scanner.m4
 %{_datadir}/aclocal/wayland-scanner.mk
 
@@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/wayland-server.pc
 
 %changelog
+* Tue Apr 24 2012 Richard Hughes <rhughes@redhat.com> - 0.89.0-1
+- Update to a git snapshot based on 0.89.0
+
 * Sat Feb 18 2012 Thorsten Leemhuis <fedora@leemhuis.info> - 0.85.0-1
 - update to 0.85.0
 - adjust license, as upstream changed it to MIT