- updated to 2.0.3

- removed obsolete bison,texinfo patches

diff --git a/3DLDF-bison.patch b/3DLDF-bison.patch
deleted file mode 100644 (file)
index 005c9f7..0000000
--- a/3DLDF-bison.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-#--- 3DLDF-2.0.2/src/parser2.y++.orig  2013-11-21 18:40:43.899832522 +0100
-#+++ 3DLDF-2.0.2/src/parser2.y++       2013-11-22 15:44:21.813317413 +0100
-#@@ -50,7 +50,7 @@
-# 
-# 
-# int
-#-zzlex(YYSTYPE*lvalp,yyscan_t parameter);
-#+zzlex(YYSTYPE*lvalp,void*parameter);
-# 
-# int
-# zzwrap(void);
-#@@ -68,8 +68,8 @@
-# 
-# %verbose
-# %pure-parser
-#-%parse-param {yyscan_t parameter}
-#-%lex-param {yyscan_t parameter}
-#+%parse-param {void* parameter}
-#+%lex-param {void* parameter}
-# %name-prefix="zz"
-# %debug
-# 
-#--- 3DLDF-2.0.2/src/parser.y++.orig   2013-11-21 18:27:27.506532611 +0100
-#+++ 3DLDF-2.0.2/src/parser.y++        2013-11-22 16:12:15.819913829 +0100
-#@@ -118,8 +118,6 @@
-# 
-# 
-# 
-#-#define YYPARSE_PARAM parameter
-#-#define YYLEX_PARAM parameter
-# #define YYLTYPE LDF_LOCATION_TYPE
-# #define YYLOC_DEFAULT(Current, Rhs, N) 
-# 
-#@@ -170,7 +168,9 @@
-# 
-# %locations
-# 
-#-%pure_parser
-#+%pure-parser
-#+%parse-param { void* parameter }
-#+%lex-param { void* parameter }
-# /* %token_table */
-# %verbose
-# 
-#@@ -5520,7 +5520,7 @@
-# 
-# 
-# int
-#-yyerror(char const*message);
-#+yyerror(YYLTYPE *, void *, char const*message);
-# 
-# 
-# 
-#@@ -88615,7 +88615,7 @@
-# 
-# 
-# int
-#-yyerror(char const*message)
-#+yyerror(YYLTYPE *, void *, char const*message)
-# {
-# cerr<<"ERROR! In yyparse(): "<<message<<endl<<flush;
-# return 0;
---- 3DLDF-2.0.2/src/pbsndecl.w.orig    2013-11-07 14:36:06.000000000 +0100
-+++ 3DLDF-2.0.2/src/pbsndecl.w 2013-11-22 16:50:55.063149831 +0100
-@@ -202,8 +202,6 @@
- 
- @<Preprocessor macros not only for the parser@>=
- 
--#define YYPARSE_PARAM parameter
--#define YYLEX_PARAM parameter
- #define YYLTYPE LDF_LOCATION_TYPE
- #define YYLOC_DEFAULT(Current, Rhs, N) /* Do nothing.  */
- 
-@@ -257,7 +255,9 @@
- @q =%expect 1@>@/
- @=%locations@>@/
- @q =%glr-parser@>@/
--@=%pure_parser@>@/
-+@=%pure-parser@>@/
-+@=%parse-param { void* parameter }@>@/
-+@=%lex-param { void* parameter }@>@/
- @=/* %token_table */@>@/ 
- @=%verbose@>
- 
---- 3DLDF-2.0.2/src/pfuncfin.w.orig    2013-11-07 14:36:05.000000000 +0100
-+++ 3DLDF-2.0.2/src/pfuncfin.w 2013-11-22 16:52:09.186480056 +0100
-@@ -82,12 +82,12 @@
- @ {\it yyerror\/}().
- @<Declare functions@>=
- int
--yyerror(char const* message);@/
-+yyerror(YYLTYPE*, void*, char const* message);@/
- 
- @
- @<Define functions@>=
- int
--yyerror(char const* message)
-+yyerror(YYLTYPE*, void*, char const* message)
- {
-   cerr << "ERROR! In yyparse(): " << message << endl << flush;
-   return 0;
---- 3DLDF-2.0.2/src/parser2.web.orig   2013-08-11 19:36:46.000000000 +0200
-+++ 3DLDF-2.0.2/src/parser2.web        2013-11-22 16:53:09.503144191 +0100
-@@ -49,7 +49,7 @@
- @<Declarations of additional functions@>=
- 
- int 
--zzlex(YYSTYPE* lvalp, yyscan_t parameter);
-+zzlex(YYSTYPE* lvalp, void* parameter);
- 
- int
- zzwrap(void);
-@@ -63,8 +63,8 @@
- @<Options@>=
- @=%verbose@>@;@/
- @=%pure-parser@>@;@/
--@=%parse-param {yyscan_t parameter}@>@;@/
--@=%lex-param {yyscan_t parameter}@>@;@/
-+@=%parse-param {void* parameter}@>@;@/
-+@=%lex-param {void* parameter}@>@;@/
- @=%name-prefix="zz"@>@;@/
- @=%debug@>
- 

diff --git a/3DLDF-texinfo.patch b/3DLDF-texinfo.patch
deleted file mode 100644 (file)
index dd7e385..0000000
--- a/3DLDF-texinfo.patch
+++ /dev/null
@@ -1,326 +0,0 @@
---- 3DLDF-2.0.2/doc/3dldf.texi.orig    2013-11-22 16:54:08.976475028 +0100
-+++ 3DLDF-2.0.2/doc/3dldf.texi 2013-11-22 18:59:16.466159968 +0100
-@@ -6,6 +6,7 @@
- %%%% See the section "GNU Free Documentation License" in the file 
- %%%% fdl.texi for copying conditions.
- 
-+@iftex
- \input epsf 
- \def\epsfsize#1#2{#1}
- 
-@@ -18,6 +19,7 @@
- \font\manual=manfnt % font used for the METAFONT logo, etc.
- 
- \input texinfo   @c -*-texinfo-*-
-+@end iftex
- 
- @c %**start of header
- @setfilename 3dldf.info
-@@ -147,6 +149,7 @@ Concept Index
- 
- 
- @macro cpp {}
-+
- @iftex
- @tex
- @CPLUSPLUS
-@@ -155,10 +158,12 @@ Concept Index
- @ifnottex
- C++
- @end ifnottex
-+
- @end macro
- 
- 
- @macro MF {}
-+
- @iftex
- @tex
- {@manual METAFONT}
-@@ -167,6 +172,7 @@ C++
- @ifnottex
- METAFONT
- @end ifnottex
-+
- @end macro
- 
- @macro MP {}
---- 3DLDF-2.0.2/doc/dttypes.texi.orig  2013-11-06 18:26:14.000000000 +0100
-+++ 3DLDF-2.0.2/doc/dttypes.texi       2013-11-22 18:55:55.192835083 +0100
-@@ -50,13 +50,13 @@ Transformation matrix.
- @c
- Focus for the @dfn{perspective projection}.
- 
--@itemx pen
-+@item pen
- 
--@itemx dash_pattern
-+@item dash_pattern
- 
--@itemx color
-+@item color
- 
--@itemx string
-+@item string
- @end table 
- 
- 
---- 3DLDF-2.0.2/doc/old_doc/3DLDF.texi.orig    2013-11-22 19:32:04.326077385 +0100
-+++ 3DLDF-2.0.2/doc/old_doc/3DLDF.texi 2013-11-22 20:49:09.032549971 +0100
-@@ -6,6 +6,9 @@
- %% fdl.texi for copying conditions.
-   
- %%%% LDF 2002.11.16.  I hope doing this before I load texinfo.tex doesn't cause a problem.
-+@iftex
-+@tex
-+
- \font\ninerm=cmr9
- \font\tenbbb=msbm10 % Blackboard bold
- 
-@@ -303,6 +306,8 @@
- %%%% paragraphs. 
- 
- 
-+@end tex
-+@end iftex
- 
- 
- \input texinfo   @c -*-texinfo-*-
-@@ -856,6 +861,7 @@ Changes
- @end menu
- 
- @macro bibskip {}
-+
- @iftex 
- @tex 
- @medskip
-@@ -864,9 +870,11 @@ Changes
- @ifnottex 
- @sp 1
- @end ifnottex 
-+
- @end macro
- 
- @macro cpp {}
-+
- @iftex
- @tex
- @CPLUSPLUS
-@@ -875,6 +883,7 @@ Changes
- @ifnottex
- C++
- @end ifnottex
-+
- @end macro
- 
- 
-@@ -887,6 +896,7 @@ C++
- @ifnottex
- N
- @end ifnottex
-+
- @end macro
- 
- 
-@@ -899,6 +909,7 @@ N
- @ifnottex 
- R
- @end ifnottex
-+
- @end macro
- 
- @macro INT {}
-@@ -910,6 +921,7 @@ R
- @ifnottex 
- I
- @end ifnottex
-+
- @end macro
- 
- @c UBAR is only used in code written to examples.web.  There's no need
-@@ -930,6 +942,7 @@ _@c
- @end ifnottex 
-   
- @macro NEXTFIG {}
-+
- @iftex
- @tex 
- \\tempcnt=\\figcnt\\advance\\tempcnt by 1
-@@ -939,9 +952,11 @@ Fig.\\NBKS\\the\\tempcnt
- @ifnottex 
- [next figure]
- @end ifnottex
-+
- @end macro
- 
- @macro TWOPREFIG {}
-+
- @iftex
- @tex 
- \\tempcnt=\\figcnt\\advance\\tempcnt by -1
-@@ -951,9 +966,11 @@ Fig.\\NBKS\\the\\tempcnt
- @ifnottex 
- [the second-to-last figure]
- @end ifnottex
-+
- @end macro
- 
- @macro PREFIG {}
-+
- @iftex 
- @tex
- Fig.\\NBKS\\the\\figcnt
-@@ -962,11 +979,13 @@ Fig.\\NBKS\\the\\figcnt
- @ifnottex
- [the previous figure]
- @end ifnottex
-+
- @end macro
- 
- @c Kludge!  This won't work for 1 degree in the Info version!
- @c LDF 2003.11.25.
- @macro DEG{NUMBER}
-+
- @iftex
- @tex
- {$\NUMBER\^@circ$}%
-@@ -975,9 +994,11 @@ Fig.\\NBKS\\the\\figcnt
- @ifnottex
- \NUMBER\ degrees 
- @end ifnottex
-+
- @end macro
- 
- @macro PRM{NUMBER}  
-+
- @iftex
- @tex
- {$\NUMBER\^\\prime$}%
-@@ -986,11 +1007,13 @@ Fig.\\NBKS\\the\\figcnt
- @ifnottex
- \NUMBER\'
- @end ifnottex
-+
- @end macro
- 
- 
- 
- @macro SECT {}
-+
- @iftex 
- @tex
- @S
-@@ -999,6 +1022,7 @@ Fig.\\NBKS\\the\\figcnt
- @ifnottex 
- section
- @end ifnottex
-+
- @end macro
- 
- @c %% \OCB and \CCB are used in \BGRP and \EGRP (begin group and end group)
-@@ -1027,6 +1051,7 @@ section
- 
- 
- @macro angles{arg}
-+
- @iftex 
- @tex 
- $\\langle$\\it{\arg\\\/}$\\rangle$%
-@@ -1035,9 +1060,11 @@ $\\langle$\\it{\arg\\\/}$\\rangle$%
- @ifnottex 
- <\arg\>
- @end ifnottex
-+
- @end macro
- 
- @macro NEQ {arg}
-+
- @iftex 
- @tex
- $\\neq \arg\$ 
-@@ -1047,6 +1074,7 @@ $\\neq \arg\$
- @ifnottex 
- @math{!= \arg\}
- @end ifnottex 
-+
- @end macro
- 
- @c Calling this `@TIMES' caused problems.  Maybe the name wasn't the
-@@ -1054,6 +1082,7 @@ $\\neq \arg\$
- @c LDF 2003.12.08.
- @c
- @macro TMS {arg1, arg2}
-+
- @iftex 
- @tex
- $\arg1\ \\times \arg2\$% 
-@@ -1063,10 +1092,12 @@ $\arg1\ \\times \arg2\$%
- @ifnottex 
- @math{\arg1\ * \arg2\}
- @end ifnottex 
-+
- @end macro
- 
- @c ``By'' for matrices.
- @macro BYM {arg1, arg2}
-+
- @iftex 
- @tex
- $\arg1\ \\times \arg2\$% 
-@@ -1076,11 +1107,13 @@ $\arg1\ \\times \arg2\$%
- @ifnottex 
- @math{\arg1\ X \arg2\}
- @end ifnottex 
-+
- @end macro
-   
- 
- 
- @macro OVERRTARROW {arg}
-+
- @iftex 
- @tex
- $\\overrightarrow{\arg\}$%
-@@ -1090,9 +1123,11 @@ $\\overrightarrow{\arg\}$%
- @ifnottex 
- @math{\arg\}
- @end ifnottex 
-+
- @end macro
- 
- @macro PLUSMINUS {arg}
-+
- @iftex 
- @tex
- $\\pm{\arg\}$%
-@@ -1102,6 +1137,7 @@ $\\pm{\arg\}$%
- @ifnottex 
- @math{+ or - \arg\}
- @end ifnottex 
-+
- @end macro
- 
- @include intro.texi     
---- 3DLDF-2.0.2/doc/old_doc/path.texi.orig     2013-11-07 14:47:10.000000000 +0100
-+++ 3DLDF-2.0.2/doc/old_doc/path.texi  2013-11-22 19:57:36.219346432 +0100
-@@ -1744,7 +1744,7 @@ The length of the lines drawn.  The defa
- used as a dummy argument, if the default for @var{dist} is desired, but
- other arguments must be specified.  
- 
--@item
-+@item pos_
- @itemx pos_x
- @itemx pos_y
- @itemx pos_z
---- 3DLDF-2.0.2/doc/old_doc/solid.texi.orig    2013-11-07 14:47:14.000000000 +0100
-+++ 3DLDF-2.0.2/doc/old_doc/solid.texi 2013-11-22 21:49:57.262396873 +0100
-@@ -501,8 +501,7 @@ is empty, a message to this effect is pr
- @node Affine Transformations for Solids, Applying Transformations to Solids, Showing Solids, Solid Reference
- @section Affine Transformations
- 
--@deftypefn {Virtual functions} Transform scale (real @var{x}, [real @var{y} = 0, [real @var{z} = 0]])
--@code{Solid}.  
-+@deftypefn {Virtual functions} Transform scale (real @var{x}, [real @var{y} = 0, [real @var{z} = 0]]) @code{Solid}.  
- @deftypefnx {} Transform shear (real @var{xy}, [real @var{xz} = 0, [real @var{yx} = 0, [real @var{yz} = 0, [real @var{zx} = 0, [real @var{zy} = 0]]]]])
- @deftypefnx {} Transform shift (real @var{x}, [real @var{y} = 0, [real @var{z} = 0]])
- @deftypefnx {} Transform shift ({const Point&} @var{pt})

diff --git a/3DLDF.spec b/3DLDF.spec
index 2af388b35181dcee2959a3ed14283a3635663afd..5e572c241fb08e4a022f42d16dd88aad80769609 100644 (file)
--- a/3DLDF.spec
+++ b/3DLDF.spec
@@ -1,15 +1,13 @@
 Summary:       Three-dimensional drawing with MetaPost output
 Summary(pl.UTF-8):     Tworzenie trójwymiarowej grafiki z wyjściem w formacie MetaPost
 Name:          3DLDF
-Version:       2.0.2
+Version:       2.0.3
 Release:       1
 License:       GPL v2+
 Group:         Applications/Graphics
 Source0:       http://ftp.gnu.org/gnu/3dldf/%{name}-%{version}.tar.gz
-# Source0-md5: d64642c4e24115909b214c9b06c542a6
+# Source0-md5: 5e669f4efd3d576d42308ba61619a63f
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-bison.patch
-Patch2:                %{name}-texinfo.patch
 URL:           http://www.gnu.org/software/3dldf/
 # ps2pdf
 BuildRequires: ghostscript
@@ -35,8 +33,6 @@ w TeXu.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 # only 3dlfb binary uses libs, symbols are messed - no sense in building shared libs