[xmlstarlet] Update to upstream 1.4.2 (#851880)
Paul W. Frields
pfrields at fedoraproject.org
Mon Mar 25 15:09:18 UTC 2013
commit 24650f31acc7a40a10183fc58db3ac8dd07f8fd3
Author: Paul W. Frields <stickster at gmail.com>
Date: Mon Mar 25 11:08:53 2013 -0400
Update to upstream 1.4.2 (#851880)
.gitignore | 1 +
sources | 2 +-
xmlstarlet.spec | 20 +++++++++++++-------
3 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a218144..0901579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ xmlstarlet-1.0.1.tar.gz
/xmlstarlet-1.2.1.tar.gz
/xmlstarlet-1.3.0.tar.gz
/xmlstarlet-1.3.1.tar.gz
+/xmlstarlet-1.4.2.tar.gz
diff --git a/sources b/sources
index ded745b..a4f9caa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5173ad3f01ec0ba0d54bd1fbfc057abf xmlstarlet-1.3.1.tar.gz
+ee8df42efd2417f74a1f5e3b7fe9e023 xmlstarlet-1.4.2.tar.gz
diff --git a/xmlstarlet.spec b/xmlstarlet.spec
index d777ad2..414c8f3 100644
--- a/xmlstarlet.spec
+++ b/xmlstarlet.spec
@@ -1,17 +1,18 @@
Name: xmlstarlet
-Version: 1.3.1
-Release: 4%{?dist}
+Version: 1.4.2
+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.6-gendoc.patch
+#Patch0: xmlstarlet-1.0.6-gendoc.patch
# http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xmlto automake autoconf libxslt-devel
BuildRequires: libxml2-devel >= 2.6.23
+BuildRequires: docbook5-schemas
%description
XMLStarlet is a set of command line utilities which can be used
@@ -22,7 +23,7 @@ commands.
%prep
%setup -q
-%patch0 -p1 -b .gendoc
+#%patch0 -p1 -b .gendoc
%build
@@ -30,8 +31,8 @@ autoreconf -i
%configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 # --libdir=%{_libdir}
make %{?_smp_mflags}
cd $RPM_BUILD_DIR/%{name}-%{version}/doc
-xmlto man xmlstarlet-man.xml
-xmlto html-nochunks xmlstarlet-ug.xml
+xmlto --skip-validation man xmlstarlet-man.xml
+xmlto --skip-validation html-nochunks xmlstarlet-ug.xml
./gen-doc > xmlstarlet.txt
@@ -43,7 +44,8 @@ mv $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet
%check
-make check
+cd tests
+./runAllTests.sh
%clean
@@ -55,9 +57,13 @@ rm -fr %{buildroot}
%doc AUTHORS ChangeLog NEWS README Copyright TODO doc/xmlstarlet.txt doc/xmlstarlet-ug.html
%{_mandir}/man1/xmlstarlet.1*
%{_bindir}/xmlstarlet
+%{_docdir}/xmlstarlet
%changelog
+* Mon Mar 25 2013 Paul W. Frields <stickster at gmail.com> - 1.4.2-1
+- Update to upstream 1.4.2 (#851880)
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list