commit af022e8351b5ce59ab7c5e88817f2708bbddba15
Author: Jan Palus <at...@pld-linux.org>
Date:   Wed Jun 19 17:43:55 2024 +0200

    up to 1.1.41

 libxslt-m4.patch | 38 --------------------------------------
 libxslt.spec     | 15 ++++++---------
 2 files changed, 6 insertions(+), 47 deletions(-)
---
diff --git a/libxslt.spec b/libxslt.spec
index c615711..41c92e8 100644
--- a/libxslt.spec
+++ b/libxslt.spec
@@ -10,16 +10,15 @@ Summary:    XSLT processor
 Summary(pl.UTF-8):     Procesor XSLT
 Summary(pt_BR.UTF-8):  Biblioteca que disponibiliza o sistema XSLT do GNOME
 Name:          libxslt
-Version:       1.1.40
-Release:       2
+Version:       1.1.41
+Release:       1
 License:       MIT
 Group:         Libraries
 #Source0:      ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
 Source0:       
https://download.gnome.org/sources/libxslt/1.1/%{name}-%{version}.tar.xz
-# Source0-md5: d9f936c2d94cbb229b504d48b2649376
-Patch0:                %{name}-m4.patch
-Patch1:                LFS.patch
-Patch2:                %{name}-libs-no-libdir.patch
+# Source0-md5: 8d23bc94a97c03c89651457bb648cf5b
+Patch0:                LFS.patch
+Patch1:                %{name}-libs-no-libdir.patch
 URL:           http://xmlsoft.org/XSLT/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.16.3
@@ -158,9 +157,8 @@ Moduły języka Python 3 dla biblioteki libxslt.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e 's,\$(datadir)/gtk-doc/html,%{_gtkdocdir},' \
        doc/devhelp/Makefile.am doc/EXSLT/devhelp/Makefile.am
@@ -256,7 +254,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libxslt
 %{_pkgconfigdir}/libexslt.pc
 %{_pkgconfigdir}/libxslt.pc
-%{_aclocaldir}/libxslt.m4
 %{_mandir}/man3/libexslt.3*
 %{_mandir}/man3/libxslt.3*
 
diff --git a/libxslt-m4.patch b/libxslt-m4.patch
deleted file mode 100644
index 6740c5a..0000000
--- a/libxslt-m4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- libxslt.m4 2004-05-17 05:25:26.000000000 +0200
-+++ libxslt.m4.patched 2004-07-26 06:05:36.000000000 +0200
-@@ -52,8 +52,10 @@
-            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-     if test "x$enable_xslttest" = "xyes" ; then
-       ac_save_CFLAGS="$CFLAGS"
-+      ac_save_CXXFLAGS="$CXXFLAGS"
-       ac_save_LIBS="$LIBS"
-       CFLAGS="$CFLAGS $XSLT_CFLAGS"
-+      CXXFLAGS="$CFLAGS"
-       LIBS="$XSLT_LIBS $LIBS"
- dnl
- dnl Now check if the installed libxslt is sufficiently new.
-@@ -138,6 +140,7 @@
- }
- ],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-        CFLAGS="$ac_save_CFLAGS"
-+       CXXFLAGS="$ac_save_CXXFLAGS"
-        LIBS="$ac_save_LIBS"
-      fi
-   fi
-@@ -158,6 +161,7 @@
-        else
-           echo "*** Could not run libxslt test program, checking why..."
-           CFLAGS="$CFLAGS $XSLT_CFLAGS"
-+          CXXFLAGS="$CFLAGS"
-           LIBS="$LIBS $XSLT_LIBS"
-           AC_TRY_LINK([
- #include <libxslt/xslt.h>
-@@ -177,6 +181,7 @@
-           echo "*** or that you have moved LIBXSLT since it was installed. In 
the latter case, you"
-           echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ])
-           CFLAGS="$ac_save_CFLAGS"
-+                CXXFLAGS="$ac_save_CXXFLAGS"
-           LIBS="$ac_save_LIBS"
-        fi
-      fi
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libxslt.git/commitdiff/af022e8351b5ce59ab7c5e88817f2708bbddba15

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to