Update to upstream 1.5.0 and drop obsolete patch
This commit is contained in:
Paul W. Frields
parent
24650f31ac
commit
b3730ca072
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
ee8df42efd2417f74a1f5e3b7fe9e023 xmlstarlet-1.4.2.tar.gz
|
||||
0c6db295d0cf9ff0d439edb755b7e8f6 xmlstarlet-1.5.0.tar.gz
|
||||
|
||||
@ -1,102 +0,0 @@
|
||||
diff -uNr xmlstarlet-1.0.6-orig/doc/gen-doc xmlstarlet-1.0.6/doc/gen-doc
|
||||
--- xmlstarlet-1.0.6-orig/doc/gen-doc 2011-03-07 19:48:17.000000000 -0500
|
||||
+++ xmlstarlet-1.0.6/doc/gen-doc 2011-03-26 14:42:44.417907852 -0400
|
||||
@@ -15,7 +15,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml"
|
||||
-../src/xml 2>&1
|
||||
+../xml 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -24,7 +24,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml sel --help"
|
||||
-../src/xml sel --help 2>&1
|
||||
+../xml sel --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -33,7 +33,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml ed --help"
|
||||
-../src/xml ed --help 2>&1
|
||||
+../xml ed --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -42,7 +42,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml tr --help"
|
||||
-../src/xml tr --help 2>&1
|
||||
+../xml tr --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -51,7 +51,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml fo --help"
|
||||
-../src/xml fo --help 2>&1
|
||||
+../xml fo --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -60,7 +60,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml val --help"
|
||||
-../src/xml val --help 2>&1
|
||||
+../xml val --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -69,7 +69,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml el --help"
|
||||
-../src/xml el --help 2>&1
|
||||
+../xml el --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -79,7 +79,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml esc --help"
|
||||
-../src/xml esc --help 2>&1
|
||||
+../xml esc --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -89,7 +89,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml ls --help"
|
||||
-../src/xml ls --help 2>&1
|
||||
+../xml ls --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -99,7 +99,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml c14n --help"
|
||||
-../src/xml c14n --help 2>&1
|
||||
+../xml c14n --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -109,7 +109,7 @@
|
||||
echo "===================================================="
|
||||
echo ""
|
||||
echo "xml pyx --help"
|
||||
-../src/xml pyx --help 2>&1
|
||||
+../xml pyx --help 2>&1
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
@ -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@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@gmail.com> - 1.4.2-1
|
||||
- Update to upstream 1.4.2 (#851880)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user