This commit is contained in:
parent
f4a12dc002
commit
56ed3b4611
44
xmlto-codecleanup.patch
Normal file
44
xmlto-codecleanup.patch
Normal file
@ -0,0 +1,44 @@
|
||||
--- xmlif/xmlif.l
|
||||
+++ xmlif/xmlif.l
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
static char **selections; /* selection tokens */
|
||||
static int nselections; /* number of selections */
|
||||
-static ifsense; /* sense of last `if' or unless seen */
|
||||
+static int ifsense; /* sense of last `if' or unless seen */
|
||||
static char *attribute; /* last attribute scanned */
|
||||
|
||||
struct stack_t {
|
||||
@@ -71,7 +71,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
-static void stash_attribute(char *attr)
|
||||
+static void stash_attribute(const char *attr)
|
||||
/* stash an attribute away for comparison */
|
||||
{
|
||||
#ifdef DEBUG
|
||||
@@ -163,7 +163,7 @@
|
||||
end->suppressed = suppress(attribute, val);
|
||||
}
|
||||
|
||||
-static void process_else()
|
||||
+static void process_else(void)
|
||||
/* process <?xmlif else> tag */
|
||||
{
|
||||
end->suppressed = end->matched;
|
||||
@@ -217,9 +217,12 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
-int yywrap() {exit(0);};
|
||||
+int yywrap(void)
|
||||
+{
|
||||
+ exit(0);
|
||||
+}
|
||||
|
||||
-main(int argc, char *argv[])
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
int i;
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 28 19:50:22 CEST 2009 - pth@suse.de
|
||||
|
||||
- Fix comiler warnings.
|
||||
- BuildRequire flex and remove xmlif.c to get it regenerated.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 9 09:48:19 CEST 2008 - ke@suse.de
|
||||
|
||||
|
20
xmlto.spec
20
xmlto.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xmlto (Version 0.0.18)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2009 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
|
||||
@ -19,10 +19,10 @@
|
||||
|
||||
|
||||
Name: xmlto
|
||||
BuildRequires: docbook-xsl-stylesheets libxslt sgml-skel
|
||||
BuildRequires: docbook-xsl-stylesheets flex libxslt sgml-skel
|
||||
Summary: Tool for Converting XML Files to Various Formats
|
||||
Version: 0.0.18
|
||||
Release: 182
|
||||
Release: 185
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/Publishing/XML
|
||||
Url: http://cyberelk.net/tim/xmlto/
|
||||
@ -32,15 +32,14 @@ Patch: xmlto-nonvoid.patch
|
||||
Patch1: xmlto-0.0.18-overflow.patch
|
||||
Patch2: xmlto-find-cmd.diff
|
||||
Patch3: xmlto-0.0.18-xsltopts.diff
|
||||
Patch4: xmlto-codecleanup.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# We rely entirely on the DocBook XSL stylesheets!
|
||||
Requires: docbook-xsl-stylesheets >= 1.56.0
|
||||
# For full functionality, we need passivetex.
|
||||
Requires: texlive-xmltex >= 2007
|
||||
Requires: libxslt
|
||||
#Does not work; split libxml2 and libxslt
|
||||
#Requires: /usr/bin/xsltproc
|
||||
#Requires: /usr/bin/xmllint
|
||||
Requires: libxml2
|
||||
Requires: docbook_4
|
||||
|
||||
%description
|
||||
@ -53,8 +52,12 @@ for print output it makes use of passivetex.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch
|
||||
%patch -p 1 -P 1 -p 1 -P 2 -p 1 -P 3
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4
|
||||
cp %{S:10} README.SuSE
|
||||
rm -f xmlif/xmlif.c
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -80,6 +83,9 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/xmlto
|
||||
|
||||
%changelog
|
||||
* Tue Apr 28 2009 pth@suse.de
|
||||
- Fix comiler warnings.
|
||||
- BuildRequire flex and remove xmlif.c to get it regenerated.
|
||||
* Tue Sep 09 2008 ke@suse.de
|
||||
- Improve README.SUSE; bnc#67190.
|
||||
* Mon Mar 17 2008 werner@suse.de
|
||||
|
Loading…
x
Reference in New Issue
Block a user