diff --git a/microdnf.spec b/microdnf.spec index 1be65d0..fe42326 100644 --- a/microdnf.spec +++ b/microdnf.spec @@ -1,14 +1,6 @@ -%if 0%{?rhel} && 0%{?rhel} <= 7 -%global buildsys cmake -%global buildsys_req cmake >= 2.8.5 -%else -%global buildsys meson -%global buildsys_req meson >= 0.36.0 -%endif - Name: microdnf Version: 3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Micro DNF License: GPLv3+ @@ -16,7 +8,7 @@ URL: https://github.com/rpm-software-management/microdnf Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc -BuildRequires: %{buildsys_req} +BuildRequires: meson >= 0.36.0 BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 BuildRequires: pkgconfig(gobject-2.0) >= 2.44.0 BuildRequires: pkgconfig(libpeas-1.0) >= 1.20.0 @@ -29,26 +21,15 @@ BuildRequires: pkgconfig(smartcols) %prep %autosetup -p1 -%if %{buildsys} == "cmake" -%build -mkdir %{_target_platform} -pushd %{_target_platform} - %cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -popd -%make_build -C %{_target_platform} - -%install -%make_install -C %{_target_platform} -%endif - -%if %{buildsys} == "meson" %build %meson %meson_build %install %meson_install -%endif + +%check +%meson_test %files %license COPYING @@ -56,6 +37,9 @@ popd %{_bindir}/%{name} %changelog +* Sat Jul 22 2017 Igor Gnatenko - 3-2 +- No CMake, only meson + * Thu Jun 01 2017 Igor Gnatenko - 3-1 - Update to 3