- updated to 1.2.1 (note: API changes, Mesa 9.2 requires patching)

- added publican patch

diff --git a/wayland-publican.patch b/wayland-publican.patch
index fec036f828fe769da3ca600ce9f5fb4c3c538495..6c4b8c312a867a3f8b8b239950fb7bd80ac566d8 100644 (file)
--- a/wayland-publican.patch
+++ b/wayland-publican.patch
@@ -1,40 +1,12 @@
---- wayland-1.0.1/doc/Wayland/Makefile.am.orig 2012-11-24 10:19:59.220881103 +0100
-+++ wayland-1.0.1/doc/Wayland/Makefile.am      2012-11-24 10:20:45.210880145 +0100
-@@ -62,7 +62,7 @@
+Build only HTML; PDF requires patched qt4.
+--- wayland-1.2.1/doc/publican/Makefile.am.orig        2013-07-29 19:38:05.000000000 +0200
++++ wayland-1.2.1/doc/publican/Makefile.am     2013-09-25 18:22:49.347339417 +0200
+@@ -96,7 +96,7 @@
        $(AM_V_GEN)$(PUBLICAN) rename --name Wayland \
                --version "$(WAYLAND_VERSION_MAJOR).$(WAYLAND_VERSION_MINOR)" \
                --config $(builddir)/publican-copy.cfg
--      $(AM_V_GEN)$(PUBLICAN) build --quiet --lang en-US --format html,pdf \
+-      $(AM_V_GEN)$(PUBLICAN) build --quiet --langs en-US --formats html,pdf \
 +      $(AM_V_GEN)$(PUBLICAN) build --quiet --langs en-US --formats html \
                --config $(builddir)/publican-copy.cfg
        @touch Wayland
  
---- wayland-1.0.0/doc/Wayland/en-US/Revision_History.xml.orig  1970-01-01 01:00:00.000000000 +0100
-+++ wayland-1.0.0/doc/Wayland/en-US/Revision_History.xml       2012-11-02 17:51:40.432494222 +0100
-@@ -0,0 +1,26 @@
-+<?xml version='1.0' encoding='utf-8' ?>
-+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-+<!ENTITY % BOOK_ENTITIES SYSTEM "Wayland.ent">
-+%BOOK_ENTITIES;
-+]>
-+<appendix id="appe-Wayland-Revision_History">
-+      <title>Revision History</title>
-+      <simpara>
-+              <revhistory>
-+                      <revision>
-+                              <revnumber>0-0</revnumber>
-+                              <date>Thu Feb 23 2012</date>
-+                              <author>
-+                                      <firstname>Dude</firstname>
-+                                      <surname>McPants</surname>
-+                                      <email>Dude.McPants@example.com</email>
-+                              </author>
-+                              <revdescription>
-+                                      <simplelist>
-+                                              <member>Initial creation of book by publican</member>
-+                                      </simplelist>
-+                              </revdescription>
-+                      </revision>
-+              </revhistory>
-+      </simpara>
-+</appendix>

diff --git a/wayland.spec b/wayland.spec
index fcc37e55b37912144f8e757a1ae3d7bc646f9f74..07508e8a57060c6a2e3dab1272d4536e3763409b 100644 (file)
--- a/wayland.spec
+++ b/wayland.spec
@@ -6,12 +6,12 @@
 Summary:       Wayland - protocol for a compositor to talk to its clients
 Summary(pl.UTF-8):     Wayland - protokół między serwerem składającym a klientami
 Name:          wayland
-Version:       1.0.6
-Release:       3
+Version:       1.2.1
+Release:       1
 License:       MIT
 Group:         Libraries
 Source0:       http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 936a2590aea69fa3c0cf234d54b9137c
+# Source0-md5: dc75d060f23c0ef17ae95307cd525240
 Patch0:                %{name}-publican.patch
 Patch1:                %{name}-man.patch
 URL:           http://wayland.freedesktop.org/
@@ -83,10 +83,6 @@ Dokumentacja API biblioteki oraz protokołu Wayland.
 
 %prep
 %setup -q
-
-# this file is required by publican 3.0; publican patch adds it in en-US dir
-test ! -f doc/Wayland/en_US/Revision_History.xml
-
 %patch0 -p1
 %patch1 -p1
 
@@ -141,13 +137,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libwayland-cursor.so
 %attr(755,root,root) %{_libdir}/libwayland-server.so
 %{_includedir}/wayland-*.h
+%dir %{_datadir}/wayland
+%{_datadir}/wayland/wayland-scanner.mk
 %{_pkgconfigdir}/wayland-client.pc
 %{_pkgconfigdir}/wayland-cursor.pc
 %{_pkgconfigdir}/wayland-server.pc
+%{_npkgconfigdir}/wayland-scanner.pc
 %{_aclocaldir}/wayland-scanner.m4
-%{_aclocaldir}/wayland-scanner.mk
-%{_mandir}/man3/wl_display_connect.3*
-%{_mandir}/man3/wl_display_connect_to_fd*
+%{_mandir}/man3/wl_*.3*
 
 %if %{with static_libs}
 %files static
@@ -160,5 +157,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc doc/Wayland/Wayland/en-US/html/*
+%doc doc/publican/Wayland/en-US/html/*
 %endif