X-Git-Url: https://git.pld-linux.org/?p=packages%2Fwayland.git;a=blobdiff_plain;f=wayland.spec;h=c7a8a5d96a14aa17821abd181acda66da257deec;hp=458d611bf0d0d21322c358a9276b1f58a89bd729;hb=HEAD;hpb=614d2ec8ad256d205a8df3e34d89b31e8aa3adce

diff --git a/wayland.spec b/wayland.spec
index 458d611..c7a8a5d 100644
--- a/wayland.spec
+++ b/wayland.spec
@@ -6,29 +6,32 @@
 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.15.0
-Release:	3
+Version:	1.22.0
+Release:	1
 License:	MIT
 Group:		Libraries
-Source0:	https://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	b7393c17fdce9a8d383edab656c92fd2
-Patch0:		%{name}-missing.patch
-Patch1:		%{name}-man.patch
+#Source0Download: https://gitlab.freedesktop.org/wayland/wayland/-/releases/
+Source0:	https://gitlab.freedesktop.org/wayland/wayland/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
+# Source0-md5:	7410ab549e3928fce9381455b17b0803
 URL:		https://wayland.freedesktop.org/
-BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake >= 1:1.11
+BuildRequires:	automake
 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.56.0
+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:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xmlto
+BuildRequires:	xz
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -78,7 +81,7 @@ Statyczne biblioteki Wayland.
 Summary:	Wayland EGL library
 Summary(pl.UTF-8):	Biblioteka Wayland EGL
 Group:		Libraries
-Obsoletes:	Mesa-libwayland-egl
+Obsoletes:	Mesa-libwayland-egl < 18.2
 
 %description egl
 Wayland EGL library.
@@ -92,7 +95,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Wayland EGL
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-egl = %{version}-%{release}
-Obsoletes:	Mesa-libwayland-egl-devel
+Obsoletes:	Mesa-libwayland-egl-devel < 18.2
 
 %description egl-devel
 Header files for Wayland EGL library.
@@ -116,9 +119,7 @@ Statyczna biblioteka Wayland EGL.
 Summary:	Wayland API and protocol documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki oraz protokołu Wayland
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description apidocs
 Wayland API and protocol documentation.
@@ -128,39 +129,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
+%ninja_install -C build
 
-%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
-
-# 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
@@ -172,9 +153,12 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	egl -p /sbin/ldconfig
+%postun	egl -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc COPYING README TODO
+%doc COPYING CONTRIBUTING.md README.md
 %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.*.*.*
@@ -203,8 +187,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
@@ -223,7 +205,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