From adb33854fb85ef0271152fa38fd26c55d65a1c67 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sat, 13 Dec 2025 22:00:22 +0800 Subject: [PATCH] use pkgconfig to find libxml2 --- 0007-use-pkgconfig-to-find-libxml2.patch | 47 ++++++++++++++++++++++++ libmetalink.spec | 18 ++++----- 2 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 0007-use-pkgconfig-to-find-libxml2.patch diff --git a/0007-use-pkgconfig-to-find-libxml2.patch b/0007-use-pkgconfig-to-find-libxml2.patch new file mode 100644 index 0000000..a81f52f --- /dev/null +++ b/0007-use-pkgconfig-to-find-libxml2.patch @@ -0,0 +1,47 @@ +From 93342c4707a53c8886d42fd01eb9fa0859dc6956 Mon Sep 17 00:00:00 2001 +From: Funda Wang +Date: Sat, 13 Dec 2025 21:55:39 +0800 +Subject: [PATCH] use pkgconfig to find libxml2 + +--- + configure.ac | 4 ++-- + lib/Makefile.am | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bd4cab6..a3e0c66 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -89,7 +89,7 @@ if test "x$with_libexpat" = "xyes"; then + fi + + if test "x$with_libxml2" = "xyes" && test "x$have_libexpat" != "xyes"; then +- AM_PATH_XML2([2.6.24], [have_libxml2=yes]) ++ PKG_CHECK_MODULES([XML], [libxml2 >= 2.6.24], [have_libxml2=yes], [have_libxml2=no]) + if test "x$have_libxml2" = "xyes"; then + AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have libxml2.]) + fi +@@ -197,6 +197,6 @@ AC_MSG_NOTICE([summary of build options: + C preprocessor: ${CPP} + Library types: Shared=${enable_shared}, Static=${enable_static} + Libexpat: ${have_libexpat} ${EXPAT_CFLAGS} ${EXPAT_LIBS} +- Libxml2: ${have_libxml2} ${XML_CPPFLAGS} ${XML_LIBS} ++ Libxml2: ${have_libxml2} ${XML_CFLAGS} ${XML_LIBS} + CUnit: ${have_cunit} ${CUNIT_CFLAGS} ${CUNIT_LIBS} + ]) +diff --git a/lib/Makefile.am b/lib/Makefile.am +index cc3226e..d42e8b8 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,7 +1,7 @@ + SUBDIRS = includes + + AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes \ +- @XML_CPPFLAGS@ @EXPAT_CFLAGS@ \ ++ @XML_CFLAGS@ @EXPAT_CFLAGS@ \ + @DEFS@ + + pkgconfigdir = $(libdir)/pkgconfig +-- +2.50.1 + diff --git a/libmetalink.spec b/libmetalink.spec index a5eba23..2dfe211 100644 --- a/libmetalink.spec +++ b/libmetalink.spec @@ -1,12 +1,12 @@ Name: libmetalink Version: 0.1.3 -Release: 12 +Release: 13 Summary: Metalink library written in C License: MIT URL: https://launchpad.net/libmetalink Source0: https://launchpad.net/libmetalink/trunk/%{name}-%{version}/+download/%{name}-%{version}.tar.bz2 -BuildRequires: gcc expat-devel libxml2-devel CUnit-devel autoconf automake libtool +BuildRequires: gcc expat-devel CUnit-devel autoconf automake libtool Patch001:0001-fix-warning-_BSD_SOURCE-and-_SVID_SOURCE-are-depreca.patch Patch002:0002-add-libmetalink-testcases-for-api-and-error-handling.patch @@ -14,6 +14,7 @@ Patch003:0003-backport-fix-covscan-issues.patch Patch004:0004-fix-NULL-ptr-deref-in-initial_state_start_fun.patch Patch005:0005-fix-return-value-of-parsing-wrong-formed-metalink-fi.patch Patch006:0006-return-error-code-when-metalink-file-misses-required.patch +Patch007:0007-use-pkgconfig-to-find-libxml2.patch %description libmetalink is a Metalink library written in C language. It is intended to @@ -26,11 +27,7 @@ Requires: %{name} = %{version}-%{release} %description devel Files needed for building applications with libmetalink. -%package help -Summary: document files for %{name} -Requires: %{name} = %{version}-%{release} -%description help -The %{name}-doc package contains document files. +%package_help %prep %autosetup -p1 @@ -43,17 +40,13 @@ autoconf %make_build %install -rm -rf $RPM_BUILD_ROOT %make_install %delete_la %check make check -%ldconfig_scriptlets - %files -%{!?_licensedir:%global license %%doc} %license COPYING %doc README %{_libdir}/libmetalink.so.* @@ -68,6 +61,9 @@ make check %{_mandir}/man3/* %changelog +* Sat Dec 13 2025 Funda Wang - 0.1.3-13 +- use pkgconfig to find libxml2 + * Sat Mar 26 2022 Hu Bin - 0.1.3-12 - Type:bugfix - ID:NA -- Gitee