diff options
| author | Eduardo Lima (Etrunko) <etrunko@redhat.com> | 2020-03-03 09:06:04 -0300 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2020-03-09 19:00:28 +0000 |
| commit | bbad3fb944aa09fbc4348263a33a97e33f1c5618 (patch) | |
| tree | 022d683b5e5c6a5f652f49da00b8e7a12b583864 | |
| parent | 0724605efc143d01a286cd3a9142b2f317907a9b (diff) | |
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>
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | spice-protocol.spec.in | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73178e2..098aab0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/spice-protocol.spec.in b/spice-protocol.spec.in index 49724c6..300b576 100644 --- a/spice-protocol.spec.in +++ b/spice-protocol.spec.in @@ -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 |