From: Jan Palus <atler@pld-linux.org>
Date: Wed, 24 Jun 2020 19:27:43 +0000 (+0200)
Subject: up to 0.26
X-Git-Tag: auto/th/desktop-file-utils-0.26-1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=eeddde61f8f13acd41e6f88d6eeecf92273a519c;hp=3ea74b07dacec0da0917082fdb2b93c9207c8061;p=packages%2Fdesktop-file-utils.git

up to 0.26

- switched to meson (autotools will be dropped in next release)
---

diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index 45e32f9..ac1b607 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -1,18 +1,18 @@
 Summary:	A couple of command line utilities for working with desktop entries
 Summary(pl.UTF-8):	Narzędzia linii poleceń do pracy z plikami desktop
 Name:		desktop-file-utils
-Version:	0.24
+Version:	0.26
 Release:	1
 License:	GPL v2+
 Group:		Applications
 Source0:	https://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	9364b82e14cfcad881161aa7ea5257ae
+# Source0-md5:	29739e005f5887cf41639b8450f3c23f
 URL:		https://www.freedesktop.org/wiki/Software/desktop-file-utils
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake >= 1:1.11
 BuildRequires:	glib2-devel >= 1:2.8.0
-BuildRequires:	libtool
+BuildRequires:	meson >= 0.49.0
+BuildRequires:	ninja
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	glib2 >= 1:2.8.0
@@ -46,22 +46,14 @@ Tryb plików desktop dla Emacsa.
 %setup -q
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules
-
-%{__make}
+%meson build
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 touch $RPM_BUILD_ROOT%{_desktopdir}/mimeinfo.cache