]> git.pld-linux.org Git - packages/texlive.git/commitdiff
Start update to 20130530
authorArtur Frysiak <artur@frysiak.net>
Sat, 6 Jul 2013 14:42:51 +0000 (16:42 +0200)
committerArtur Frysiak <artur@frysiak.net>
Sat, 6 Jul 2013 14:42:51 +0000 (16:42 +0200)
format-security.patch
texlive.spec

index 28842ffdce1882b9af0f877e9e84f59a53203f68..b59b9459b528d327c73237055ff73c48167e03fd 100644 (file)
@@ -1,18 +1,79 @@
---- texlive-20080816-source/libs/icu-xetex/tools/ctestfw/uperf.cpp~    2008-03-04 14:26:36.000000000 +0100
-+++ texlive-20080816-source/libs/icu-xetex/tools/ctestfw/uperf.cpp     2012-12-05 13:40:23.702450798 +0100
-@@ -485,8 +485,7 @@
-         this->runIndexedTest( index, FALSE, name );
-         if (!name)
-             break;
--        fprintf(stdout,name);
--        fprintf(stdout,"\n");
-+        fprintf(stdout,"%s\n", name);
-         index++;
-     }while (name && (name[0] != 0));
-     verbose = save_verbose;
---- texlive-20080816-source/texk/web2c/cwebdir/common.w~       2008-04-28 11:22:39.000000000 +0200
-+++ texlive-20080816-source/texk/web2c/cwebdir/common.w        2012-12-05 13:43:03.025778512 +0100
-@@ -1180,7 +1180,7 @@
+--- texlive-20130530-source/texk/devnag/src/devnag.c.wiget     2012-07-09 13:59:05.000000000 +0200
++++ texlive-20130530-source/texk/devnag/src/devnag.c   2013-07-06 13:32:29.571327342 +0200
+@@ -2395,7 +2395,7 @@ void put_macro(short macro) {
+ void err_ill(const char *str) {
+    fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
+         str, linenumber);
+-   fprintf(stderr, inbuf);
++   fputs(inbuf, stderr);
+    exit(1);
+ }
+--- texlive-20130530-source/texk/dvidvi/dvidvi.c.wiget 2012-07-09 14:13:15.000000000 +0200
++++ texlive-20130530-source/texk/dvidvi/dvidvi.c       2013-07-06 13:42:29.426582698 +0200
+@@ -327,7 +327,7 @@ static void stringdvibuf(integer p, inte
+  *   Print a usage error messsage, and quit.
+  */
+ static void usage(void) {
+-   (void)fprintf(stderr,banner);
++   (void)fprintf(stderr,"%s", banner);
+    (void)fprintf(stderr,"Usage:  dvidvi [options] input[.dvi] [output]\n");
+    (void)fprintf(stderr,"where options are:\n");
+    (void)fprintf(stderr,"    [-f n] first page printed     [-l n] last page printed\n");
+@@ -806,7 +806,7 @@ default:
+       } /* else argument with '-' */
+    }  /* for */
+    if (*iname == 0) {
+-       (void)fprintf(stderr, banner) ;
++       (void)fprintf(stderr, "%s", banner) ;
+        error("! no input file specified");
+    }
+    /* Inserted by djc@dsmail.hmi.de 3.8.1994 */
+@@ -817,7 +817,7 @@ default:
+    }
+    if (*oname != 0 && !quiet) {
+-       (void)fprintf(stderr, banner) ;
++       (void)fprintf(stderr, "%s", banner) ;
+        (void)fprintf(stderr, "%s -> %s\n",iname,oname);
+        temp = nextstring ;
+    }
+--- texlive-20130530-source/texk/ps2pkm/objects.h.wiget        2009-06-22 16:33:57.000000000 +0200
++++ texlive-20130530-source/texk/ps2pkm/objects.h      2013-07-06 13:32:29.574660538 +0200
+@@ -232,7 +232,7 @@ struct xobject {
+ /*SHARED*/
+ /* NDW: personally, I want to see status and error messages! */
+ #define IfTrace0(condition,model)                                 \
+-        {if (condition) printf(model);}
++        {if (condition) puts(model);}
+ #define IfTrace1(condition,model,arg0)                            \
+         {if (condition) printf(model,arg0);}
+ #define IfTrace2(condition,model,arg0,arg1)                       \
+--- texlive-20130530-source/texk/tex4htk/t4ht.c.wiget  2013-01-08 15:07:20.000000000 +0100
++++ texlive-20130530-source/texk/tex4htk/t4ht.c        2013-07-06 13:32:29.574660538 +0200
+@@ -1095,7 +1095,7 @@ static void warn_i_str
+ ;
+ #undef SEP
+ #endif
+-{  (IGNORED) fprintf(stderr,"--- warning --- ");
++{  (IGNORED) fputs("--- warning --- ",stderr);
+    (IGNORED) fprintf(stderr,warn_err_mssg[n], str);
+ }
+--- texlive-20130530-source/texk/web2c/cwebboot.cin.wiget      2012-09-11 01:03:53.000000000 +0200
++++ texlive-20130530-source/texk/web2c/cwebboot.cin    2013-07-06 13:32:29.567994146 +0200
+@@ -1088,7 +1088,7 @@ void
+  fatal(const char*s,const char*t)
+ #line 1182 "cwebdir/common.w"
+ {
+-if(*s)printf(s);
++if(*s)printf("%s", s);
+ err_print(t);
+ history= fatal_message;exit(wrap_up());
+ }
+--- texlive-20130530-source/texk/web2c/cwebdir/common.w.wiget  2012-09-05 15:27:45.000000000 +0200
++++ texlive-20130530-source/texk/web2c/cwebdir/common.w        2013-07-06 13:32:29.561327754 +0200
+@@ -1180,7 +1180,7 @@ concatenated to print the final error me
  fatal(s,t)
    char *s,*t;
  {
@@ -21,9 +82,9 @@
    err_print(t);
    history=fatal_message; exit(wrap_up());
  }
---- texlive-20080816-source/texk/web2c/cwebdir/cweave.w~       2008-04-28 11:22:39.000000000 +0200
-+++ texlive-20080816-source/texk/web2c/cwebdir/cweave.w        2012-12-05 13:48:17.152434099 +0100
-@@ -1784,7 +1784,7 @@
+--- texlive-20130530-source/texk/web2c/cwebdir/cweave.w.wiget  2012-09-05 15:27:45.000000000 +0200
++++ texlive-20130530-source/texk/web2c/cwebdir/cweave.w        2013-07-06 13:32:29.564660950 +0200
+@@ -1784,7 +1784,7 @@ void
  print_cat(c) /* symbolic printout of a category */
  eight_bits c;
  {
  }
  
  @ The token lists for translated \TEX/ output contain some special control
---- texlive-20080816-source/texk/web2c/cwebboot.c~     2012-12-05 13:43:15.382444744 +0100
-+++ texlive-20080816-source/texk/web2c/cwebboot.c      2012-12-05 13:47:45.715768541 +0100
-@@ -1113,7 +1113,7 @@
-  fatal P2C(char*,s,char*,t)
- #line 1182 "./cwebdir/common.w"
+--- texlive-20130530-source/texk/web2c/omegafonts/out_routines.c.wiget 2009-11-10 11:27:09.000000000 +0100
++++ texlive-20130530-source/texk/web2c/omegafonts/out_routines.c       2013-07-06 13:32:29.567994146 +0200
+@@ -383,5 +383,5 @@ out_digits(unsigned counter)
+ void
+ out(const_string sval)
  {
--if(*s)printf(s);
-+if(*s)puts(s);
- err_print(t);
- history= fatal_message;exit(wrap_up());
+-      fprintf(file_output, sval);
++      fputs(sval, file_output);
  }
---- texlive-20080816-source/texk/web2c/tiedir/tie.w~   2006-01-17 22:41:51.000000000 +0100
-+++ texlive-20080816-source/texk/web2c/tiedir/tie.w    2012-12-05 13:50:25.915762890 +0100
-@@ -465,7 +465,7 @@
+--- texlive-20130530-source/texk/web2c/tiedir/tie.w.wiget      2009-03-09 09:29:33.000000000 +0100
++++ texlive-20130530-source/texk/web2c/tiedir/tie.w    2013-07-06 13:32:29.567994146 +0200
+@@ -465,7 +465,7 @@ for terminating an output line and writi
  @d new_line(v)  fputc('\n',v) /* start new line */
  @d term_new_line  new_line(term_out)
        /* start new line of the terminal */
 +@d print_ln(v)  {fputs(v,term_out);term_new_line;}
        /* `|print|' and then start new line */
  @d print2_ln(a,b)  {print2(a,b);term_new_line;} /* same with two arguments */
- @d print3_ln(a,b,c)  {print3(a,b,c);term_new_line;} 
---- texlive-20080816-source/texk/web2c/pdftexdir/subfont.c~    2008-05-08 16:25:16.000000000 +0200
-+++ texlive-20080816-source/texk/web2c/pdftexdir/subfont.c     2012-12-05 13:52:33.919091705 +0100
-@@ -127,7 +127,7 @@
-         return NULL;
-     }
-     tex_printf("{");
--    tex_printf(cur_file_name);
-+    tex_printf("%s", cur_file_name);
-     sfd = new_sfd_entry();
-     sfd->name = xstrdup(sfd_name);
-     while (!sfd_eof()) {
---- texlive-20080816-source/texk/web2c/omegafonts/out_routines.c~      2006-01-17 22:41:51.000000000 +0100
-+++ texlive-20080816-source/texk/web2c/omegafonts/out_routines.c       2012-12-05 14:00:41.645741167 +0100
-@@ -377,5 +377,5 @@
- void
- out(string sval)
- {
--      fprintf(file_output, sval);
-+      fputs(sval, file_output);
- }
---- texlive-20080816-source/texk/web2c/omegafonts/error_routines.c.orig        2006-01-17 22:41:51.000000000 +0100
-+++ texlive-20080816-source/texk/web2c/omegafonts/error_routines.c     2012-12-05 13:59:28.005743765 +0100
-@@ -31,6 +31,71 @@
+ @d print3_ln(a,b,c)  {print3(a,b,c);term_new_line;}
+--- texlive-20130530-source/texk/xdvik/gui/message-window.c.wiget      2009-06-22 16:29:44.000000000 +0200
++++ texlive-20130530-source/texk/xdvik/gui/message-window.c    2013-07-06 13:32:29.574660538 +0200
+@@ -713,7 +713,7 @@ internal_popup_window(Widget parent,
+     Widget ret;
+     ASSERT(type < (sizeof my_msg_map / sizeof my_msg_map[0]), "too few elements in my_msg_map");
+-    sprintf(win_title, my_msg_map[type].window_title);
++    sprintf(win_title, "%s", my_msg_map[type].window_title);
+ #if DEBUG
+     fprintf(stderr, "internal_popup_window called with prompt: \"%s\"\n", msg_buf);
+@@ -725,11 +725,10 @@ internal_popup_window(Widget parent,
+          supposed to be printf-format strings (i.e. with doubled `%' to escape them)
+       */
+       fprintf(stderr, "\n%s:\n", my_msg_map[type].window_title);
+-      fprintf(stderr, msg_buf);
+-      fprintf(stderr, "\n");
++      fprintf(stderr, "%s\n", msg_buf);
+       if (helptext) {
+           fprintf(stderr, "---------- helptext ----------\n");
+-          fprintf(stderr, helptext);
++          fprintf(stderr, "%s", helptext);
+           fprintf(stderr, "\n---------- end of helptext ----------\n");
+       }
+       return NULL;
+@@ -741,8 +740,7 @@ internal_popup_window(Widget parent,
+     if (my_popup_num == MAX_POPUPS) {
+       /* already enough popups on screen, just dump it to stderr */
+       fprintf(stderr, "%s: ", win_title);
+-      fprintf(stderr, msg_buf);
+-      fputc('\n', stderr);
++      fprintf(stderr, "%s\n", msg_buf);
+       /* Note: If a mad function continues to open popups, this will
+        * stop after MAX_POPUPS, but open a new window for each
+        * window the user pops down. Maybe we ought to do something
+--- texlive-20130530-source/texk/web2c/omegafonts/error_routines.c.orig        2009-11-10 11:27:09.000000000 +0100
++++ texlive-20130530-source/texk/web2c/omegafonts/error_routines.c     2013-07-06 14:38:00.368383713 +0200
+@@ -32,6 +32,71 @@ They
  
  */
  
 +#else
 +
  void
- lex_error_0(string fmt)
+ lex_error_0(const_string fmt)
  {
-@@ -182,3 +247,4 @@
+@@ -183,3 +248,4 @@ internal_error_s(const_string fmt, const
      fprintf(stderr, "\n");
      exit(2);
  }
 +#endif
---- texlive-20080816-source/texk/web2c/omegafonts/error_routines.h.orig        2012-12-05 13:59:34.879076856 +0100
-+++ texlive-20080816-source/texk/web2c/omegafonts/error_routines.h     2012-12-05 14:00:00.305742626 +0100
-@@ -20,7 +20,30 @@
- 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+--- texlive-20130530-source/texk/web2c/omegafonts/error_routines.h.orig        2013-07-06 14:38:00.378383329 +0200
++++ texlive-20130530-source/texk/web2c/omegafonts/error_routines.h     2013-07-06 14:40:20.693000755 +0200
+@@ -21,6 +21,30 @@ along with Omega; if not, write to the F
  
  */
--
 +#if defined(__GNUC__) && (__GNUC__ >= 3)
 +#define lex_error_0(a) lex_error("%s", a)
 +#define lex_error_1(a, b) lex_error(a, b)
 +#define internal_error_s(a, b) internal_error(a, b)
 +extern void internal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
 +#else
- extern void lex_error_0(string);
- extern void lex_error_1(string, int);
- extern void lex_error_s(string, string);
-@@ -43,5 +66,5 @@
- extern void internal_error_0(string);
- extern void internal_error_1(string, int);
- extern void internal_error_s(string, string);
--
+ extern void lex_error_0(const_string);
+ extern void lex_error_1(const_string, int);
+ extern void lex_error_s(const_string, const_string);
+@@ -43,3 +67,4 @@ extern void warning_s_2(const_string, co
+ extern void internal_error_0(const_string);
+ extern void internal_error_1(const_string, int);
+ extern void internal_error_s(const_string, const_string);
 +#endif
---- texlive-20080816-source/texk/devnag/src/devnag.c~  2008-07-03 23:45:54.000000000 +0200
-+++ texlive-20080816-source/texk/devnag/src/devnag.c   2012-12-05 14:02:07.348229812 +0100
-@@ -2396,7 +2396,7 @@
- void err_ill(char *str) {
-    fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
-         str, linenumber);
--   fprintf(stderr, inbuf);
-+   fputs(inbuf, stderr);
-    exit(1);
- }
---- texlive-20080816-source/texk/dvidvi/dvidvi.c.orig  2012-12-05 14:02:36.438365452 +0100
-+++ texlive-20080816-source/texk/dvidvi/dvidvi.c       2012-12-05 14:03:19.851697257 +0100
-@@ -337,7 +337,7 @@
-  *   Print a usage error messsage, and quit.
-  */
- void usage() {
--   (void)fprintf(stderr,banner);
-+   (void)fprintf(stderr,"%s", banner);
-    (void)fprintf(stderr,"Usage:  dvidvi [options] input[.dvi] [output]\n");
-    (void)fprintf(stderr,"where options are:\n");
-    (void)fprintf(stderr,"    [-f n] first page printed     [-l n] last page printed\n");
-@@ -842,7 +842,7 @@
-       } /* else argument with '-' */
-    }  /* for */
-    if (*iname == 0) {
--       (void)fprintf(stderr, banner) ;
-+       (void)fprintf(stderr, "%s", banner) ;
-        error("! no input file specified");
-    }
-    /* Inserted by djc@dsmail.hmi.de 3.8.1994 */
-@@ -853,7 +853,7 @@
-    }
-    if (*oname != 0 && !quiet) {
--       (void)fprintf(stderr, banner) ;
-+       (void)fprintf(stderr, "%s", banner) ;
-        (void)fprintf(stderr, "%s -> %s\n",iname,oname);
-        temp = nextstring ;
-    }
---- texlive-20080816-source/texk/dvipdfm/error.h~      2006-01-17 22:41:51.000000000 +0100
-+++ texlive-20080816-source/texk/dvipdfm/error.h       2012-12-05 14:05:35.501692469 +0100
-@@ -34,9 +34,9 @@
- #define NO_ERROR 0
- #define ERROR(string) { \
--  fprintf(stderr, "\n"); \
--  fprintf (stderr,  string); \
--  fprintf (stderr, "\n");  \
-+  fputs ("\n", stderr); \
-+  fputs (string, stderr); \
-+  fputs ("\n", stderr);  \
-   error_cleanup(); \
-   exit(1);}
- typedef int error_t;
---- texlive-20080816-source/texk/ps2pkm/objects.h~     2006-01-17 22:41:51.000000000 +0100
-+++ texlive-20080816-source/texk/ps2pkm/objects.h      2012-12-05 14:08:58.475018644 +0100
-@@ -236,7 +236,7 @@
- /*SHARED*/
- /* NDW: personally, I want to see status and error messages! */
- #define IfTrace0(condition,model)                                 \
--        {if (condition) printf(model);}
-+        {if (condition) puts(model);}
- #define IfTrace1(condition,model,arg0)                            \
-         {if (condition) printf(model,arg0);}
- #define IfTrace2(condition,model,arg0,arg1)                       \
---- texlive-20080816-source/texk/tex4htk/tex4ht.c.orig 2012-12-05 14:09:57.661683224 +0100
-+++ texlive-20080816-source/texk/tex4htk/tex4ht.c      2012-12-05 14:14:25.335007114 +0100
-@@ -1628,11 +1628,11 @@
- if( no_root_file ){  open_o_file(); }
--       (IGNORED) fprintf(cur_o_file, end_span[0]);
-+       (IGNORED) fputs(end_span[0], cur_o_file);
- }  }
--   (IGNORED) fprintf(cur_o_file, t_accent_fifth);
-+   (IGNORED) fputs(t_accent_fifth, cur_o_file);
-    needs_end_accent = FALSE; 
- needs_accented_sym--;
-@@ -1662,11 +1662,11 @@
- if( no_root_file ){  open_o_file(); }
--       (IGNORED) fprintf(cur_o_file, end_span[0]);
-+       (IGNORED) fputs(end_span[0], cur_o_file);
- }  }
--   (IGNORED) fprintf(cur_o_file, t_accent_fifth);
-+   (IGNORED) fputs(t_accent_fifth, cur_o_file);
-    needs_end_accent = FALSE; 
- needs_accented_sym--;
-@@ -1810,11 +1810,11 @@
- if( no_root_file ){  open_o_file(); }
--       (IGNORED) fprintf(cur_o_file, end_span[0]);
-+       (IGNORED) fputs(end_span[0], cur_o_file);
- }  }
--   (IGNORED) fprintf(cur_o_file, t_accent_fifth);
-+   (IGNORED) fputs(t_accent_fifth, cur_o_file);
-    needs_end_accent = FALSE; 
- needs_accented_sym--;
-@@ -2884,7 +2884,7 @@
- );
-     (IGNORED) fprintf(stderr,
-      "\n----------------------------------------------------\n");
--    (IGNORED) fprintf(stderr, "environment file\n");
-+    (IGNORED) fputs("environment file\n", stderr);
-     (IGNORED) fprintf(stderr,
-      "----------------------------------------------------\n");
-     while( (ch = getc(dot_file)) != EOF  ){
-@@ -2978,7 +2978,7 @@
-          i = i * 10 + ch - '0';  ch = get_html_ch(file);  }
-       if( i != bound ){
-          
--(IGNORED) fprintf(stderr,"--- warning --- ");
-+(IGNORED) fputs("--- warning --- ",stderr);
- (IGNORED) fprintf(stderr,warn_err_mssg[22]
- , new_font_name, i, bound); show_err_context();
-@@ -4573,11 +4573,11 @@
- if( no_root_file ){  open_o_file(); }
--       (IGNORED) fprintf(cur_o_file, end_span[0]);
-+       (IGNORED) fputs(end_span[0], cur_o_file);
- }  }
--   (IGNORED) fprintf(cur_o_file, t_accent_fifth);
-+   (IGNORED) fputs(t_accent_fifth, cur_o_file);
-    needs_end_accent = FALSE; 
- needs_accented_sym--;
-@@ -4597,7 +4597,7 @@
-        if( span_open[0] )  if( *span_open[0] )
--           (IGNORED) fprintf(cur_o_file, span_open[0]);
-+           (IGNORED) fputs(span_open[0], cur_o_file);
-        if( span_name[0] )  if( *span_name[0] )
-            (IGNORED) fprintf(cur_o_file,
-                span_name[0], font_tbl[cur_fnt].family_name);
-@@ -4609,7 +4609,7 @@
-            (IGNORED) fprintf(cur_o_file,
-                        span_mag[0], font_tbl[cur_fnt].mag);
-        if( span_ch[0] )  if( *span_ch[0] )
--           (IGNORED) fprintf(cur_o_file, span_ch[0]);
-+           (IGNORED) fputs(span_ch[0], cur_o_file);
-     }
-     start_span = FALSE;
-   }
-@@ -5335,7 +5335,7 @@
- }
- if( a_accent_template && needs_accented_sym ){
--   (IGNORED) fprintf(cur_o_file, a_accent_fifth);
-+   (IGNORED) fputs(a_accent_fifth, cur_o_file);
- }
-@@ -5395,11 +5395,11 @@
- if( no_root_file ){  open_o_file(); }
--       (IGNORED) fprintf(cur_o_file, end_span[0]);
-+       (IGNORED) fputs(end_span[0], cur_o_file);
- }  }
--   (IGNORED) fprintf(cur_o_file, t_accent_fifth);
-+   (IGNORED) fputs(t_accent_fifth, cur_o_file);
-    needs_end_accent = FALSE; 
- needs_accented_sym--;
-@@ -5656,8 +5656,8 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- warning --- ");
--   (IGNORED) fprintf(stderr,warn_err_mssg[n]);
-+{  (IGNORED) fputs("--- warning --- ",stderr);
-+   (IGNORED) fputs(warn_err_mssg[n],stderr);
-    show_err_context();
- }
-@@ -5677,7 +5677,7 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- warning --- ");
-+{  (IGNORED) fputs("--- warning --- ",stderr);
-    (IGNORED) fprintf(stderr, warn_err_mssg[n], i);
-    show_err_context();
- }
-@@ -5698,7 +5698,7 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- warning --- ");
-+{  (IGNORED) fputs("--- warning --- ",stderr);
-    (IGNORED) fprintf(stderr, warn_err_mssg[n], i, j);
-    show_err_context();
- }
-@@ -5724,7 +5724,7 @@
- #undef SEP
- #endif
- {
--   (IGNORED) fprintf(stderr,"--- warning --- ");
-+   (IGNORED) fputs("--- warning --- ",stderr);
-    (IGNORED) fprintf(stderr,warn_err_mssg[n], str);
-    show_err_context();
- }
-@@ -5751,7 +5751,7 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- warning --- ");
-+{  (IGNORED) fputs("--- warning --- ",stderr);
-    (IGNORED) fprintf(stderr,warn_err_mssg[n], str1,str2);
-    show_err_context();
- }
-@@ -5772,8 +5772,8 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- error --- ");
--   (IGNORED) fprintf(stderr, warn_err_mssg[n]);
-+{  (IGNORED) fputs("--- error --- ",stderr);
-+   (IGNORED) fputs(warn_err_mssg[n], stderr);
-    show_err_context();
-    exit(EXIT_FAILURE);
- }
-@@ -5794,7 +5794,7 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- error --- ");
-+{  (IGNORED) fputs("--- error --- ",stderr);
-    (IGNORED) fprintf(stderr, warn_err_mssg[n], i);
-    show_err_context();
-    exit(EXIT_FAILURE);
-@@ -5820,7 +5820,7 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- error --- ");
-+{  (IGNORED) fputs("--- error --- ",stderr);
-    (IGNORED) fprintf(stderr, warn_err_mssg[n], str);
-    show_err_context();
-    exit(EXIT_FAILURE);
-@@ -8762,7 +8762,7 @@
- if( no_root_file ){  open_o_file(); }
--       (IGNORED) fprintf(cur_o_file, end_span[0]);
-+       (IGNORED) fputs(end_span[0], cur_o_file);
-     }
- } }
-@@ -8772,7 +8772,7 @@
-   
-                                                long int width;
- if( i_accent_template ){
--  (IGNORED) fprintf(cur_o_file, i_accent_second); }
-+  (IGNORED) fputs(i_accent_second, cur_o_file); }
- needs_end_accent = (needs_accent_sym == 2 * TRUE);
- if( needs_end_accent && t_accent_template )
- {  
-@@ -8825,7 +8825,7 @@
-          m_accent_fourth);
-     }
-     if( i_accent_template ){
--      (IGNORED) fprintf(cur_o_file, i_accent_first); }
-+      (IGNORED) fputs(i_accent_first, cur_o_file); }
-     in_accenting = TRUE;
-   }
- }
-@@ -9149,11 +9149,11 @@
- if( no_root_file ){  open_o_file(); }
--       (IGNORED) fprintf(cur_o_file, end_span[0]);
-+       (IGNORED) fputs(end_span[0], cur_o_file);
- }  }
--   (IGNORED) fprintf(cur_o_file, t_accent_fifth);
-+   (IGNORED) fputs(t_accent_fifth, cur_o_file);
-    needs_end_accent = FALSE; 
- needs_accented_sym--;
-@@ -10397,7 +10397,7 @@
-     }
-     p++;
-     if( dim_on ){    (IGNORED) fprintf(cur_o_file, p, dim);  }
--    else        {    (IGNORED) fprintf(cur_o_file, p); }
-+    else        {    (IGNORED) fputs(p, cur_o_file); }
-     while( * (p++) );
-   }
- }
-@@ -12232,7 +12232,7 @@
- {                                               int   ch, i, mag;
-                                                 U_CHAR  str[256];
--   (IGNORED) fprintf(log_file, begin_char_gif);
-+   (IGNORED) fputs(begin_char_gif, log_file);
-    dvi_flag = TRUE;
-    for( cur_fnt = font_tbl_size; cur_fnt--; ){
-       
---- texlive-20080816-source/texk/tex4htk/t4ht.c~       2008-05-10 02:31:48.000000000 +0200
-+++ texlive-20080816-source/texk/tex4htk/t4ht.c        2012-12-05 14:15:13.328338752 +0100
-@@ -1048,8 +1048,8 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- error --- ");
--   (IGNORED) fprintf(stderr, warn_err_mssg[n]);
-+{  (IGNORED) fputs("--- error --- ",stderr);
-+   (IGNORED) fputs( warn_err_mssg[n],stderr);
-    exit(EXIT_FAILURE);
- }
-@@ -1069,8 +1069,8 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- error --- ");
--   (IGNORED) fprintf(stderr, warn_err_mssg[n]);
-+{  (IGNORED) fputs("--- error --- ",stderr);
-+   (IGNORED) fputs( warn_err_mssg[n],stderr);
-    exit(EXIT_FAILURE);
- }
-@@ -1094,7 +1094,7 @@
- ;
- #undef SEP
- #endif
--{  (IGNORED) fprintf(stderr,"--- warning --- ");
-+{  (IGNORED) fputs("--- warning --- ",stderr);
-    (IGNORED) fprintf(stderr,warn_err_mssg[n], str);
- }
-@@ -2804,7 +2804,7 @@
-    (IGNORED) fprintf(css_file, "font-size:%d%c;", second, '%');
- }
- if( font_sty  ) {
--   (IGNORED) fprintf(css_file, font_sty->body);
-+   (IGNORED) fputs( font_sty->body,css_file);
- }
- (IGNORED) fprintf(css_file, "}\n");
-@@ -2823,7 +2823,7 @@
- }
- (IGNORED) fprintf(css_file, "{");
- if( font_sty  ) {
--   (IGNORED) fprintf(css_file, font_sty->body);
-+   (IGNORED) fputs( font_sty->body,css_file);
- }
- (IGNORED) fprintf(css_file, "}}\n");
-@@ -2846,7 +2846,7 @@
-    (IGNORED) fprintf(css_file, "font-size:%d%c;", second, '%');
- }
- if( font_sty  ) {
--   (IGNORED) fprintf(css_file, font_sty->body);
-+   (IGNORED) fputs( font_sty->body,css_file);
- }
- (IGNORED) fprintf(css_file, "}\n");
---- texlive-20080816-source/texk/xdvik/gui/message-window.c~   2008-07-01 17:42:36.000000000 +0200
-+++ texlive-20080816-source/texk/xdvik/gui/message-window.c    2012-12-05 14:16:52.958335241 +0100
-@@ -704,7 +704,7 @@
-     Widget ret;
-     ASSERT(type < (sizeof my_msg_map / sizeof my_msg_map[0]), "too few elements in my_msg_map");
--    sprintf(win_title, my_msg_map[type].window_title);
-+    sprintf(win_title, "%s", my_msg_map[type].window_title);
- #if DEBUG
-     fprintf(stderr, "internal_popup_window called with prompt: \"%s\"\n", msg_buf);
-@@ -716,11 +716,10 @@
-          supposed to be printf-format strings (i.e. with doubled `%' to escape them)
-       */
-       fprintf(stderr, "\n%s:\n", my_msg_map[type].window_title);
--      fprintf(stderr, msg_buf);
--      fprintf(stderr, "\n");
-+      fprintf(stderr, "%s\n", msg_buf);
-       if (helptext) {
-           fprintf(stderr, "---------- helptext ----------\n");
--          fprintf(stderr, helptext);
-+          fprintf(stderr, "%s", helptext);
-           fprintf(stderr, "\n---------- end of helptext ----------\n");
-       }
-       return NULL;
-@@ -732,8 +731,7 @@
-     if (my_popup_num == MAX_POPUPS) {
-       /* already enough popups on screen, just dump it to stderr */
-       fprintf(stderr, "%s: ", win_title);
--      fprintf(stderr, msg_buf);
--      fputc('\n', stderr);
-+      fprintf(stderr, "%s\n", msg_buf);
-       /* Note: If a mad function continues to open popups, this will
-        * stop after MAX_POPUPS, but open a new window for each
-        * window the user pops down. Maybe we ought to do something
index e2c23ec7cd8a15ab57f9693d385c17b7abaeb756..c54214236c28a7e4f06dc9cf21eeec4493ba75b6 100644 (file)
@@ -18,9 +18,9 @@
 
 %include       /usr/lib/rpm/macros.perl
 
-%define                year    2012
-%define                monthday        0701
-%define                texmfversion 20120701
+%define                year    2013
+%define                monthday        0530
+%define                texmfversion 20130530
 Summary:       TeX typesetting system and MetaFont font formatter
 Summary(de.UTF-8):     TeX-Satzherstellungssystem und MetaFont-Formatierung
 Summary(es.UTF-8):     Sistema de typesetting TeX y formateador de fuentes MetaFont
@@ -36,18 +36,11 @@ Epoch:              1
 License:       distributable
 Group:         Applications/Publishing/TeX
 Source0:       ftp://tug.org/historic/systems/texlive/%{year}/%{name}-%{version}-source.tar.xz
-# Source0-md5: 1d38be7dac26440fd022a4708f454a2b
+# Source0-md5: f52599c99fb1035399b907f4c54f1125
 Source4:       %{name}.cron
 Source5:       xdvi.desktop
 Source6:       xdvi.png
-Patch0:                %{name}-am.patch
-Patch1:                %{name}-20080816-kpathsea-ar.patch
-Patch2:                %{name}-gcc44.patch
-Patch3:                %{name}-getline.patch
-Patch4:                %{name}-stdio.patch
-Patch5:                %{name}-aclocal.patch
-Patch6:                %{name}-libpng.patch
-Patch7:                icuinfo.patch
+Patch0:                format-security.patch
 URL:           http://www.tug.org/texlive/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -1762,14 +1755,7 @@ language and as an extension to the typesetting engine itself.
 
 %prep
 %setup -q -n %{name}-%{version}-source
-# %patch0 -p1
-# %patch1 -p1
-# %patch2 -p1
-# %patch3 -p1
-# %patch4 -p1
-# %patch5 -p1
-# %patch6 -p1
-# %patch7 -p1
+%patch0 -p1
 
 %build
 # find . -name "config.sub" -exec cp /usr/share/automake/config.sub '{}' ';'
@@ -1792,7 +1778,7 @@ ulimit -s unlimited
 export CPPFLAGS="%{rpmcppflags} -DHAVE_PROTOTYPES"
 %configure \
        --prefix=%{_prefix} \
-       --with%{!?with_xindy:out}-xindy \
+       %{__enable_disable xindy} \
        --enable-shared \
        --disable-native-texlive-build \
        --without-luatex \
@@ -1802,6 +1788,8 @@ export CPPFLAGS="%{rpmcppflags} -DHAVE_PROTOTYPES"
        --enable-gf \
        --enable-ipc \
        --enable-shared \
+       --enable-ttf2pk2 \
+       --disable-t1utils \
        --with-fontconfig \
        --with-fonts-dir=/var/cache/fonts \
        --with-ncurses \
@@ -1813,6 +1801,13 @@ export CPPFLAGS="%{rpmcppflags} -DHAVE_PROTOTYPES"
        --with-system-pnglib \
        --with-system-t1lib \
        --with-system-zlib \
+       --with-system-harfbuzz \
+       --with-system-icu \
+       --with-system-graphite2 \
+       --with-system-zziplib \
+       --with-system-poppler \
+       --with-system-cairo \
+       --with-system-pixman \
        --with-xdvi-x-toolkit=xaw \
        --without-dialog \
        --without-t1utils \
@@ -1831,31 +1826,6 @@ install -d $RPM_BUILD_ROOT%{_datadir} \
        $RPM_BUILD_ROOT/etc/sysconfig/tetex-updmap\
        $RPM_BUILD_ROOT%{_localstatedir}/fonts/map\
        $RPM_BUILD_ROOT%{fmtdir}/pdftex
-#      $RPM_BUILD_ROOT%{texmfdist}/source/generic \
-#      $RPM_BUILD_ROOT%{texmfdist}/tex/generic \
-#      $RPM_BUILD_ROOT%{texmfdist}/tex/plain \
-#      $RPM_BUILD_ROOT%{texmf}/tex
-
-#    %{__mv} $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf/texmf $RPM_BUILD_ROOT%{texmf}
-#    %{__mv} $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf/texmf-dist $RPM_BUILD_ROOT%{texmfdist}
-#    %{__mv} $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf/texmf-doc $RPM_BUILD_ROOT%{texmfdoc}
-#    %{__mv} $RPM_BUILD_ROOT%{texmfdist}/doc/generic/pgfplots/* $RPM_BUILD_ROOT%{texmfdist}/doc/latex/pgfplots
-#    rmdir $RPM_BUILD_ROOT%{texmfdist}/doc/generic/pgfplots
-#    # imho it is unneeded
-#    %{__rm} -r $RPM_BUILD_ROOT%{texmfdist}/doc/fonts/{ec,fc,utopia}
-#    %{__rm} -r $RPM_BUILD_ROOT%{texmf}/doc/cefconv
-#
-#    # This is an empty directory
-#    %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf
-#    # Useless binary
-#    %{__rm} $RPM_BUILD_ROOT%{_datadir}/texmf-dist/doc/latex/splitindex/splitindex{.exe,-Linux-i386,-OpenBSD-i386}
-#
-# commented out because of following (non-fatal) error:
-# Can't open texmf/web2c/texmf.cnf: No such file or directory.
-#perl -pi \
-#      -e "s|\.\./\.\./texmf|$RPM_BUILD_ROOT%{texmf}|g;" \
-#      -e "s|/var/cache/fonts|$RPM_BUILD_ROOT/var/cache/fonts|g;" \
-#      texmf/web2c/texmf.cnf
 
 LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}; export LD_LIBRARY_PATH
 PATH=$RPM_BUILD_ROOT%{_bindir}:$PATH; export PATH
@@ -1872,7 +1842,9 @@ PATH=$RPM_BUILD_ROOT%{_bindir}:$PATH; export PATH
        sbindir=$RPM_BUILD_ROOT%{_sbindir} \
        texmf=$RPM_BUILD_ROOT%{texmf} \
        texmfsysvar=$RPM_BUILD_ROOT%{_localstatedir} \
-       texmfsysconfig=$RPM_BUILD_ROOT%{texmf}
+       texmfsysconfig=$RPM_BUILD_ROOT%{texmf} \
+       encdir=$RPM_BUILD_ROOT%{texmfdist}/fonts/enc/dvips/base \
+       glyphlistdir=$RPM_BUILD_ROOT%{texmfdist}/fonts/map/glyphlist
 
 # requires wdiff but we don't have
 %{__rm} -rf $RPM_BUILD_ROOT%{texmfdist}/scripts/texdiff
@@ -1930,23 +1902,18 @@ ln -sf ../share/texmf-dist/scripts/fontools/autoinst autoinst
 ln -sf ../share/texmf-dist/scripts/cachepic/cachepic.tlu cachepic
 ln -sf ../share/texmf-dist/scripts/fontools/cmap2enc cmap2enc
 ln -sf ../share/texmf-dist/scripts/epstopdf/epstopdf.pl epstopdf
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/exatools exatools
 ln -sf ../share/texmf-dist/scripts/fig4latex/fig4latex fig4latex
 ln -sf ../share/texmf-dist/scripts/findhyph/findhyph findhyph
 ln -sf ../share/texmf-dist/scripts/fontools/font2afm font2afm
 ln -sf ../share/texmf-dist/scripts/fragmaster/fragmaster.pl fragmaster
-# ln -sf ../share/texmf-dist/scripts/texlive/getnonfreefonts.pl getnonfreefonts
-# ln -sf ../share/texmf-dist/scripts/texlive/getnonfreefonts.pl getnonfreefonts-sys
 ln -sf ../share/texmf-dist/scripts/latex2man/latex2man latex2man
 ln -sf ../share/texmf-dist/scripts/latexmk/latexmk.pl latexmk
 ln -sf ../share/texmf-dist/scripts/listings-ext/listings-ext.sh listings-ext.sh
 ln -sf ../share/texmf-dist/scripts/mkgrkindex/mkgrkindex mkgrkindex
 ln -sf ../share/texmf-dist/scripts/accfonts/mkt1font mkt1font
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/mtxrun mtxrun
 ln -sf ../share/texmf-dist/scripts/fontools/ot2kpx ot2kpx
 ln -sf ../share/texmf-dist/scripts/pax/pdfannotextractor.pl pdfannotextractor
 ln -sf ../share/texmf-dist/scripts/ppower4/pdfthumb.texlua pdfthumb
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/pdftrimwhite pdftrimwhite
 ln -sf ../share/texmf-dist/scripts/perltex/perltex.pl perltex
 ln -sf ../share/texmf-dist/scripts/fontools/pfm2kpx pfm2kpx
 ln -sf ../share/texmf-dist/scripts/pkfix/pkfix.pl pkfix
@@ -1959,25 +1926,18 @@ ln -sf ../share/texmf-dist/scripts/splitindex/perl/splitindex.pl splitindex
 ln -sf ../share/texmf-dist/scripts/svn-multi/svn-multi.pl svn-multi
 ln -sf ../share/texmf-dist/scripts/texcount/TeXcount.pl texcount
 ln -sf ../share/texmf-dist/scripts/texdirflatten/texdirflatten texdirflatten
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/texfind texfind
 ln -sf ../share/texmf-dist/scripts/texloganalyser/texloganalyser texloganalyser
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/texshow texshow
 ln -sf ../share/texmf-dist/scripts/ulqda/ulqda.pl ulqda
 ln -sf ../share/texmf-dist/scripts/accfonts/vpl2ovp vpl2ovp
 ln -sf ../share/texmf-dist/scripts/accfonts/vpl2vpl vpl2vpl
 
 ln -sf ../share/texmf/scripts/a2ping/a2ping.pl a2ping
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/context context
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/ctxtools ctxtools
 ln -sf ../share/texmf-dist/scripts/dviasm/dviasm.py dviasm
 ln -sf ../share/texmf/scripts/tetex/e2pall.pl e2pall
 ln -sf ../share/texmf-dist/scripts/bengali/ebong.py ebong
 ln -sf ../share/texmf-dist/scripts/epspdf/epspdf epspdf
 ln -sf ../share/texmf-dist/scripts/epspdf/epspdftk epspdftk
 ln -sf ../share/texmf-dist/scripts/epstopdf/epstopdf.pl epstopdf
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/exatools exatools
-# ln -sf ../share/texmf/scripts/getnonfreefonts/getnonfreefonts.pl getnonfreefonts
-# ln -sf ../share/texmf/scripts/getnonfreefonts/getnonfreefonts.pl getnonfreefonts-sys
 ln -sf ../share/texmf-dist/scripts/tex4ht/ht.sh ht
 ln -sf ../share/texmf-dist/scripts/tex4ht/htcontext.sh htcontext
 ln -sf ../share/texmf-dist/scripts/tex4ht/htlatex.sh htlatex
@@ -1986,14 +1946,9 @@ ln -sf ../share/texmf-dist/scripts/tex4ht/httex.sh httex
 ln -sf ../share/texmf-dist/scripts/tex4ht/httexi.sh httexi
 ln -sf ../share/texmf-dist/scripts/tex4ht/htxelatex.sh htxelatex
 ln -sf ../share/texmf-dist/scripts/tex4ht/htxetex.sh htxetex
-# ln -sf ../share/texmf-dist/scripts/context/lua/luatools.lua luatools
 ln -sf ../share/texmf-dist/scripts/glossaries/makeglossaries makeglossaries
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/makempy makempy
 ln -sf ../share/texmf-dist/scripts/tex4ht/mk4ht.pl mk4ht
 ln -sf ../share/texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl mkjobtexmf
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/mpstools mpstools
-# ln -sf ../share/texmf-dist/scripts/context/stubs/unix/mptopdf mptopdf
-# ln -sf ../share/texmf-dist/scripts/context/lua/mtxrun.lua mtxrun
 ln -sf ../share/texmf-dist/scripts/context/stubs/unix/mtxtools mtxtools
 ln -sf ../share/texmf-dist/scripts/oberdiek/pdfatfi.pl pdfatfi
 ln -sf ../share/texmf-dist/scripts/pdfcrop/pdfcrop.pl pdfcrop
@@ -2017,7 +1972,6 @@ ln -sf ../share/texmf/scripts/tetex/texdoctk.pl texdoctk
 ln -sf ../share/texmf-dist/scripts/context/stubs/unix/texexec texexec
 ln -sf ../share/texmf-dist/scripts/context/stubs/unix/texfind texfind
 ln -sf ../share/texmf-dist/scripts/context/stubs/unix/texfont texfont
-# ln -sf ../share/texmf-dist/scripts/context/ruby/texmfstart.rb texmfstart
 ln -sf ../share/texmf-dist/scripts/context/stubs/unix/texshow texshow
 ln -sf ../share/texmf-dist/scripts/context/stubs/unix/textools textools
 ln -sf ../share/texmf-dist/scripts/context/stubs/unix/texutil texutil
@@ -2029,24 +1983,6 @@ ln -sf ../share/texmf-dist/scripts/context/stubs/unix/xmltools xmltools
 
 cd $CURDIR
 
-#install %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}
-#touch $RPM_BUILD_ROOT/etc/sysconfig/tetex-updmap/maps.lst
-
-# %{__make} init \
-#      prefix=$RPM_BUILD_ROOT%{_prefix} \
-#      bindir=$RPM_BUILD_ROOT%{_bindir} \
-#      mandir=$RPM_BUILD_ROOT%{_mandir} \
-#      libdir=$RPM_BUILD_ROOT%{_libdir} \
-#      datadir=$RPM_BUILD_ROOT%{_datadir} \
-#      infodir=$RPM_BUILD_ROOT%{_infodir} \
-#      includedir=$RPM_BUILD_ROOT%{_includedir} \
-#      sbindir=$RPM_BUILD_ROOT%{_sbindir} \
-#      texmf=$RPM_BUILD_ROOT%{texmf}
-
-# We don't need it
-# %{__rm} -r $RPM_BUILD_ROOT%{texmf}/doc/man
-# %{__rm} -r $RPM_BUILD_ROOT%{texmfdoc}/source
-
 perl -pi \
        -e "s|$RPM_BUILD_ROOT||g;" \
        $RPM_BUILD_ROOT%{texmf}/web2c/texmf.cnf
@@ -2373,6 +2309,7 @@ fi
 # executables
 # ***********
 %attr(755,root,root) %{_bindir}/afm2tfm
+%attr(755,root,root) %{_bindir}/afm2pl
 %attr(755,root,root) %{_bindir}/allcm
 %attr(755,root,root) %{_bindir}/allec
 %attr(755,root,root) %{_bindir}/allneeded
@@ -2433,17 +2370,17 @@ fi
 %attr(755,root,root) %{_bindir}/vptovf
 %attr(755,root,root) %{_bindir}/weave
 
-%attr(755,root,root) %{texmf}/web2c/mktexnam
-%attr(755,root,root) %{texmf}/web2c/mktexdir
-%attr(755,root,root) %{texmf}/web2c/mktexupd
+%attr(755,root,root) %{texmfdist}/web2c/mktexnam
+%attr(755,root,root) %{texmfdist}/web2c/mktexdir
+%attr(755,root,root) %{texmfdist}/web2c/mktexupd
 
 %config(noreplace,missingok) %verify(not md5 mtime size) %attr(750,root,root) /etc/cron.daily/texlive
 
-%config(noreplace) %verify(not md5 mtime size) %{texmf}/web2c/fmtutil.cnf
-%config(noreplace) %verify(not md5 mtime size) %{texmf}/web2c/mktex.opt
-%config(noreplace) %verify(not md5 mtime size) %{texmf}/web2c/mktexdir.opt
-%config(noreplace) %verify(not md5 mtime size) %{texmf}/web2c/mktexnam.opt
-%config(noreplace) %verify(not md5 mtime size) %{texmf}/web2c/texmf.cnf
+%config(noreplace) %verify(not md5 mtime size) %{texmfdist}/web2c/fmtutil.cnf
+%config(noreplace) %verify(not md5 mtime size) %{texmfdist}/web2c/mktex.opt
+%config(noreplace) %verify(not md5 mtime size) %{texmfdist}/web2c/mktexdir.opt
+%config(noreplace) %verify(not md5 mtime size) %{texmfdist}/web2c/mktexnam.opt
+%config(noreplace) %verify(not md5 mtime size) %{texmfdist}/web2c/texmf.cnf
 
 %attr(1777,root,root) /var/cache/fonts
 
@@ -2457,6 +2394,7 @@ fi
 %attr(1777,root,root) %dir %{_localstatedir}/fonts/map
 
 %{_mandir}/man1/afm2tfm.1*
+%{_mandir}/man1/afm2pl.1*
 %{_mandir}/man1/allcm.1*
 %{_mandir}/man1/allec.1*
 %{_mandir}/man1/allneeded.1*
@@ -2497,7 +2435,7 @@ fi
 %{_mandir}/man1/ps2pk.1*
 %{_mandir}/man1/tangle.1*
 %{_mandir}/man1/tex.1*
-%{_mandir}/man1/texexec.1*
+#%{_mandir}/man1/texexec.1*
 %{_mandir}/man1/texhash.1*
 %{_mandir}/man1/texlinks.1*
 %{_mandir}/man1/tftopl.1*
@@ -2578,10 +2516,6 @@ fi
 %attr(755,root,root) %{_bindir}/sjislatex
 %attr(755,root,root) %{_bindir}/sjispdflatex
 %attr(755,root,root) %{_bindir}/synctex
-%attr(755,root,root) %{_bindir}/t1dotlessj
-%attr(755,root,root) %{_bindir}/t1lint
-%attr(755,root,root) %{_bindir}/t1reencode
-%attr(755,root,root) %{_bindir}/t1testpage
 %attr(755,root,root) %{_bindir}/texcount
 %attr(755,root,root) %{_bindir}/ttf2pk
 %attr(755,root,root) %{_bindir}/ttf2tfm
@@ -2601,10 +2535,6 @@ fi
 %{_mandir}/man1/otftotfm.1*
 %{_mandir}/man1/pdftosrc.1*
 %{_mandir}/man1/synctex.1*
-%{_mandir}/man1/t1dotlessj.1*
-%{_mandir}/man1/t1lint.1*
-%{_mandir}/man1/t1reencode.1*
-%{_mandir}/man1/t1testpage.1*
 %{_mandir}/man1/ttf2pk.1*
 %{_mandir}/man1/ttf2tfm.1*
 %{_mandir}/man1/ttftotype42.1*
@@ -2612,12 +2542,12 @@ fi
 %{_mandir}/man5/synctex.5*
 #%{fmtdir}/pdftex/texsis.fmt
 # %{fmtdir}/texsis
-%{texmf}/hbf2gf
-%{texmf}/ttf2pk
+%{texmfdist}/hbf2gf
+%{texmfdist}/ttf2pk
 
 %files font-utils
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/afm*
+%attr(755,root,root) %{_bindir}/afm2afm
 %attr(755,root,root) %{_bindir}/autoinst
 %attr(755,root,root) %{_bindir}/cmap2enc
 %attr(755,root,root) %{_bindir}/font2afm
@@ -2635,7 +2565,6 @@ fi
 %attr(755,root,root) %{texmfdist}/scripts/fontools/*
 # %dir %{texmf}/scripts/getnonfreefonts
 # %attr(755,root,root) %{texmf}/scripts/getnonfreefonts/*
-%{_mandir}/man1/afm2pl.1*
 # %{_mandir}/man1/getnonfreefonts-sys.1
 # %{_mandir}/man1/getnonfreefonts.1*
 %{_mandir}/man1/t1*.1*
@@ -2690,10 +2619,10 @@ fi
 %{_mandir}/man1/dvired.1*
 %{_mandir}/man1/dvitomp.1*
 %{_mandir}/man1/dvitype.1*
-%{texmf}/dvips/base
-# %{texmf}/dvips/config
+%{texmfdist}/dvips/base
+%{texmfdist}/dvips/config
 # %{texmf}/dvips/getafm
-%{texmf}/dvips/gsftopk
+%{texmfdist}/dvips/gsftopk
 %{texmfdist}/fonts/enc/dvips/base
 # %{texmfdist}/fonts/map/dvips/allrunes
 # %{texmfdist}/fonts/map/dvips/cmex/ttcmex.map
@@ -2728,9 +2657,9 @@ fi
 %attr(755,root,root) %{_bindir}/mkgrkindex
 %attr(755,root,root) %{_bindir}/rumakeindex
 %attr(755,root,root) %{_bindir}/splitindex
-%dir %{texmfdist}/scripts/splitindex
-%dir %{texmfdist}/scripts/splitindex/perl
-%attr(755,root,root) %{texmfdist}/scripts/splitindex/perl/splitindex.pl
+#%dir %{texmfdist}/scripts/splitindex
+#%dir %{texmfdist}/scripts/splitindex/perl
+#%attr(755,root,root) %{texmfdist}/scripts/splitindex/perl/splitindex.pl
 %dir %{texmfdist}/scripts/mkgrkindex
 %attr(755,root,root) %{texmfdist}/scripts/mkgrkindex/mkgrkindex
 %{_mandir}/man1/makeindex.1*
@@ -2739,8 +2668,8 @@ fi
 
 %files tlmgr
 %defattr(644,root,root,755)
-%dir %{texmf}/scripts/texlive
-%attr(755,root,root) %{texmf}/scripts/texlive/*.pl
+%dir %{texmfdist}/scripts/texlive
+%attr(755,root,root) %{texmfdist}/scripts/texlive/*.pl
 %attr(755,root,root) %{_bindir}/tlmgr
 # %dir %{texmf}/scripts/texlive/gswin32
 # %dir %{texmf}/scripts/texlive/lua
@@ -2762,10 +2691,10 @@ fi
 # %dir %{texmfdist}/scripts/shipunov
 %dir %{texmfdist}/scripts/texcount
 %dir %{texmfdist}/scripts/vpe
-%dir %{texmf}/scripts/a2ping
+%dir %{texmfdist}/scripts/a2ping
 # %dir %{texmf}/scripts/pkfix
-%dir %{texmf}/scripts/simpdftex
-%dir %{texmf}/scripts/tetex
+%dir %{texmfdist}/scripts/simpdftex
+#%dir %{texmf}/scripts/tetex
 # %attr(755,root,root) %{texmfdist}/scripts/bengali/*
 %attr(755,root,root) %{texmfdist}/scripts/glossaries/*
 %attr(755,root,root) %{texmfdist}/scripts/perltex/perltex*
@@ -2774,10 +2703,10 @@ fi
 # %attr(755,root,root) %{texmfdist}/scripts/shipunov/*
 %attr(755,root,root) %{texmfdist}/scripts/texcount/*
 %attr(755,root,root) %{texmfdist}/scripts/vpe/vpe.pl
-%attr(755,root,root) %{texmf}/scripts/a2ping/a2ping*
+%attr(755,root,root) %{texmfdist}/scripts/a2ping/a2ping*
 # %attr(755,root,root) %{texmf}/scripts/pkfix/pkfix*
-%attr(755,root,root) %{texmf}/scripts/simpdftex/simpdftex*
-%attr(755,root,root) %{texmf}/scripts/tetex/*
+%attr(755,root,root) %{texmfdist}/scripts/simpdftex/simpdftex*
+#%attr(755,root,root) %{texmf}/scripts/tetex/*
 %attr(755,root,root) %{_bindir}/a2ping
 %attr(755,root,root) %{_bindir}/e2pall
 %dir %{texmfdist}/scripts/findhyph
@@ -2813,7 +2742,7 @@ fi
 %files mptopdf
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mptopdf
-%{_mandir}/man1/mptopdf.1*
+#%{_mandir}/man1/mptopdf.1*
 # %{texmfdist}/tex/mptopdf
 #%{fmtdir}/pdftex/mptopdf.fmt
 # %{fmtdir}/mptopdf
@@ -2826,14 +2755,14 @@ fi
 
 %files -n texconfig
 %defattr(644,root,root,755)
-%dir %{texmf}/texconfig
+%dir %{texmfdist}/texconfig
 %attr(755,root,root) %{_bindir}/texconfig
 %attr(755,root,root) %{_bindir}/texconfig-dialog
 %attr(755,root,root) %{_bindir}/texconfig-sys
-%attr(755,root,root) %{texmf}/texconfig/tcfmgr
+%attr(755,root,root) %{texmfdist}/texconfig/tcfmgr
 %{_mandir}/man1/texconfig.1*
 %{_mandir}/man1/texconfig-sys.1*
-%{texmf}/texconfig/tcfmgr.map
+%{texmfdist}/texconfig/tcfmgr.map
 
 %if %{with xindy}
 %files -n xindy
@@ -3041,7 +2970,7 @@ fi
 %{_mandir}/man1/xdvi.1*
 %{_desktopdir}/xdvi.desktop
 %{_pixmapsdir}/xdvi.png
-%{texmf}/xdvi
+#%{texmf}/xdvi
 
 %files pdftex
 %defattr(644,root,root,755)
@@ -3183,7 +3112,6 @@ fi
 %attr(755,root,root) %{_bindir}/ctxtools
 %attr(755,root,root) %{_bindir}/convbkmk
 # %attr(755,root,root) %{_bindir}/exatools
-%attr(755,root,root) %{_bindir}/luatools
 # %attr(755,root,root) %{_bindir}/makempy
 # %attr(755,root,root) %{_bindir}/mpstools
 %attr(755,root,root) %{_bindir}/mtxrun
@@ -3203,12 +3131,12 @@ fi
 %attr(755,root,root) %{_bindir}/texutil
 %attr(755,root,root) %{_bindir}/tmftools
 %attr(755,root,root) %{_bindir}/xmltools
-%{_mandir}/man1/ctxtools.1*
+#%{_mandir}/man1/ctxtools.1*
 # %{_mandir}/man1/pdftools.1*
-%{_mandir}/man1/pstopdf.1*
+#%{_mandir}/man1/pstopdf.1*
 # %{_mandir}/man1/texfind.1*
 # %{_mandir}/man1/texfont.1*
-%{_mandir}/man1/texmfstart.1*
+#%{_mandir}/man1/texmfstart.1*
 # %{_mandir}/man1/textools.1*
 # %{_mandir}/man1/texutil.1*
 # %{texmfdist}/context
@@ -3269,7 +3197,7 @@ fi
 # %doc %{texmfdist}/doc/latex/bibunits
 # %doc %{texmfdist}/doc/latex/footbib
 # %doc %{texmfdist}/doc/latex/natbib
-%doc %{texmf}/doc/bibtex8
+%doc %{texmfdist}/doc/bibtex8
 %{_mandir}/man1/bibtex.1*
 %{_mandir}/man1/rubibtex.1*
 
@@ -3298,7 +3226,7 @@ fi
 %defattr(644,root,root,755)
 # %doc %{texmfdist}/doc/generic/thumbpdf
 %attr(755,root,root) %{_bindir}/thumbpdf
-%{_mandir}/man1/thumbpdf.1*
+#%{_mandir}/man1/thumbpdf.1*
 # %{texmfdist}/tex/generic/thumbpdf
 %{texmfdist}/scripts/thumbpdf
 
@@ -3319,7 +3247,7 @@ fi
 %files dviutils
 %defattr(644,root,root,755)
 %dir %{texmfdist}/scripts/dviasm
-%dir %{texmf}/fonts/cmap
+#%dir %{texmf}/fonts/cmap
 # %doc %{texmf}/fonts/cmap/README
 %attr(755,root,root) %{_bindir}/disdvi
 %attr(755,root,root) %{_bindir}/dt2dv
@@ -3345,9 +3273,9 @@ fi
 %{_mandir}/man1/dvipos*
 %{_mandir}/man1/dviselect*
 %{_mandir}/man1/dvitodvi*
-%{texmf}/dvipdfmx
-%{texmf}/fonts/cmap/dvipdfmx
-# %{texmf}/fonts/map/dvipdfmx
+%{texmfdist}/dvipdfmx
+%{texmfdist}/fonts/cmap/dvipdfmx
+%{texmfdist}/fonts/map/dvipdfmx
 
 %files psutils
 %defattr(644,root,root,755)
@@ -3431,7 +3359,7 @@ fi
 %attr(755,root,root) %{_bindir}/xdvipdfmx
 %attr(755,root,root) %{_bindir}/xelatex
 %attr(755,root,root) %{_bindir}/xetex
-%dir %{fmtdir}/xetex
+#%dir %{fmtdir}/xetex
 # %doc %{texmfdist}/doc/generic/ifxetex
 # %doc %{texmfdist}/doc/generic/xetex-pstricks
 # %doc %{texmfdist}/doc/xelatex
@@ -3473,11 +3401,10 @@ fi
 %attr(755,root,root) %{_bindir}/cachepic
 # %attr(755,root,root) %{texmfdist}/scripts/context/lua/*
 %attr(755,root,root) %{_bindir}/luatools
-%attr(755,root,root) %{_bindir}/mtxrun
-%attr(755,root,root) %{texmf}/scripts/texlive/rungs.tlu
+#%attr(755,root,root) %{texmf}/scripts/texlive/rungs.tlu
 %attr(755,root,root) %{_bindir}/rungs
 %attr(755,root,root) %{_bindir}/texdoc
-%attr(755,root,root) %{texmf}/scripts/texdoc/texdoc.tlu
+#%attr(755,root,root) %{texmf}/scripts/texdoc/texdoc.tlu
 %{_mandir}/man1/luatex.1*
 %{_mandir}/man1/texlua.1*
 %{_mandir}/man1/texluac.1*
This page took 0.177877 seconds and 4 git commands to generate.