[xmlstarlet] Update to upstream 1.5.0 and drop obsolete patch
Paul W. Frields
pfrields at fedoraproject.org
Wed Jul 10 22:24:56 UTC 2013
commit b3730ca0724813a8dbf352241c0e2e8a3b0c8610
Author: Paul W. Frields <stickster at gmail.com>
Date: Wed Jul 10 18:24:16 2013 -0400
Update to upstream 1.5.0 and drop obsolete patch
.gitignore | 1 +
sources | 2 +-
xmlstarlet-1.0.6-gendoc.patch | 102 -----------------------------------------
xmlstarlet.spec | 18 +++----
4 files changed, 10 insertions(+), 113 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0901579..3233c0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ xmlstarlet-1.0.1.tar.gz
/xmlstarlet-1.3.0.tar.gz
/xmlstarlet-1.3.1.tar.gz
/xmlstarlet-1.4.2.tar.gz
+/xmlstarlet-1.5.0.tar.gz
diff --git a/sources b/sources
index a4f9caa..aef8cdb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee8df42efd2417f74a1f5e3b7fe9e023 xmlstarlet-1.4.2.tar.gz
+0c6db295d0cf9ff0d439edb755b7e8f6 xmlstarlet-1.5.0.tar.gz
diff --git a/xmlstarlet.spec b/xmlstarlet.spec
index 414c8f3..366bde4 100644
--- a/xmlstarlet.spec
+++ b/xmlstarlet.spec
@@ -1,12 +1,11 @@
Name: xmlstarlet
-Version: 1.4.2
+Version: 1.5.0
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
# http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,22 +22,17 @@ commands.
%prep
%setup -q
-#%patch0 -p1 -b .gendoc
%build
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 --skip-validation man xmlstarlet-man.xml
-xmlto --skip-validation html-nochunks xmlstarlet-ug.xml
-./gen-doc > xmlstarlet.txt
%install
rm -fr %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}/%{name}-%{version}
# Avoid name kludging in autotools
mv $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet
@@ -54,13 +48,17 @@ rm -fr %{buildroot}
%files
%defattr(-, root, root)
-%doc AUTHORS ChangeLog NEWS README Copyright TODO doc/xmlstarlet.txt doc/xmlstarlet-ug.html
+%doc AUTHORS ChangeLog NEWS README Copyright TODO doc/xmlstarlet.txt doc/xmlstarlet-ug.html doc/xmlstarlet-ug.ps doc/xmlstarlet-ug.pdf doc/html.css
%{_mandir}/man1/xmlstarlet.1*
%{_bindir}/xmlstarlet
-%{_docdir}/xmlstarlet
%changelog
+* Wed Jul 10 2013 Paul W. Frields <stickster at gmail.com> - 1.5.0-1
+- Update to upstream 1.5.0 (#983025)
+- Fix man page rendering (#981050)
+- Use standard docdir
+
* Mon Mar 25 2013 Paul W. Frields <stickster at gmail.com> - 1.4.2-1
- Update to upstream 1.4.2 (#851880)
More information about the scm-commits
mailing list