merge

OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlstarlet?expand=0&rev=23

xmlstarlet-1.3.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:effe9aba3f8003d1da2b07aa54af4f3b5956bd09f061c499442415278425885b
-size 385752

xmlstarlet-1.4.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abd29bcc826c3efb5e2dacd0378fc87457b1a37c5496cfad423cff740bf1feea
+size 401812

xmlstarlet.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Oct 18 11:08:49 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 1.4.0:
+  * ed subcommand:
+    - relative XPaths are now handled correctly (Bug #3527850)
+    - the last nodeset inserted by an edit operation can be
+      accessed as the XPath variable $prev (or $xstar:prev)
+    - add --var option to define XPath variables
+    - allow ed -u -x to insert nodesets instead of converting to
+      string
+    - remove hard limit for number of edit operations (Bug
+      #3488240)
+  * pyx now handles namespaces correctly
+
 -------------------------------------------------------------------
 Tue Feb 21 11:27:45 UTC 2012 - pascal.bleser@opensuse.org
 

xmlstarlet.spec

@@ -16,17 +16,21 @@
 #
 
 
-
 Name:           xmlstarlet
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  libtool
 BuildRequires:  libxml2-devel >= 2.6.27
 BuildRequires:  libxslt-devel >= 1.1.9
+BuildRequires:  pkgconfig
 BuildRequires:  sgml-skel
-BuildRequires:  autoconf automake gcc glibc-devel libtool pkgconfig
 Summary:        Command Line Tool to Process XML Documents
-Version:        1.3.1
-Release:        1
 License:        MIT
 Group:          Productivity/Publishing/XML
+Version:        1.4.0
+Release:        0
 Source:         http://prdownloads.sourceforge.net/xmlstar/xmlstarlet-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
 Patch2:         %{name}-xml_depyx.c.diff
@@ -50,24 +54,23 @@ export CFLAGS="$RPM_OPT_FLAGS -W -Wall"
 
 %__make %{?_smp_mflags}
 
-%__mkdir_p html
-%__cp -a doc/callouts html
-%__cp doc/*{css,html} html
-
 %check
 %__make tests
 
 %install
 %makeinstall
 
+install -d _docs
+%__mv "%{buildroot}%{_datadir}/doc"/* _docs/
+%__rm -rf "%{buildroot}%{_datadir}/doc"
+
 %clean
 %{?buildroot:%__rm -rf "%{buildroot}"}
 
 %files
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog NEWS README Copyright TODO
-%doc doc/xmlstarlet.txt doc/xmlstarlet.pdf
-%doc html
+%doc _docs/*
 %{_bindir}/xml
 %doc %{_mandir}/man1/xmlstarlet.1%{ext_man}