开源软件构建与测试

Changes of Revision 7

_service:tar_scm:libXxf86vm.spec Changed

@@ -1,10 +1,12 @@
-Name:	              libXxf86vm
-Version:	      1.1.5
-Release:              2
-Summary:	      Provide an extension library for the XFree86-VidModeExtension
-License:	      MIT
-URL:		      https://www.x.org
-Source0:	      https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.gz
+Name:                 libXxf86vm
+Version:              1.1.5
+Release:              3
+Summary:              Provide an extension library for the XFree86-VidModeExtension
+License:              MIT
+URL:                  https://www.x.org
+Source0:              https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.gz
+
+Patch0:               backport-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch
 
 BuildRequires:        autoconf automake libtool xorg-x11-util-macros
 BuildRequires:        pkgconfig(xext) pkgconfig(xf86vidmodeproto)
@@ -24,7 +26,7 @@
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -n %{name}-%{version} -p1
 
 %build
 autoreconf -ivf
@@ -55,6 +57,9 @@
 %{_mandir}/man3/*.3.gz
 
 %changelog
+* Wed Jul 31 2024 lingsheng <lingsheng1@h-partners.com> - 1.1.5-3
+- configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL
+
 * Sat Feb 25 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1.1.5-2
 - disable static library

_service:tar_scm:backport-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch Added

@@ -0,0 +1,46 @@
+From cfda59347e3a04415340a99f925a9cd85c0531b2 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed, 8 Mar 2023 16:30:15 -0800
+Subject: PATCH configure: Use LT_INIT from libtool 2 instead of deprecated
+ AC_PROG_LIBTOOL
+
+AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008,
+so it's time to rely on it.
+
+Clears autoconf warnings:
+
+configure.ac:14: warning: The macro `AC_PROG_LIBTOOL' is obsolete.
+configure.ac:14: You should run autoupdate.
+aclocal.m4:3465: AC_PROG_LIBTOOL is expanded from...
+configure.ac:14: the top level
+
+libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS(m4)' to configure.ac,
+libtoolize: and rerunning libtoolize and aclocal.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d71233f..19bdc3a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,12 +6,13 @@ AC_INIT(libXxf86vm, 1.1.5,
+         libXxf86vm)
+ AC_CONFIG_SRCDIR(Makefile.am)
+ AC_CONFIG_HEADERS(src/config.h)
++AC_CONFIG_MACRO_DIRS(m4)
+ 
+ # Initialize Automake
+ AM_INIT_AUTOMAKE(foreign dist-xz)
+ 
+ # Initialize libtool
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+ m4_ifndef(XORG_MACROS_VERSION,
+-- 
+2.33.0
+