llyyr/wayland
SHA256
1
0
Fork 0
forked from jengelh/wayland
Code Pull Requests Activity

Accepting request 931179 from home:iznogood:branches:X11:Wayland

Browse Source 
Prepare for next version where autotools is dropped.


- Switch to meson buildsystem: Add meson BuildRequires and macros.
- Add generic c_compiler and c++_compiler BuildRequires, needed now
  with the meson buildsystem.
- Use ldconfig_scriptlets macro for post(un) handling for
  Tumbleweed and newer.

OBS-URL: https://build.opensuse.org/request/show/931179
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=96
This commit is contained in:
Jan Engelhardt 2021-11-12 21:34:44 +00:00 committed by Git OBS Bridge
parent 5b033765cd
commit 941df6a72d
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wayland.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Nov 12 20:08:09 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Switch to meson buildsystem: Add meson BuildRequires and macros.
- Add generic c_compiler and c++_compiler BuildRequires, needed now
with the meson buildsystem.
- Use ldconfig_scriptlets macro for post(un) handling for
Tumbleweed and newer.
-------------------------------------------------------------------
Wed Jan 27 18:19:56 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

40
wayland.spec
View File

@ -37,9 +37,10 @@ Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz
Source2: http://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig
Source3: %name.keyring
Source4: baselibs.conf
#git#BuildRequires: autoconf >= 2.64
#git#BuildRequires: automake >= 1.11
#git#BuildRequires: libtool >= 2.2
BuildRequires: c_compiler
BuildRequires: c++_compiler
BuildRequires: meson
BuildRequires: libxml2-tools
BuildRequires: libxslt-tools
BuildRequires: pkg-config
@ -53,7 +54,6 @@ BuildRequires: doxygen
BuildRequires: graphviz-gnome
BuildRequires: xmlto
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Wayland is a protocol for a compositor to talk to its clients as well
@ -144,37 +144,32 @@ BuildArch: noarch
This subpackage contains the documentation to Wayland.
%prep
%setup -q
%autosetup -p1
sed -i 's/<eglversion>/%eglversion/' "%_sourcedir/baselibs.conf"
%build
if [ ! -e configure ]; then
autoreconf -fi
fi
# includedir intentional, cf. bugzilla.opensuse.org/795968
%configure --disable-static --includedir="%_includedir/%name" \
%meson \
--includedir="%_includedir/%name" \
%if %with_doc
--docdir="%_defaultdocdir/%name"
%else
--disable-documentation
-D documentation=false
%endif
%make_build
%meson_build
%install
%make_install %{?_smp_mflags}
find "%buildroot" -type f -name "*.la" -delete -print
%meson_install
%check
%if !0%{?qemu_user_space_build}
mkdir -p xdg/wayland-tests
chmod a+x xdg xdg/wayland-tests
export XDG_RUNTIME_DIR="$PWD/xdg"
if ! make check V=1; then
cat test-suite.log
exit 1
fi
%endif
%meson_test
%if 0%{?suse_version} >= 1550
%ldconfig_scriptlets -n libwayland-client0
%ldconfig_scriptlets -n libwayland-cursor0
%ldconfig_scriptlets -n libwayland-egl1
%ldconfig_scriptlets -n libwayland-server0
%else
%post -n libwayland-client0 -p /sbin/ldconfig
%postun -n libwayland-client0 -p /sbin/ldconfig
%post -n libwayland-cursor0 -p /sbin/ldconfig
@ -183,6 +178,7 @@ fi
%postun -n libwayland-egl1 -p /sbin/ldconfig
%post -n libwayland-server0 -p /sbin/ldconfig
%postun -n libwayland-server0 -p /sbin/ldconfig
%endif
%files -n libwayland-client0
%_libdir/libwayland-client.so.0*