- added texinfo patch with some workarounds for texinfo 5.x; also avoid ":" in @set...

diff --git a/enblend-enfuse-texinfo.patch b/enblend-enfuse-texinfo.patch
new file mode 100644 (file)
index 0000000..6c5fa05
--- /dev/null
+++ b/enblend-enfuse-texinfo.patch
@@ -0,0 +1,139 @@
+For some reason texinfo 5 doesn't like @if... just after @macro and @end ... just before @end macro
+(strange things happen...)
+--- enblend-enfuse-4.1.1/doc/auxmac.texi.orig  2013-07-20 18:07:37.617634914 +0200
++++ enblend-enfuse-4.1.1/doc/auxmac.texi       2013-07-20 18:09:19.710963959 +0200
+@@ -82,6 +82,7 @@
+ 
+ @c Generate a nice representation of base^exponent.
+ @macro power{base, exponent}
++
+ @ifinfo
+ \base\^\exponent\
+ @end ifinfo
+@@ -94,10 +95,12 @@
+ @docbook
+ \base\<superscript>\exponent\</superscript>
+ @end docbook
++
+ @end macro
+ 
+ 
+ @macro classictimes
++
+ @ifinfo
+ x@c gobble following newline  -- The Tricks of a Texinfo Wizard.
+ @end ifinfo
+@@ -110,6 +113,7 @@
+ @docbook
+ &times;
+ @end docbook
++
+ @end macro
+ 
+ 
+@@ -117,6 +121,7 @@
+ @c for TeX lives in auxmac.tex.
+ @ifnottex
+ @macro geq
++
+ @ifinfo
+ >=@c
+ @end ifinfo
+@@ -126,6 +131,7 @@
+ @docbook
+ &ge;
+ @end docbook
++
+ @end macro
+ @end ifnottex
+ 
+@@ -140,6 +140,7 @@
+ @c for TeX lives in auxmac.tex.
+ @ifnottex
+ @macro leq
++
+ @ifinfo
+ <=@c
+ @end ifinfo
+@@ -149,6 +150,7 @@
+ @docbook
+ &le;
+ @end docbook
++
+ @end macro
+ @end ifnottex
+ 
+@@ -172,6 +174,7 @@
+ @c Special Characters
+ 
+ @macro inlineomega
++
+ @ifinfo
+ @math{omega}@c
+ @end ifinfo
+@@ -186,10 +189,12 @@
+ @docbook
+ &omega;
+ @end docbook
++
+ @end macro
+ 
+ 
+ @macro inlinesigma
++
+ @ifinfo
+ @math{sigma}@c
+ @end ifinfo
+@@ -204,10 +209,12 @@
+ @docbook
+ &sigma;
+ @end docbook
++
+ @end macro
+ 
+ 
+ @macro inlinexi
++
+ @ifinfo
+ @math{xi}@c
+ @end ifinfo
+@@ -222,6 +229,7 @@
+ @docbook
+ &xi;
+ @end docbook
++
+ @end macro
+ 
+ 
+@@ -239,6 +245,7 @@
+ 
+ 
+ @macro semilog{significant, exponent}
++
+ @ifinfo
+ \significant\*10^\exponent\@c
+ @end ifinfo
+@@ -258,4 +265,5 @@
+ @docbook
+ \significant\&times;10<superscript>\exponent\</superscript>
+ @end docbook
++
+ @end macro
+--- enblend-enfuse-4.1.1/doc/enfuse.texi.orig  2013-07-20 18:14:21.924284611 +0200
++++ enblend-enfuse-4.1.1/doc/enfuse.texi       2013-07-20 18:33:00.144237684 +0200
+@@ -2434,6 +2434,7 @@
+ input images@tie{}@math{n}.
+ 
+ @macro equationW{}
++
+ @ifnotdocbook
+ @ifnottex
+ (W)
+@@ -2445,6 +2446,7 @@
+ @docbook
+ <xref linkend="equ:pixel-weighting-function"/>
+ @end docbook
++
+ @end macro
+ 
+ Enfuse allows for weighting the contribution of each @math{P(i, x, y)}

diff --git a/enblend-enfuse.spec b/enblend-enfuse.spec
index c639565789e03d8540a101652915e2b7e9736d64..1e18290958e613e46f0fb3353878af602789f06b 100644 (file)
--- a/enblend-enfuse.spec
+++ b/enblend-enfuse.spec
@@ -13,6 +13,7 @@ Group:                Applications/Graphics
 Source0:       http://downloads.sourceforge.net/enblend/%{name}-%{version}.tar.gz
 # Source0-md5: 9bc34f423f3bee35150ab593211da4a2
 Patch0:                %{name}-info.patch
+Patch1:                %{name}-texinfo.patch
 URL:           http://enblend.sourceforge.net/
 BuildRequires: OpenEXR-devel >= 1.0
 BuildRequires: OpenGL-GLU-devel
@@ -58,6 +59,9 @@ przynajmniej bardzo trudne do zobaczenia. Enblend nie wyrównuje zdjęć
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
+%{__sed} -i -e 's/src:://g;s/CFG::/CFG_/g' doc/*.texi doc/define2set.pl configure.in
 
 %build
 %{__aclocal} -I m4