commit 66b43ac93d0444252cf8355f2d5cc34ef88dd565
Author: Jan Palus <[email protected]>
Date: Sat Feb 13 12:53:58 2021 +0100
up to 1.19.0
- switched to meson
- don't package wayland-*.h man pages -- upstream explicitly drops them
with comment they are not meant for packaging and they don't seem to
be referenced anymore
wayland-man.patch | 11 -----------
wayland-missing.patch | 10 ----------
wayland.spec | 52 ++++++++++++++-------------------------------------
3 files changed, 14 insertions(+), 59 deletions(-)
---
diff --git a/wayland.spec b/wayland.spec
index d4ed070..87d1aa8 100644
--- a/wayland.spec
+++ b/wayland.spec
@@ -6,29 +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.18.0
-Release: 3
+Version: 1.19.0
+Release: 1
License: MIT
Group: Libraries
#Source0Download: https://wayland.freedesktop.org/releases.html
Source0:
https://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 23317697b6e3ff2e1ac8c5ba3ed57b65
-Patch0: %{name}-missing.patch
-Patch1: %{name}-man.patch
+# Source0-md5: 5d59ac3d8a8f4e42de2ceb8bb19dfca9
URL: https://wayland.freedesktop.org/
-BuildRequires: autoconf >= 2.64
-BuildRequires: automake >= 1:1.11
BuildRequires: expat-devel >= 1.95
BuildRequires: libffi-devel >= 3
-BuildRequires: libtool >= 2:2.2
# for DTD valudation
BuildRequires: libxml2-devel >= 2.0
+BuildRequires: meson >= 0.52.1
+BuildRequires: ninja
BuildRequires: pkgconfig
%if %{with apidocs}
BuildRequires: docbook-style-xsl-nons
BuildRequires: doxygen >= 1.6.0
BuildRequires: graphviz >= 2.26.0
BuildRequires: libxslt-progs
+BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: xmlto
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -129,39 +127,19 @@ Dokumentacja API biblioteki oraz protokołu Wayland.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-
-# force regeneration (.so link is broken, double man3/)
-%{__rm} doc/man/*.3
%build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- %{!?with_apidocs:--disable-documentation} \
- --disable-silent-rules \
- %{?with_static_libs:--enable-static}
-
-%{__make}
+%meson build \
+ %{!?with_apidocs:-Ddocumentation=false} \
+ %{!?with_static_libs:--default-library=shared}
+
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%if %{with apidocs}
-# referenced by some installed wl_*.3 man pages
-cp -p
doc/doxygen/man/man3/wayland-{client,client-core,server,server-core,util}.h.3 \
- doc/doxygen/man/man3/wayland-{client,server,shm,util}.c.3
$RPM_BUILD_ROOT%{_mandir}/man3
-%endif
+%ninja_install -C build
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libwayland-*.la
%if %{with apidocs}
# packaged as %doc in -devel
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/wayland
@@ -175,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING README TODO
+%doc COPYING CONTRIBUTING.md README
%attr(755,root,root) %{_libdir}/libwayland-client.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libwayland-client.so.0
%attr(755,root,root) %{_libdir}/libwayland-cursor.so.*.*.*
@@ -204,8 +182,6 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/wayland-server.pc
%{_aclocaldir}/wayland-scanner.m4
%if %{with apidocs}
-%{_mandir}/man3/wayland-*.c.3*
-%{_mandir}/man3/wayland-*.h.3*
%{_mandir}/man3/wl_*.3*
%endif
# NOTE: temporarily here because they're used but not included in Mesa 18.1.x
@@ -224,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
-%doc doc/publican/Wayland/en-US/html/*
+%doc build/doc/publican/html/* doc/publican/sources/{css,images}
%endif
%files egl
diff --git a/wayland-man.patch b/wayland-man.patch
deleted file mode 100644
index 37cc3d4..0000000
--- a/wayland-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wayland-1.18.0/doc/man/Makefile.am.orig 2020-02-14 16:57:11.597516684
+0100
-+++ wayland-1.18.0/doc/man/Makefile.am 2020-02-14 16:59:24.780128505 +0100
-@@ -30,7 +30,7 @@
- XSLTPROC_PROCESS_MAN = \
- $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(DOCS_STYLESHEET) $< && \
-- $(SED) -i -e 's/^\.so \(.*\)\.\(.\)$$/\.so man\2\/\1\.\2/'
$(MANPAGES_ALIASES)
-+ $(SED) -i -e 's/^\.so \([^/]*\)\.\(.\)$$/\.so man\2\/\1\.\2/'
$(MANPAGES_ALIASES)
-
- %.1: %.xml
- $(XSLTPROC_PROCESS_MAN)
diff --git a/wayland-missing.patch b/wayland-missing.patch
deleted file mode 100644
index b058459..0000000
--- a/wayland-missing.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- wayland-1.13.0/doc/doxygen/Makefile.am.orig 2016-12-10
01:46:13.000000000 +0100
-+++ wayland-1.13.0/doc/doxygen/Makefile.am 2017-05-24 21:41:53.934460430
+0200
-@@ -9,6 +9,7 @@
- dist_noinst_DATA = wayland.doxygen.in
-
- scanned_src_files_shared = \
-+ $(top_srcdir)/src/wayland-util.c \
- $(top_srcdir)/src/wayland-util.h
-
- scanned_src_files_Client = \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wayland.git/commitdiff/a1de3cf4477d904cc93de1842f7b74a931c1e25b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
