Accepting request 393475 from home:pluskalm:branches:Publishing

- Update to 1.6.1:
  * handle unicode arguments under Windows
- Changes for 1.6.0:
  * get rid of "helpful" message about namespaces
  * update user guide
  * Enhancements:
    + add --stop option to val
    + add global option --no-doc-namespace
  * Build:
    + let the make install target succeed even if docs aren't 
      built.
- Cleanup spec file with spec-cleaner
- Cleanup dependencies
- Refresh xmlstarlet-xml_depyx.c.diff

OBS-URL: https://build.opensuse.org/request/show/393475
OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlstarlet?expand=0&rev=31
This commit is contained in:
Martin Pluskal 2016-05-05 08:05:36 +00:00 committed by Git OBS Bridge
parent dc3baecdb9
commit 556c7c44cd
5 changed files with 51 additions and 40 deletions

View File

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

BIN
xmlstarlet-1.6.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,6 +1,8 @@
--- src/xml_depyx.c.orig 2011-02-17 09:53:27.000000000 +0100
+++ src/xml_depyx.c 2011-02-17 10:00:13.000000000 +0100
@@ -115,6 +115,7 @@
Index: src/xml_depyx.c
===================================================================
--- src/xml_depyx.c.orig
+++ src/xml_depyx.c
@@ -105,6 +105,7 @@ pyxDePyx(char *file)
{
static char line[INSZ];
FILE *in = stdin;
@ -8,7 +10,7 @@
if (strcmp(file, "-"))
{
@@ -124,6 +125,7 @@
@@ -114,6 +115,7 @@ pyxDePyx(char *file)
fprintf(stderr, "error: could not open: %s\n", file);
exit(EXIT_BAD_FILE);
}
@ -16,7 +18,7 @@
}
while (!feof(in))
@@ -216,6 +218,11 @@
@@ -206,6 +208,11 @@ pyxDePyx(char *file)
}
}

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue May 3 19:09:24 UTC 2016 - mpluskal@suse.com
- Update to 1.6.1:
* handle unicode arguments under Windows
- Changes for 1.6.0:
* get rid of "helpful" message about namespaces
* update user guide
* Enhancements:
+ add --stop option to val
+ add global option --no-doc-namespace
* Build:
+ let the make install target succeed even if docs aren't
built.
- Cleanup spec file with spec-cleaner
- Cleanup dependencies
- Refresh xmlstarlet-xml_depyx.c.diff
-------------------------------------------------------------------
Mon Oct 13 08:52:37 UTC 2014 - toms@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package xmlstarlet
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,53 +17,47 @@
Name: xmlstarlet
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: libtool
Version: 1.6.1
Release: 0
Summary: Command Line Tool to Process XML Documents
License: MIT
Group: Productivity/Publishing/XML
Url: http://sourceforge.net/projects/xmlstar/
Source: http://prdownloads.sourceforge.net/xmlstar/xmlstarlet-%{version}.tar.gz
Source1: %{name}-rpmlintrc
Patch2: %{name}-xml_depyx.c.diff
BuildRequires: libxml2-devel >= 2.6.27
BuildRequires: libxslt-devel >= 1.1.9
BuildRequires: pkgconfig
BuildRequires: sgml-skel
Summary: Command Line Tool to Process XML Documents
License: MIT
Group: Productivity/Publishing/XML
Version: 1.5.0
Release: 0
Source: http://prdownloads.sourceforge.net/xmlstar/xmlstarlet-%{version}.tar.gz
Source1: %{name}-rpmlintrc
Patch2: %{name}-xml_depyx.c.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://sourceforge.net/projects/xmlstar/
%description
XMLStarlet (xml) is a command line XML toolkit which can be used to
transform, query, validate, and edit XML documents and files using
simple set of shell commands in similar way it is done for plain text
files using 'grep', 'sed', 'awk', 'tr', 'diff', or 'patch'.
transform, query, validate, and edit XML documents and files using simple
set of shell commands in similar way it is done for plain text files using
'grep', 'sed', 'awk', 'tr', 'diff', or 'patch'.
%prep
%setup -q
%patch2
%build
export CFLAGS="$RPM_OPT_FLAGS -W -Wall"
export CFLAGS="%{optflags} -W -Wall"
%configure \
--disable-static-libs \
--disable-silent-rules
%__make %{?_smp_mflags} V=1
make %{?_smp_mflags}
%check
%__make tests
make %{?_smp_mflags} tests
%install
%makeinstall V=1
make %{?_smp_mflags} DESTDIR=%{buildroot} install
install -d _docs
%__mv "%{buildroot}%{_datadir}/doc"/* _docs/
%__rm -rf "%{buildroot}%{_datadir}/doc"
mv "%{buildroot}%{_datadir}/doc"/* _docs/
rm -rf "%{buildroot}%{_datadir}/doc"
cd %{buildroot}%{_bindir}
ln -s xml %{name}
@ -71,16 +65,13 @@ ln -s xml %{name}
cd %{buildroot}%{_mandir}/man1/
ln -s %{name}.1%{ext_man} xml.1%{ext_man}
%clean
%{?buildroot:%__rm -rf "%{buildroot}"}
%files
%defattr(-, root, root)
%doc AUTHORS ChangeLog NEWS README Copyright TODO
%doc _docs/*
%{_bindir}/xml
%{_bindir}/%{name}
%doc %{_mandir}/man1/%{name}.1%{ext_man}
%doc %{_mandir}/man1/xml.1%{ext_man}
%{_mandir}/man1/%{name}.1%{ext_man}
%{_mandir}/man1/xml.1%{ext_man}
%changelog