diff --git a/.gitignore b/.gitignore index f8f079a..3d8297c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/wlroots-0.0.1-20180102git767df15.tar.gz -/wlroots-0.0.1-20180106git03faf17.tar.gz +/wlroots-*.tar.gz diff --git a/sources b/sources index 39f0238..6687118 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wlroots-0.0.1-20180106git03faf17.tar.gz) = 77f4bc01327dd6dd669ca9467531a127f34a1e90308236a5a9f70f9e403c995905731239fdb56c18d8c60b455afc6ae1cb5a4e409f93aed542f3522572717071 +SHA512 (wlroots-0.1.tar.gz) = 43897ac5a512ea26ad9703182dab5de9c714a087449b108472f638148538a632a67cfc778edf3e77940fdd7bdba91d64a4dc4e4ed1903a150f13ca59237ce01e diff --git a/wlroots.spec b/wlroots.spec index db314ed..641e788 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -1,22 +1,32 @@ -%{!?_pkgdocdir:%global _pkgdocdir %_defaultdocdir/%{name}-%{version}} +%global commit 0.1 +%global gitdate %{nil} +%global gitrel %{nil} +%global gitver %{nil} +# Keep the below around for possible snapshot times (was a must prior to 0.1) +#global scommit #(c=#{commit}; echo ${c:0:7}) +#global gitrel .#{gitdate}git#{scommit} +#global gitver -#{gitdate}git#{scommit} -%global commit 03faf17942432027aaeb12e624e089de7673c209 -%global gitdate 20180106 -%global scommit %(c=%{commit}; echo ${c:0:7}) -%global gitrel .%{gitdate}git%{scommit} -%global gitver -%{gitdate}git%{scommit} %global api_ver 0 Name: wlroots -Version: 0.0.1 -Release: 0.9%{?gitrel}%{?dist} -Summary: Pluggable, composable modules for building a Wayland compositor +Version: 0.1 +Release: 1%{?gitrel}%{?dist} +Summary: A modular Wayland compositor library # All files in the sources are licensed as MIT, but -# * protocol/server-decoration.xml [LGPL (v2.1 or later)] -# * protocol/gamma-control.xml [NTP (legal disclaimer)] +# - LGPL (v2.1 or later) +# * protocol/idle.xml +# * protocol/server-decoration.xml +# - NTP (legal disclaimer) +# * protocol/gamma-control.xml +# * protocol/text-input-unstable-v3.xml +# * protocol/wlr-gamma-control-unstable-v1.xml +# * protocol/wlr-input-inhibitor-unstable-v1.xml +# * protocol/wlr-layer-shell-unstable-v1.xml + # # Those files are processed to c-compilable files by the # `wayland-scanner` binary during build and don't alter the @@ -29,6 +39,7 @@ Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{version}%{?gitver}.ta BuildRequires: gcc BuildRequires: libcap-devel BuildRequires: libinput-devel +BuildRequires: libpng BuildRequires: libxkbcommon-devel BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libGLES-devel @@ -68,6 +79,10 @@ Development files for %{name}. %build + +# Needed since xcb-errors is not packaged (yet?) +%global __meson_auto_features auto + %ifarch %{arm} %{ix86} export CFLAGS="%{optflags} -Wno-error=format=" export CXXFLAGS="%{optflags} -Wno-error=format=" @@ -93,8 +108,8 @@ done %meson_test -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +# Needed only for < F28 +%ldconfig_scriptlets %files @@ -112,6 +127,13 @@ done %changelog +* Wed Oct 31 2018 Jan Pokorny - 0.1-1 +- Updated to historically first official release +- Turned off implicit enablement of all 'auto' build features under Meson, + since xcb-errors is not available at this time +- Added BR: libpng +- Expanding spec comment on source files not covered with MIT license + * Sat Jul 14 2018 Fedora Release Engineering - 0.0.1-0.9.20180106git03faf17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild