- texinfo-cpp_macros.patch: avoid #ifdef in cpp macros

- Release 5

Changed files:
    texinfo-cpp_macros.patch -> 1.1
    texinfo.spec -> 1.53

diff --git a/texinfo-cpp_macros.patch b/texinfo-cpp_macros.patch
new file mode 100644 (file)
index 0000000..8559c06
--- /dev/null
+++ b/texinfo-cpp_macros.patch
@@ -0,0 +1,30 @@
+--- texinfo-4.0b/info/info.c~  Tue May  1 18:12:30 2001
++++ texinfo-4.0b/info/info.c   Tue Dec 11 00:18:42 2001
+@@ -527,6 +527,12 @@
+ static void
+ info_short_help ()
+ {
++#ifdef __MSDOS__
++#define SPEECH_FRIENDLY "\
++ --speech-friendly        be friendly to speech synthesizers.\n"
++#else
++#define SPEECH_FRIENDLY ""
++#endif
+   printf (_("\
+ Usage: %s [OPTION]... [MENU-ITEM...]\n\
+ \n\
+@@ -564,13 +570,7 @@
+ general questions and discussion to help-texinfo@gnu.org.\n\
+ "),
+   program_name,
+-#ifdef __MSDOS__
+-"\
+- --speech-friendly        be friendly to speech synthesizers.\n"
+-#else
+-""
+-#endif
+-        );
++  SPEECH_FRIENDLY);
+ 
+   xexit (0);
+ }

diff --git a/texinfo.spec b/texinfo.spec
index 40731fc0ec2891086fcc561ca0fc1ab81e03e97a..5b92a68a559dcd2d9ec6031e9997780b3794c412 100644 (file)
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -5,7 +5,7 @@ Summary(pl):    Narz
 Summary(tr):   texinfo biçimleyici ve info okuyucu
 Name:          texinfo
 Version:       4.0b
 Summary(tr):   texinfo biçimleyici ve info okuyucu
 Name:          texinfo
 Version:       4.0b

-Release:       4
+Release:       5

 License:       GPL
 Group:         Applications/Publishing
 Group(de):     Applikationen/Publizieren
 License:       GPL
 Group:         Applications/Publishing
 Group(de):     Applikationen/Publizieren


@@ -19,6 +19,7 @@ Patch3:               %{name}-version.texi.patch
 Patch4:                %{name}-DESTDIR.patch
 Patch5:                %{name}-fileextension.patch
 Patch6:                %{name}-danish.patch
 Patch4:                %{name}-DESTDIR.patch
 Patch5:                %{name}-fileextension.patch
 Patch6:                %{name}-danish.patch

+Patch7:                %{name}-cpp_macros.patch

 URL:           http://texinfo.org/
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://texinfo.org/
 BuildRequires: autoconf
 BuildRequires: automake


@@ -130,6 +131,7 @@ Narz
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1

+%patch7 -p1

 
 %build
 ln -sf version.texi doc/version2.texi
 
 %build
 ln -sf version.texi doc/version2.texi