commit 73f3d2c89f4e3673197fdcb8b66c1e95b015cf6b
Author: Jakub Bogusz <[email protected]>
Date: Thu Feb 26 16:14:17 2015 +0100
- updated to 1.7.0
- removed outdated publican patch
wayland-publican.patch | 12 ------------
wayland.spec | 24 ++++++++++++++----------
2 files changed, 14 insertions(+), 22 deletions(-)
---
diff --git a/wayland.spec b/wayland.spec
index 1b4e905..6d26e88 100644
--- a/wayland.spec
+++ b/wayland.spec
@@ -6,25 +6,27 @@
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.6.1
-Release: 2
+Version: 1.7.0
+Release: 1
License: MIT
Group: Libraries
Source0:
http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: feaa0754fe49931a3fe5aa98f7d1e0e9
-Patch0: %{name}-publican.patch
+# Source0-md5: 6f46ac47c3a18c6503a40b5fa58a1066
Patch1: %{name}-man.patch
URL: http://wayland.freedesktop.org/
BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1:1.11
-BuildRequires: docbook-style-xsl
-BuildRequires: doxygen
BuildRequires: expat-devel >= 1.95
-BuildRequires: libffi-devel
+BuildRequires: libffi-devel >= 3
BuildRequires: libtool >= 2:2.2
-BuildRequires: libxslt-progs
BuildRequires: pkgconfig
-%{?with_apidocs:BuildRequires: publican >= 3}
+%if %{with apidocs}
+BuildRequires: docbook-style-xsl
+BuildRequires: doxygen >= 1.6.0
+BuildRequires: graphviz >= 2.26.0
+BuildRequires: libxslt-progs
+BuildRequires: xmlto
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -82,7 +84,6 @@ Dokumentacja API biblioteki oraz protokołu Wayland.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
# force regeneration (.so link is broken, double man3/)
@@ -97,6 +98,7 @@ Dokumentacja API biblioteki oraz protokołu Wayland.
%{__autoheader}
%{__automake}
%configure \
+ %{!?with_apidocs:--disable-documentation} \
--disable-silent-rules \
%{!?with_static_libs:--disable-static}
@@ -150,8 +152,10 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/wayland-scanner.pc
%{_pkgconfigdir}/wayland-server.pc
%{_aclocaldir}/wayland-scanner.m4
+%if %{with apidocs}
%{_mandir}/man3/wayland-util.h.3*
%{_mandir}/man3/wl_*.3*
+%endif
%if %{with static_libs}
%files static
diff --git a/wayland-publican.patch b/wayland-publican.patch
deleted file mode 100644
index ffc2dbd..0000000
--- a/wayland-publican.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 --langs en-US --pdftool fop
--formats html,pdf \
-+ $(AM_V_GEN)$(PUBLICAN) build --quiet --langs en-US --formats html \
- --config $(builddir)/publican-copy.cfg
- @touch Wayland
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wayland.git/commitdiff/73f3d2c89f4e3673197fdcb8b66c1e95b015cf6b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
