Update spec file and ci script to use meson as default

Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Eduardo Lima (Etrunko) 2020-03-03 09:06:04 -03:00 committed by Frediano Ziglio
parent 0724605efc
commit bbad3fb944
2 changed files with 8 additions and 14 deletions

View File

@ -8,17 +8,11 @@ variables:
before_script:
- dnf install -y $DEPS_COMMON
fedora-autotools:
script:
# Run with default options
- ./autogen.sh
- make
- make distcheck
- rpmlint -o "NetworkEnabled False" spice-protocol.spec
- rpmbuild -ta spice-protocol-*.tar.bz2
fedora-meson:
fedora:
script:
- meson --buildtype=release build-default
- ninja -C build-default
- ninja -C build-default dist
- rpmlint -o "NetworkEnabled False" build-default/spice-protocol.spec
- mkdir -p ~/rpmbuild/SOURCES && cp build-default/meson-dist/spice-protocol*.tar.xz ~/rpmbuild/SOURCES/
- rpmbuild -ba build-default/spice-protocol.spec

View File

@ -6,7 +6,7 @@ Group: Development/Libraries
# Main headers are BSD, controller / foreign menu are LGPL
License: BSD and LGPLv2+
URL: https://www.spice-space.org
Source0: https://www.spice-space.org/download/releases/%{name}-%{version}.tar.bz2
Source0: https://www.spice-space.org/download/releases/%{name}-%{version}.tar.xz
BuildArch: noarch
%description
@ -18,11 +18,11 @@ and the para-virtual graphics card QXL.
%setup -q
%build
%configure
make %{?_smp_mflags}
%meson
%meson_build
%install
make DESTDIR=%{buildroot} install
%meson_install
%files