[packages/xorg-cf-files] - updated to 1.0.9, uses meson now

qboosh qboosh at pld-linux.org
Thu Sep 11 19:52:48 CEST 2025


commit 1fd2258b22bf6ffaa5962385d77038c248bdb07c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 11 19:55:40 2025 +0200

    - updated to 1.0.9, uses meson now

 xorg-cf-files.spec | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec
index 0dc397c..891cbee 100644
--- a/xorg-cf-files.spec
+++ b/xorg-cf-files.spec
@@ -1,17 +1,18 @@
 Summary:	X.org cf files
 Summary(pl.UTF-8):	Pliki cf z X.org
 Name:		xorg-cf-files
-Version:	1.0.8
-Release:	2
+Version:	1.0.9
+Release:	1
 License:	MIT
 Group:		X11/Development/Tools
 Source0:	https://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.xz
-# Source0-md5:	daed7279016bb921f0a0e969c9508535
+# Source0-md5:	8ca404ca531fe1f6a8a2b7a3c32cbec7
 Patch0:		%{name}-mandir.patch
 Patch1:		%{name}-libdir.patch
 URL:		https://xorg.freedesktop.org/
-BuildRequires:	autoconf >= 2.60
-BuildRequires:	automake
+BuildRequires:	meson >= 0.60.0
+BuildRequires:	ninja >= 1.5
+BuildRequires:	rpmbuild(macros) >= 2.042
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-font-font-util >= 1.1
 BuildRequires:	xorg-util-util-macros >= 1.20
@@ -40,23 +41,21 @@ bibliotek kiedyś dostarczanych w monolitycznych wydaniach X.Org.
 %patch -P1 -p1
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure
+# fontrootdir consistent with xorg-font-font-util
+%meson \
+	-Dwith-fontrootdir=%{_fontsdir}
 
-%{__make}
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog README
+%doc COPYING README
 %{_libdir}/X11/config
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-cf-files.git/commitdiff/1fd2258b22bf6ffaa5962385d77038c248bdb07c



More information about the pld-cvs-commit mailing list