Update to 1.0.4, dropping deprecated patches
This commit is contained in:
Paul W. Frields
parent
4150c3da21
commit
8ad1aeac67
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
xmlstarlet-1.0.1.tar.gz
|
||||
/xmlstarlet-1.0.2.tar.gz
|
||||
/xmlstarlet-1.0.3.tar.gz
|
||||
/xmlstarlet-1.0.4.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
ec9a39540b402affcb99a07f0a03d92a xmlstarlet-1.0.3.tar.gz
|
||||
dbfe7127199c0ae7f291ea11ef4f8e19 xmlstarlet-1.0.4.tar.gz
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
--- xmlstarlet-1.0.3-original/examples/results/bigxml-dtd.out 2010-11-14 10:47:45.000000000 -0500
|
||||
+++ xmlstarlet-1.0.3/examples/results/bigxml-dtd.out 2010-12-18 08:10:21.257959145 -0500
|
||||
@@ -1 +1 @@
|
||||
--:7000x
|
||||
+-:6553x
|
||||
@ -1,28 +0,0 @@
|
||||
diff -uNr xmlstarlet-1.0.3-original/configure.ac xmlstarlet-1.0.3/configure.ac
|
||||
--- xmlstarlet-1.0.3-original/configure.ac 2010-11-17 14:47:55.000000000 -0500
|
||||
+++ xmlstarlet-1.0.3/configure.ac 2010-12-17 11:59:27.090514304 -0500
|
||||
@@ -29,18 +29,18 @@
|
||||
XSTAR_LIB_CHECK([LIBXML], [xml2-config])
|
||||
AS_IF([test "x$LIBXML_SRCDIR" != x],
|
||||
[LIBXML_INCDIR="$LIBXML_SRCDIR/include"],
|
||||
- [: ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}])
|
||||
-[LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"]
|
||||
-[LIBXML_CPPFLAGS="-DLIBXML_STATIC -I$LIBXML_INCDIR"]
|
||||
+ [: ${LIBXML_INCDIR="`xml2-config --cflags`"}])
|
||||
+[LIBXML_LIBS="`xml2-config --libs`"]
|
||||
+[LIBXML_CPPFLAGS="$LIBXML_INCDIR"]
|
||||
|
||||
XSTAR_LIB_CHECK([LIBXSLT], [xslt-config])
|
||||
[: ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}]
|
||||
AS_IF([test "x$LIBXSLT_SRCDIR" != x],
|
||||
[LIBXSLT_INCDIR="$LIBXSLT_SRCDIR"
|
||||
LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"],
|
||||
- [LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"])
|
||||
-[: ${LIBSLT_INCDIR="$LIBXSLT_PREFIX/include"}]
|
||||
-[LIBXSLT_CPPFLAGS="-I$LIBXSLT_INCDIR"]
|
||||
+ [LIBXSLT_LIBS="`xslt-config --libs` -lexslt"])
|
||||
+[: ${LIBSLT_INCDIR="`xslt-config --cflags`"}]
|
||||
+[LIBXSLT_CPPFLAGS="$LIBXSLT_INCDIR"]
|
||||
|
||||
[WIN32_EXTRA_LDFLAGS=]
|
||||
[WIN32_EXTRA_LIBS=]
|
||||
@ -1,21 +1,3 @@
|
||||
diff -uNr xmlstarlet-1.0.3-original/examples/xmlstarlet xmlstarlet-1.0.3/examples/xmlstarlet
|
||||
--- xmlstarlet-1.0.3-original/examples/xmlstarlet 2010-11-10 18:42:26.000000000 -0500
|
||||
+++ xmlstarlet-1.0.3/examples/xmlstarlet 2010-12-17 12:09:15.644655135 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
-../src/xml ${@+"$@"}
|
||||
+../src/xmlstarlet ${@+"$@"}
|
||||
|
||||
diff -uNr xmlstarlet-1.0.3-original/src/Makefile.am xmlstarlet-1.0.3/src/Makefile.am
|
||||
--- xmlstarlet-1.0.3-original/src/Makefile.am 2010-11-16 20:43:53.000000000 -0500
|
||||
+++ xmlstarlet-1.0.3/src/Makefile.am 2010-12-17 12:08:55.760085370 -0500
|
||||
@@ -1,3 +1,3 @@
|
||||
-bin_PROGRAMS = xml
|
||||
+bin_PROGRAMS = xmlstarlet
|
||||
|
||||
-xml_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c
|
||||
+xmlstarlet_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c
|
||||
diff -uNr xmlstarlet-1.0.3-original/src/xml.c xmlstarlet-1.0.3/src/xml.c
|
||||
--- xmlstarlet-1.0.3-original/src/xml.c 2010-11-10 18:42:26.000000000 -0500
|
||||
+++ xmlstarlet-1.0.3/src/xml.c 2010-12-17 12:08:55.760085370 -0500
|
||||
@ -1,15 +1,13 @@
|
||||
Name: xmlstarlet
|
||||
Version: 1.0.3
|
||||
Version: 1.0.4
|
||||
Release: 1%{?dist}
|
||||
Summary: Command Line XML Toolkit
|
||||
Group: Applications/Text
|
||||
License: MIT
|
||||
URL: http://xmlstar.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz
|
||||
Patch0: xmlstarlet-1.0.3-nostatic.patch
|
||||
Patch1: xmlstarlet-1.0.3-cmdname.patch
|
||||
Patch2: xmlstarlet-1.0.1-docs.patch
|
||||
Patch3: xmlstarlet-1.0.3-bigxmldtd-results.patch
|
||||
Patch0: xmlstarlet-1.0.4-cmdname.patch
|
||||
Patch1: xmlstarlet-1.0.1-docs.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: xmlto automake autoconf libxml2-devel libxslt-devel
|
||||
@ -24,15 +22,13 @@ commands.
|
||||
%prep
|
||||
%setup -q
|
||||
# cope with inconsistent naming
|
||||
%patch0 -p1 -b .nostatic
|
||||
%patch1 -p1 -b .cmdname
|
||||
%patch2 -p1 -b .docs
|
||||
# Refer to https://bugzilla.gnome.org/show_bug.cgi?id=325533
|
||||
%patch3 -p1 -b .bigxmldtd-results
|
||||
%patch0 -p1 -b .cmdname
|
||||
%patch1 -p1 -b .docs
|
||||
|
||||
|
||||
%build
|
||||
autoreconf -i
|
||||
%configure --libdir=%{_libdir}
|
||||
%configure --disable-static-libs # --libdir=%{_libdir}
|
||||
make %{?_smp_mflags}
|
||||
cd $RPM_BUILD_DIR/%{name}-%{version}/doc
|
||||
xmlto man xmlstarlet-man.xml
|
||||
@ -43,11 +39,12 @@ xmlto html-nochunks xmlstarlet-ug.xml
|
||||
%install
|
||||
rm -fr %{buildroot}
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
# Avoid name kludging in autotools
|
||||
mv $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet
|
||||
|
||||
|
||||
%check
|
||||
cd tests
|
||||
./runTests
|
||||
make check
|
||||
|
||||
|
||||
%clean
|
||||
@ -62,6 +59,10 @@ rm -fr %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 19 2011 Paul W. Frields <stickster@gmail.com> - 1.0.4-1
|
||||
- Update to new upstream 1.0.4
|
||||
- Drop patches for fixed upstream issues
|
||||
|
||||
* Fri Dec 17 2010 Paul W. Frields <stickster@gmail.com> - 1.0.3-1
|
||||
- Update to new upstream 1.0.3
|
||||
- Add %%check section for validation testing
|
||||
|
||||
Loading…
Reference in New Issue
Block a user