pool/xmlto
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 236825 from home:scarabeus_iv

Browse Source 
- Version bump to 0.0.26:
  - --searchpath option no longer produces warning
    about local builtin used outside the function
    (debian #652974)
  - fix build with automake 1.13+
  - fix noextensions option recognition
  - handle used css list in epub format
- Rename SUSE readme to xmlto-README.SUSE to fix capitalization
- Rebase xmlto-xsltopts.patch to apply to latest release.

OBS-URL: https://build.opensuse.org/request/show/236825
OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=24
This commit is contained in:
OBS User mrdocs 2014-06-11 21:05:54 +00:00 committed by Git OBS Bridge
parent ef9953b2e7
commit 1ed60fd441
6 changed files with 42 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xmlto-0.0.25.tar.bz2
View File

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

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

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

0
xmlto-README.SuSE → xmlto-README.SUSE
View File

17
xmlto-xsltopts.patch
View File

@ -1,8 +1,7 @@
Index: xmlto.in
===================================================================
--- xmlto.in.orig
+++ xmlto.in
@@ -38,6 +38,7 @@ OPTIONs are:
diff -urN xmlto-0.0.26.old/xmlto.in xmlto-0.0.26/xmlto.in
--- xmlto-0.0.26.old/xmlto.in 2014-06-11 10:16:55.661844817 +0200
+++ xmlto-0.0.26/xmlto.in 2014-06-11 10:18:02.362850985 +0200
@@ -39,6 +39,7 @@
-o directory put output in the specified directory instead of
the current working directory
-p postprocopts pass option to postprocessor
@ -10,16 +9,16 @@ Index: xmlto.in
--extensions turn on stylesheet extensions for this tool chain
--noautosize do not autodetect paper size via locales or paperconf
--noclean temp files are not deleted automatically
@@ -262,7 +263,7 @@ ZIP_PATH=@ZIP@
@@ -283,7 +284,7 @@
# Process any options
ARGS=$(${GETOPT} \
- --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex \
+ --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex,xsltopts: \
- --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,with-fop,with-dblatex \
+ --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,with-fop,with-dblatex,xsltopts: \
-n xmlto -- x:m:o:p:v "$@")
[ $? != 0 ] && { usage; exit 1; }
eval set -- "$ARGS"
@@ -383,6 +384,10 @@ while [ "$#" -gt "0" ]; do
@@ -389,6 +390,10 @@
fi
shift
;;

13
xmlto.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Jun 11 08:24:10 UTC 2014 - tchvatal@suse.com
- Version bump to 0.0.26:
- --searchpath option no longer produces warning
about local builtin used outside the function
(debian #652974)
- fix build with automake 1.13+
- fix noextensions option recognition
- handle used css list in epub format
- Rename SUSE readme to xmlto-README.SUSE to fix capitalization
- Rebase xmlto-xsltopts.patch to apply to latest release.
-------------------------------------------------------------------
Thu Dec 6 07:21:10 UTC 2012 - pascal.bleser@opensuse.org

58
xmlto.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xmlto
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -16,62 +16,42 @@
#
%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}
%define make_install %{makeinstall}
%endif
Name: xmlto
Version: 0.0.26
Release: 0
Summary: Tool for Converting XML Files to Various Formats
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
Source10: %{name}-README.SUSE
Patch0: xmlto-nonvoid.patch
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: 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
# For full functionality, we need passivetex.
Recommends: texlive-xmltex >= 2007
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1210
Requires: libxslt-tools
BuildRequires: libxslt-tools
%else
%if 0%{?suse_version} >= 1210
Requires: libxslt1
BuildRequires: libxslt1
Requires: libxslt-tools
%else
%if 0%{?suse_version} > 0
Requires: libxslt
BuildRequires: libxslt
Requires: libxslt
%else
BuildRequires: xsltproc
Requires: xsltproc
%endif
%endif
%endif
# For full functionality, we need passivetex.
Recommends: texlive-xmltex >= 2007
%description
This is a package for converting XML files to various formats using XSL
@ -82,14 +62,14 @@ for print output it makes use of passivetex.
%setup -q
%patch0
%patch1
%patch3
%patch3 -p1
%patch4
%patch5
cp %{SOURCE10} README.SuSE
cp %{SOURCE10} README.SUSE
rm -f xmlif/xmlif.c
# make sure the buildrequires pulled in xsltproc
test -x /usr/bin/xsltproc || {
test -x %{_bindir}/xsltproc || {
echo "ERROR: buildrequires didn't install xsltproc" >&2
exit 1
}
@ -99,18 +79,16 @@ test -x /usr/bin/xsltproc || {
make %{?_smp_mflags}
%check
make check
make check %{?_smp_mflags}
%install
%make_install
%__install -d %{buildroot}%{_datadir}/xmlto/xsl
%if %{dist_has_fdupes}
%{fdupes '%{buildroot}%{_datadir}/xmlto'}
%endif
make DESTDIR=%{buildroot} install %{?_smp_mflags}
install -d %{buildroot}%{_datadir}/xmlto/xsl
%fdupes '%{buildroot}%{_datadir}/xmlto'
%files
%defattr(-,root,root)
%doc README.SuSE
%doc README.SUSE
%doc COPYING
%doc AUTHORS README ChangeLog FAQ THANKS NEWS
%{_bindir}/xmlto