diff options
-rw-r--r-- | packaging/xmlto-codecleanup.patch | 46 | ||||
-rw-r--r-- | packaging/xmlto-lynx-empty-file.patch | 14 | ||||
-rw-r--r-- | packaging/xmlto-nonvoid.patch | 24 | ||||
-rw-r--r-- | packaging/xmlto-overflow.patch | 16 | ||||
-rw-r--r-- | packaging/xmlto-xsltopts.patch | 32 | ||||
-rw-r--r-- | packaging/xmlto.spec | 12 |
6 files changed, 2 insertions, 142 deletions
diff --git a/packaging/xmlto-codecleanup.patch b/packaging/xmlto-codecleanup.patch deleted file mode 100644 index fa1f258..0000000 --- a/packaging/xmlto-codecleanup.patch +++ /dev/null @@ -1,46 +0,0 @@ -Index: xmlif/xmlif.l -=================================================================== ---- xmlif/xmlif.l.orig -+++ xmlif/xmlif.l -@@ -43,7 +43,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 { -@@ -84,7 +84,7 @@ static void pop_level(void) - } - } - --static void stash_attribute(char *attr) -+static void stash_attribute(const char *attr) - /* stash an attribute away for comparison */ - { - #ifdef DEBUG -@@ -176,7 +176,7 @@ static void process_value(char *val) - end->suppressed = suppress(attribute, val); - } - --static void process_else() -+static void process_else(void) - /* process <?xmlif else> tag */ - { - end->suppressed = end->matched; -@@ -230,9 +230,12 @@ WS [ \t\n]* - - #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; - diff --git a/packaging/xmlto-lynx-empty-file.patch b/packaging/xmlto-lynx-empty-file.patch deleted file mode 100644 index 92c8d17..0000000 --- a/packaging/xmlto-lynx-empty-file.patch +++ /dev/null @@ -1,14 +0,0 @@ -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" -+ - if [ $? == 4 ] - then - XSLTOPTS="${XSLTOPTS} --catalogs" diff --git a/packaging/xmlto-nonvoid.patch b/packaging/xmlto-nonvoid.patch deleted file mode 100644 index 7f7a00d..0000000 --- a/packaging/xmlto-nonvoid.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: xmlif/xmlif.c -=================================================================== ---- xmlif/xmlif.c.orig -+++ xmlif/xmlif.c -@@ -2435,6 +2435,7 @@ main(int argc, char *argv[]) - } - - yylex(); -+ return 0; - } - - /* -Index: xmlif/xmlif.l -=================================================================== ---- xmlif/xmlif.l.orig -+++ xmlif/xmlif.l -@@ -259,6 +259,7 @@ main(int argc, char *argv[]) - } - - yylex(); -+ return 0; - } - - /* diff --git a/packaging/xmlto-overflow.patch b/packaging/xmlto-overflow.patch deleted file mode 100644 index 3bed4e9..0000000 --- a/packaging/xmlto-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 - -+#include <string.h> - #include <stdio.h> - #include <unistd.h> -- -+#include <sys/socket.h> - - /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ - #ifdef c_plusplus diff --git a/packaging/xmlto-xsltopts.patch b/packaging/xmlto-xsltopts.patch deleted file mode 100644 index 8227e16..0000000 --- a/packaging/xmlto-xsltopts.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 - --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} \ -- --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: \ - -n xmlto -- x:m:o:p:v "$@") - [ $? != 0 ] && { usage; exit 1; } - eval set -- "$ARGS" -@@ -383,6 +384,10 @@ while [ "$#" -gt "0" ]; do - fi - shift - ;; -+ --xsltopts) -+ XSLTOPTS="$XSLTOPTS $2" -+ shift 2 -+ ;; - --) - shift - break diff --git a/packaging/xmlto.spec b/packaging/xmlto.spec index c32fba3..1fb21c9 100644 --- a/packaging/xmlto.spec +++ b/packaging/xmlto.spec @@ -6,11 +6,6 @@ Summary: Tool for Converting XML Files to Various Formats Url: https://fedorahosted.org/xmlto/ Group: Productivity/Publishing/XML Source0: https://fedorahosted.org/releases/x/m/xmlto/%{name}-%{version}.tar.bz2 -Patch0: xmlto-nonvoid.patch -Patch1: xmlto-overflow.patch -Patch3: xmlto-xsltopts.patch -Patch4: xmlto-codecleanup.patch -Patch5: xmlto-lynx-empty-file.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: flex BuildRequires: libxslt @@ -30,11 +25,8 @@ for print output it makes use of passivetex. %prep %setup -q -%patch0 -%patch1 -%patch3 -%patch4 -%patch5 + + rm -f xmlif/xmlif.c %build |