commit 573e9001d3732edb408dba44a303e6af6acbce15
Author: Jan Palus <[email protected]>
Date: Fri Apr 10 19:18:50 2020 +0200
switched to meson
- drop noarch patch since whole autoconf/gettext drama is gone now
mate-backgrounds.spec | 19 ++++++-------------
noarch-build.patch | 13 -------------
2 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/mate-backgrounds.spec b/mate-backgrounds.spec
index 7c61bd2..2631f13 100644
--- a/mate-backgrounds.spec
+++ b/mate-backgrounds.spec
@@ -7,12 +7,12 @@ License: GPL v2+
Group: Themes
Source0:
http://pub.mate-desktop.org/releases/1.24/%{name}-%{version}.tar.xz
# Source0-md5: 62ba0b82392eab6c8122a519abd84742
-Patch0: noarch-build.patch
URL: http://mate-desktop.org/
-BuildRequires: autoconf >= 2.53
-BuildRequires: automake >= 1:1.9
BuildRequires: gettext-tools >= 0.19.8
+BuildRequires: meson >= 0.41.0
BuildRequires: mate-common
+BuildRequires: ninja
+BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: tar >= 1:1.22
BuildRequires: xz
BuildArch: noarch
@@ -28,21 +28,14 @@ odgałęzienie GNOME backgrounds.
%prep
%setup -q
-%patch0 -p1
%build
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure \
- --disable-silent-rules
-%{__make}
+%meson build
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- INSTALL="install -p" \
- DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{frp,ie,ku_IQ}
diff --git a/noarch-build.patch b/noarch-build.patch
deleted file mode 100644
index e25ced7..0000000
--- a/noarch-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 6fab608..be25614 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,7 +5,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar check-news])
-
- AM_GNU_GETTEXT_VERSION([0.19.8])
--AM_GNU_GETTEXT([external])
-+AM_PO_SUBDIRS
-
- AM_MAINTAINER_MODE
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mate-backgrounds.git/commitdiff/573e9001d3732edb408dba44a303e6af6acbce15
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
