Accepting request 124715 from Publishing

update

OBS-URL: https://build.opensuse.org/request/show/124715
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlto?expand=0&rev=23
This commit is contained in:
Stephan Kulow 2012-06-15 13:39:54 +00:00 committed by Git OBS Bridge
commit f9dc1acf2e
9 changed files with 89 additions and 41 deletions

View File

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

3
xmlto-0.0.25.tar.bz2 Normal file
View File

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

View File

@ -1,5 +1,7 @@
--- xmlif/xmlif.l.orig 2009-12-16 15:29:45.000000000 +0100
+++ xmlif/xmlif.l 2009-12-16 15:45:19.000000000 +0100
Index: xmlif/xmlif.l
===================================================================
--- xmlif/xmlif.l.orig
+++ xmlif/xmlif.l
@@ -43,7 +43,7 @@
static char **selections; /* selection tokens */
@ -9,7 +11,7 @@
static char *attribute; /* last attribute scanned */
struct stack_t {
@@ -84,7 +84,7 @@
@@ -84,7 +84,7 @@ static void pop_level(void)
}
}
@ -18,7 +20,7 @@
/* stash an attribute away for comparison */
{
#ifdef DEBUG
@@ -176,7 +176,7 @@
@@ -176,7 +176,7 @@ static void process_value(char *val)
end->suppressed = suppress(attribute, val);
}
@ -27,7 +29,7 @@
/* process <?xmlif else> tag */
{
end->suppressed = end->matched;
@@ -230,9 +230,12 @@
@@ -230,9 +230,12 @@ WS [ \t\n]*
#include "config.h"

View File

@ -1,8 +1,10 @@
--- xmlto.in 2011-10-19 16:02:34.130369281 +0200
+++ xmlto.in 2011-10-19 16:03:24.226367583 +0200
@@ -566,6 +566,9 @@
-o "$XSLT_PROCESSED" "$STYLESHEET" "$INPUT_FILE"
fi
Index: xmlto.in
===================================================================
--- xmlto.in.orig
+++ xmlto.in
@@ -584,6 +584,9 @@ else
#xsltproc may return no file on empty input, touch it to have it for sure
touch "$XSLT_PROCESSED"
+ #xsltproc may return no file on empty input, touch it to have it for sure
+ touch "$XSLT_PROCESSED"

View File

@ -1,6 +1,8 @@
--- xmlif/xmlif.c.orig 2009-03-16 17:53:22.000000000 +0100
+++ xmlif/xmlif.c 2009-12-16 15:29:45.000000000 +0100
@@ -2435,6 +2435,7 @@
Index: xmlif/xmlif.c
===================================================================
--- xmlif/xmlif.c.orig
+++ xmlif/xmlif.c
@@ -2435,6 +2435,7 @@ main(int argc, char *argv[])
}
yylex();
@ -8,9 +10,11 @@
}
/*
--- xmlif/xmlif.l.orig 2009-03-16 17:52:01.000000000 +0100
+++ xmlif/xmlif.l 2009-12-16 15:29:45.000000000 +0100
@@ -259,6 +259,7 @@
Index: xmlif/xmlif.l
===================================================================
--- xmlif/xmlif.l.orig
+++ xmlif/xmlif.l
@@ -259,6 +259,7 @@ main(int argc, char *argv[])
}
yylex();

View File

@ -1,5 +1,7 @@
--- xmlto-0.0.18/xmlif/xmlif.c.~1~ 2004-01-21 12:07:55.000000000 +0100
+++ xmlto-0.0.18/xmlif/xmlif.c 2005-07-06 11:41:15.000000000 +0200
Index: xmlif/xmlif.c
===================================================================
--- xmlif/xmlif.c.orig
+++ xmlif/xmlif.c
@@ -8,9 +8,10 @@
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
@ -12,5 +14,3 @@
/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
#ifdef c_plusplus
Diff finished. Wed Jul 6 11:41:33 2005

View File

@ -1,14 +1,16 @@
--- xmlto.in.orig 2009-09-21 14:41:17.000000000 +0200
+++ xmlto.in 2009-12-16 15:38:31.000000000 +0100
@@ -37,6 +37,7 @@
Index: xmlto.in
===================================================================
--- xmlto.in.orig
+++ xmlto.in
@@ -38,6 +38,7 @@ OPTIONs are:
-o directory put output in the specified directory instead of
the current working directory
-p postprocopts pass option to postprocessor
+ --xsltopts use xsltproc command line options
--extensions turn on stylesheet extensions for this tool chain
--searchpath colon-separated list of fallback directories
--skip-validation
@@ -251,7 +252,7 @@
--noautosize do not autodetect paper size via locales or paperconf
--noclean temp files are not deleted automatically
@@ -262,7 +263,7 @@ ZIP_PATH=@ZIP@
# Process any options
ARGS=$(${GETOPT} \
@ -17,7 +19,7 @@
-n xmlto -- x:m:o:p:v "$@")
[ $? != 0 ] && { usage; exit 1; }
eval set -- "$ARGS"
@@ -356,6 +357,10 @@
@@ -383,6 +384,10 @@ while [ "$#" -gt "0" ]; do
fi
shift
;;

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Apr 18 16:47:31 UTC 2012 - chris@computersalat.de
- update to 0.0.25
- 2011-11-28 Ondrej Vasik <ovasik@redhat.com>
* configure.in: detect grep location
* xmlto.in: use (fop/fop1).extensions parameter based on real
fop version
- 2011-07-14 Ondrej Vasik <ovasik@redhat.com>
* format/docbook/epub: initial experimental support for
docbook to epub conversion
* configure.in: detect zip location
* xmlto.in: provide detected zip location to epub convertor
- 2011-07-07 Ondrej Vasik <ovasik@redhat.com>
* README: Improve the readme file, create online manual
pages on project wiki
* xmlto.in: use backend extensions by default, provide
--noextensions to disable this
* doc/xmlto.xml: mention --noextensions option in documentation
- 2011-03-03 Ondrej Vasik <ovasik@redhat.com>
* format/{docbook,xhtml}/txt: show the text-web-browser
converting command in verbose mode
- 2010-07-13 Ondrej Vasik <ovasik@redhat.com>
* format/fo/{ps,dvi,pdf}: workaround passivetex limitation
for chapters titles starting with L (rhbz#526273)
- rebase patches (xmlto-overflow.patch, xmlto-xsltopts.patch).
-------------------------------------------------------------------
Wed Oct 19 14:01:53 UTC 2011 - idonmez@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package xmlto
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%if 0%{?suse_version} < 1030
%define dist_has_fdupes 0
%else
%define dist_has_fdupes 1
%endif
# support SLE 11
%if !0%{?make_install:1}
@ -22,31 +27,35 @@
%endif
Name: xmlto
Version: 0.0.23
Release: 14
License: GPL-2.0+
Summary: Tool for Converting XML Files to Various Formats
Url: https://fedorahosted.org/xmlto/
License: GPL-2.0+
Group: Productivity/Publishing/XML
Version: 0.0.25
Release: 0
Url: https://fedorahosted.org/xmlto/
Source0: https://fedorahosted.org/releases/x/m/xmlto/%{name}-%{version}.tar.bz2
Source10: %{name}-README.SuSE
Patch0: xmlto-nonvoid.patch
Patch1: xmlto-0.0.18-overflow.patch
Patch3: xmlto-0.0.23-xsltopts.diff
Patch1: xmlto-overflow.patch
Patch3: xmlto-xsltopts.patch
Patch4: xmlto-codecleanup.patch
Patch5: xmlto-lynx-empty-file.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: libxslt
BuildRequires: sgml-skel
%if %{dist_has_fdupes}
BuildRequires: fdupes
%endif
# We rely entirely on the DocBook XSL stylesheets!
Requires: docbook-xsl-stylesheets >= 1.56.0
Requires: docbook_4
Requires: xsltproc
# For full functionality, we need passivetex.
Recommends: texlive-xmltex >= 2007
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This is a package for converting XML files to various formats using XSL
@ -56,8 +65,8 @@ for print output it makes use of passivetex.
%prep
%setup -q
%patch0
%patch1 -p1
%patch3 -p0
%patch1
%patch3
%patch4
%patch5
cp %{SOURCE10} README.SuSE
@ -73,7 +82,9 @@ make check
%install
%make_install
! mkdir %{buildroot}%{_datadir}/xmlto/xsl
%if %{dist_has_fdupes}
%{fdupes '%{buildroot}%{_datadir}/xmlto'}
%endif
%files
%defattr(-,root,root)