- Rebase to 2.2.10

- Dropped three patches
- Fix Source and URL
- Clean up spec

indent-2.2.9-cdw.patch

@@ -38,15 +38,15 @@ diff -burp indent-2.2.9/src/indent.h indent-2.2.9-cdw/src/indent.h
 --- indent-2.2.9/src/indent.h	2006-01-18 18:22:36.000000000 +0100
 +++ indent-2.2.9-cdw/src/indent.h	2006-01-27 17:20:14.000000000 +0100
 @@ -357,6 +357,9 @@ typedef struct parser_state
-     BOOLEAN in_decl;              /* set to true when we are in a declaration
+     BOOLEAN in_decl;              /*!<  set to true when we are in a declaration
                                     * statement.  The processing of braces is then
                                     * slightly different */
-+    BOOLEAN in_closing_br_while;  /* set to true when we are parsing
++    BOOLEAN in_closing_br_while;  /*!< set to true when we are parsing
 +                                   * closing while of do {} while
 +                                   * statement*/
-     int in_stmt;                  /* set to 1 while in a stmt */
+     int in_stmt;                  /*!<  set to 1 while in a stmt */
      int in_parameter_declaration;
-     int ind_level;                /* the current indentation level in spaces */
+     int ind_level;                /*!<  the current indentation level in spaces */
 diff -burp indent-2.2.9/src/parse.c indent-2.2.9-cdw/src/parse.c
 --- indent-2.2.9/src/parse.c	2002-08-04 19:08:41.000000000 +0200
 +++ indent-2.2.9-cdw/src/parse.c	2006-01-27 17:18:52.000000000 +0100

indent-2.2.9-explicits.patch

@@ -9,65 +9,3 @@ diff -Burp indent-2.2.9/man/texinfo2man.c indent-2.2.9-explicits/man/texinfo2man
  process_texi (FILE * in)
  {
    char buf[1024];
-diff -Burp indent-2.2.9/src/indent.c indent-2.2.9-explicits/src/indent.c
---- indent-2.2.9/src/indent.c	2006-01-18 18:17:57.000000000 +0100
-+++ indent-2.2.9-explicits/src/indent.c	2006-01-18 18:16:50.000000000 +0100
-@@ -373,8 +373,6 @@ static void handle_token_lparen(
-    BOOLEAN        * sp_sw,
-    int            * dec_ind)
- {
--    char lparen = *token;
--    
-     /* Braces in initializer lists should be put on new lines. This is
-      * necessary so that -gnu does not cause things like char
-      * *this_is_a_string_array[] = { "foo", "this_string_does_not_fit",
-@@ -3058,7 +3056,6 @@ int main (
-     int     argc,
-     char ** argv)
- {
--    int i;
-     char *profile_pathname = 0;
-     BOOLEAN using_stdin = false;
-     exit_values_ty exit_status;
-diff -Burp indent-2.2.9/src/io.h indent-2.2.9-explicits/src/io.h
---- indent-2.2.9/src/io.h	2002-08-04 19:08:41.000000000 +0200
-+++ indent-2.2.9-explicits/src/io.h	2006-01-18 18:12:56.000000000 +0100
-@@ -73,5 +73,6 @@ extern void fill_buffer (void);
- extern int compute_code_target (int paren_targ);
- extern int compute_label_target (void);
- extern void skip_buffered_space(void);
-+extern void dump_line (int force_nl, int *paren_targ);
- 
- #endif /* INDENT_IO_H */
-diff -Burp indent-2.2.9/src/output.c indent-2.2.9-explicits/src/output.c
---- indent-2.2.9/src/output.c	2006-01-18 18:18:00.000000000 +0100
-+++ indent-2.2.9-explicits/src/output.c	2006-01-18 18:14:02.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <utime.h>
-+#include <time.h>
- #include <sys/stat.h>
- 
- #include "indent.h"
-@@ -1207,7 +1208,7 @@ extern void close_output(
-     }
- }
- 
--extern inhibit_indenting(
-+extern void inhibit_indenting(
-     BOOLEAN flag)
- {
-     inhibited = flag;
-diff -Burp indent-2.2.9/src/output.h indent-2.2.9-explicits/src/output.h
---- indent-2.2.9/src/output.h	2002-08-04 19:08:41.000000000 +0200
-+++ indent-2.2.9-explicits/src/output.h	2006-01-18 17:55:07.000000000 +0100
-@@ -47,7 +47,7 @@ extern void close_output(
-     struct stat * file_stats,
-      const char  * filename);
- 
--extern inhibit_indenting(
-+extern void inhibit_indenting(
-     BOOLEAN flag);
- 
- 

indent-2.2.9-fix.patch

@@ -1,10 +0,0 @@
---- indent-2.2.9/src/indent.c
-+++ indent-2.2.9/src/indent.c
-@@ -875,6 +875,7 @@
-                                                  * imply we are in a stmt */
-         for (t_ptr = s_code; *t_ptr; ++t_ptr)
-         {
-+            check_lab_size();
-             *e_lab++ = *t_ptr;  /* turn everything so far into a label */
-         }
-                 

indent-2.2.9-gcc4.patch

@@ -1,32 +0,0 @@
---- indent-2.2.9/man/texinfo2man.c.jj	2002-01-17 14:28:51.000000000 -0500
-+++ indent-2.2.9/man/texinfo2man.c	2005-04-10 08:37:22.283581780 -0400
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include <malloc.h>
- #include <string.h>
- #include <ctype.h>
---- indent-2.2.9/src/indent.h.jj	2002-11-10 16:02:48.000000000 -0500
-+++ indent-2.2.9/src/indent.h	2005-04-10 08:35:06.395429529 -0400
-@@ -96,11 +96,6 @@ extern char *cur_line;
- /* Size of the input program, not including the ' \n\0' we add at the end */
- extern unsigned long in_prog_size;
- 
--/* The output file. */
--extern FILE *output;
--
--
--
- extern char *labbuf;            /* buffer for label */
- extern char *s_lab;             /* start ... */
- extern char *e_lab;             /* .. and end of stored label */
---- indent-2.2.9/src/output.c.jj	2002-12-12 12:36:49.000000000 -0500
-+++ indent-2.2.9/src/output.c	2005-04-10 08:35:54.511631253 -0400
-@@ -12,6 +12,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <utime.h>
- #include <sys/stat.h>

indent-2.2.9-lcall.patch

@@ -4,9 +4,9 @@ diff -burp indent-2.2.9/src/indent.c indent-2.2.9-lcall/src/indent.c
 @@ -3070,7 +3070,7 @@ int main (
      exit_values_ty exit_status;
  
- #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
--    setlocale (LC_MESSAGES, "");
-+    setlocale (LC_ALL, "");
+ #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES)
+-    setlocale(LC_MESSAGES, "");
++    setlocale(LC_ALL, "");
  #endif
-     bindtextdomain (PACKAGE, LOCALEDIR);
-     textdomain (PACKAGE);
+     bindtextdomain(PACKAGE, LOCALEDIR);
+     textdomain(PACKAGE);

indent-2.2.9-man.patch

@@ -35,23 +35,17 @@ diff -Bburpd indent-2.2.9-orig/doc/indent.texinfo indent-2.2.9/doc/indent.texinf
  @item -prs
  @itemx --space-after-parentheses
  Put a space after every '(' and before every ')'.@*
-@@ -1979,8 +1989,10 @@ the corresponding short option.
- \line{ --original \leaderfill                      -orig}
- \line{ --parameter-indentation \leaderfill         -ip@var{n}\ } 
- \line{ --paren-indentation \leaderfill             -pi@var{n}\ }
-+\line{ --preprocessor-indentation@var{n} \leaderfill     -ppi@var{n}\ }
+@@ -1979,6 +1989,7 @@ the corresponding short option.
+ \line{ --preprocessor-indentation \leaderfill      -ppi@var{n}\ }
  \line{ --preserve-mtime \leaderfill                -pmt\ }
  \line{ --procnames-start-lines \leaderfill         -psl\ }  
 +\line{ --remove-preprocessor-space \leaderfill     -nlps\ }
  \line{ --space-after-cast \leaderfill              -cs\ \ } 
  \line{ --space-after-for \leaderfill               -saf\ }
  \line{ --space-after-if \leaderfill                -sai\ }
-@@ -2063,8 +2075,10 @@ the corresponding short option.
- --original                                      -orig
- --parameter-indentation                         -ip@var{n}      
- --paren-indentation                             -pi@var{n}
-+--preprocessor-indentation@var{n}               -ppi@var{n}
+@@ -2063,6 +2075,7 @@ the corresponding short option.
  --preserve-mtime				-pmt
+ --preprocessor-indentation                      -ppi@var{n}
  --procnames-start-lines                         -psl            
 +--remove-preprocessor-space                     -nlps
  --space-after-cast                              -cs             

indent-2.2.9-zh_TW.patch

@@ -1,580 +0,0 @@
-diff -burpN indent-2.2.9/po/LINGUAS indent-2.2.9-po/po/LINGUAS
---- indent-2.2.9/po/LINGUAS	2002-12-16 17:03:13.000000000 +0100
-+++ indent-2.2.9-po/po/LINGUAS	2006-02-03 15:18:28.000000000 +0100
-@@ -1 +1 @@
--ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW.Big5
-+ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW
-diff -burpN indent-2.2.9/po/zh_TW.Big5.po indent-2.2.9-po/po/zh_TW.Big5.po
---- indent-2.2.9/po/zh_TW.Big5.po	2002-12-16 17:14:37.000000000 +0100
-+++ indent-2.2.9-po/po/zh_TW.Big5.po	1970-01-01 01:00:00.000000000 +0100
-@@ -1,283 +0,0 @@
--# Language file for GNU indent (use indent.pot as template).
--# Copyright (C) 2001 Free Software Foundation, Inc.
--# Carlo Wood <indent@alinoe.com>, 2001.
--#
--msgid ""
--msgstr ""
--"Project-Id-Version: indent 2.2.7\n"
--"POT-Creation-Date: 2002-12-16 16:12+0000\n"
--"PO-Revision-Date: 2001-09-05 08:38+0800\n"
--"Last-Translator: Franklin W. <franklin@hyweb.com.tw>\n"
--"Language-Team: zh_TW.Big5 <LL@li.org>\n"
--"MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=big5\n"
--"Content-Transfer-Encoding: 8bit\n"
--
--#: src/args.c:543
--msgid "usage: indent file [-o outfile ] [ options ]\n"
--msgstr "用法：indent <輸入檔> [-o 輸出檔] [選項]\n"
--
--#: src/args.c:544
--msgid "       indent file1 file2 ... fileN [ options ]\n"
--msgstr "      indent <輸入檔1> <輸入檔2> ... [ 選項 ]\n"
--
--#: src/args.c:609
--#, c-format
--msgid "indent: missing argument to parameter %s\n"
--msgstr "indent: 找不到 %s 的參數\n"
--
--#: src/args.c:717
--#, c-format
--msgid "indent: unknown option \"%s\"\n"
--msgstr "indent: 未知的選項 \"%s\"\n"
--
--#: src/args.c:728
--#, c-format
--msgid "option: %s\n"
--msgstr "選項：%s\n"
--
--#: src/args.c:744
--#, c-format
--msgid "GNU indent %s\n"
--msgstr ""
--
--#: src/args.c:827
--#, c-format
--msgid "indent: option ``%s'' requires a numeric parameter\n"
--msgstr "indent: ``%s'' 選項需要一個數字做為參數\n"
--
--#: src/args.c:836
--#, c-format
--msgid "indent: set_option: internal error: p_type %d\n"
--msgstr "indent: 內部錯誤：set_option 函式中出現錯誤的 proto type %d\n"
--
--#: src/args.c:892
--#, fuzzy
--msgid "Profile contains an unterminated comment"
--msgstr "設定檔中含有錯誤的字元"
--
--#: src/args.c:929
--msgid "Profile contains unpalatable characters"
--msgstr "設定檔中含有錯誤的字元"
--
--#: src/backup.c:404
--msgid "indent:  Strange version-control value\n"
--msgstr "indent: 版本控制資訊有錯誤\n"
--
--#: src/backup.c:405
--msgid "indent:  Using numbered-existing\n"
--msgstr "indent: 將改採現存的版本號\n"
--
--#: src/backup.c:434
--#, c-format
--msgid "indent: Can't make backup filename of %s\n"
--msgstr "indent: 無法產生 %s 的備份檔\n"
--
--#: src/backup.c:442
--#, c-format
--msgid "Can't open backup file %s"
--msgstr "無法開啟備份檔 %s"
--
--#: src/backup.c:449
--#, c-format
--msgid "Can't write to backup file %s"
--msgstr "無法寫入備份檔 %s"
--
--#: src/backup.c:463
--#, c-format
--msgid "Can't preserve modification time on backup file %s"
--msgstr "無法在備份檔 %s 中保留最後變更日期"
--
--#: src/globs.c:41 src/globs.c:64
--msgid "indent: Virtual memory exhausted.\n"
--msgstr "indent: 虛擬記憶體已用完\n"
--
--#: src/globs.c:79
--#, c-format
--msgid "indent: %s:%d: %s:"
--msgstr ""
--
--#: src/globs.c:93
--msgid "indent: Fatal Error: "
--msgstr "indent: 嚴重錯誤："
--
--#: src/globs.c:103
--msgid "indent: System Error: "
--msgstr "indent: 系統錯誤："
--
--#: src/globs.h:25
--msgid "Warning"
--msgstr ""
--
--#: src/globs.h:29
--msgid "Error"
--msgstr ""
--
--#: src/indent.c:156
--msgid "Ran out of memory"
--msgstr "記憶體已用完"
--
--#: src/indent.c:588 src/indent.c:1248
--#, c-format
--msgid "Extra %c"
--msgstr "多的字元 %c"
--
--#: src/indent.c:1352 src/indent.c:1378 src/indent.c:2438
--msgid "Line broken"
--msgstr "有一至數行被分割，請確認"
--
--#: src/indent.c:1969
--msgid "Unmatched #else"
--msgstr "#else 找不到相對應的關鍵字"
--
--#: src/indent.c:1970
--msgid "Unmatched #elif"
--msgstr "#elif 找不到相對應的關鍵字"
--
--#: src/indent.c:1997
--msgid "Unmatched #endif"
--msgstr "#endif 找不到相對應的關鍵字"
--
--#: src/indent.c:2381
--msgid "EOF encountered in comment"
--msgstr "在註解中碰到檔案結尾"
--
--#: src/indent.c:2610
--msgid "Unexpected end of file"
--msgstr "檔案結尾有問題"
--
--#: src/indent.c:2616
--#, c-format
--msgid "There were %d non-blank output lines and %d comments\n"
--msgstr "已編排 %d 個非空白行與 %d 個註解\n"
--
--#: src/indent.c:2620
--#, c-format
--msgid "(Lines with comments)/(Lines with code): %6.3f\n"
--msgstr "註解行與程式碼行的比例為：%6.3f\n"
--
--#: src/indent.c:2644
--#, fuzzy
--msgid "Line broken 2"
--msgstr "有一至數行被分割，請確認"
--
--#: src/indent.c:2846
--#, c-format
--msgid "indent: only one output file (2nd was %s)\n"
--msgstr "indent: 只能有一個輸出檔 (您指定了第二個輸出檔為 %s)\n"
--
--#: src/indent.c:2855 src/indent.c:2881
--msgid "indent: only one input file when output file is specified\n"
--msgstr "indent: 指定輸出檔時，只能有一個輸入檔\n"
--
--#: src/indent.c:2869 src/indent.c:2916
--msgid "indent: can't have filenames when specifying standard input\n"
--msgstr "indent: 指定使用標準輸入時，不能附帶輸入檔名\n"
--
--#: src/indent.c:2889
--msgid "indent: only one input file when stdout is used\n"
--msgstr "indent: 使用標準輸出時，只能有一個輸入檔\n"
--
--#: src/indent.c:3103
--#, c-format
--msgid "Read profile %s\n"
--msgstr "讀取設定檔 %s\n"
--
--#: src/io.c:187
--msgid "Internal buffering error"
--msgstr "內部暫存器出現錯誤"
--
--#: src/io.c:349
--#, c-format
--msgid "Can't open input file %s"
--msgstr "無法開啟輸入檔 %s"
--
--#: src/io.c:354
--#, c-format
--msgid "Can't stat input file %s"
--msgstr "無法找到輸入檔 %s 的資訊"
--
--#: src/io.c:359
--#, c-format
--msgid "Warning: Zero-length file %s"
--msgstr "警告：檔案 %s 沒有內容"
--
--#: src/io.c:367
--#, c-format
--msgid "File %s is too big to read"
--msgstr "檔案 %s 太大，無法讀取"
--
--#: src/io.c:375
--#, c-format
--msgid "System problem reading file %s"
--msgstr "讀取檔案 %s 時發生系統問題"
--
--#: src/io.c:399
--#, c-format
--msgid "Error reading input file %s"
--msgstr "讀取輸入檔 %s 時發生錯誤"
--
--#: src/io.c:404
--#, c-format
--msgid "Error closeing input file %s"
--msgstr "關閉輸入檔 %s 時發生問題"
--
--#: src/io.c:588
--#, c-format
--msgid "Warning: File %s contains NULL-characters\n"
--msgstr "警告：檔案 %s 包含空字元（NULL-char）\n"
--
--#: src/lexi.c:756
--msgid "Unterminated character constant"
--msgstr "可能少掉一個字元單引號"
--
--#: src/lexi.c:757
--msgid "Unterminated string constant"
--msgstr "可能少掉一個字串雙引號"
--
--#: src/lexi.c:999
--#, c-format
--msgid "old style assignment ambiguity in \"=%c\".  Assuming \"= %c\"\n"
--msgstr ""
--"有疑義的指定敘述 \"=%c\"，可能為舊式的寫法。indent 將假設它為 \"= %c\"\n"
--
--#: src/output.c:1148
--#, c-format
--msgid "indent: can't create %s\n"
--msgstr "indent: 無法產生 %s\n"
--
--#: src/output.c:1187
--#, c-format
--msgid "Can't close output file %s"
--msgstr "無法關閉輸出檔 %s"
--
--#: src/output.c:1200
--#, c-format
--msgid "Can't preserve modification time on output file %s"
--msgstr "無法在輸出檔 %s 保留最後變更日期"
--
--#: src/parse.c:399
--msgid "Unmatched 'else'"
--msgstr "else 找不到相對應的 if"
--
--#: src/parse.c:425
--msgid "Stmt nesting error."
--msgstr "巢狀敘述有錯誤。"
--
--#: src/parse.c:467
--msgid "Unknown code to parser"
--msgstr "無法剖析的程式碼"
--
--#: src/parse.c:477
--#, c-format
--msgid "ParseStack [%d]:\n"
--msgstr ""
--
--#: src/parse.c:481
--#, c-format
--msgid "  stack[%d] =>   stack: %d   ind_level: %d\n"
--msgstr ""
--
--#: src/wildexp.c:90
--msgid "CANNOT FIND '@' FILE!"
--msgstr "無法找到 '@' 檔案。"
-diff -burpN indent-2.2.9/po/zh_TW.po indent-2.2.9-po/po/zh_TW.po
---- indent-2.2.9/po/zh_TW.po	1970-01-01 01:00:00.000000000 +0100
-+++ indent-2.2.9-po/po/zh_TW.po	2006-02-03 15:18:19.000000000 +0100
-@@ -0,0 +1,283 @@
-+# Language file for GNU indent (use indent.pot as template).
-+# Copyright (C) 2001 Free Software Foundation, Inc.
-+# Carlo Wood <indent@alinoe.com>, 2001.
-+# Franklin W. <franklin@hyweb.com.tw>, 2002
-+# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2004
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: indent 2.2.9\n"
-+"POT-Creation-Date: 2002-12-16 16:12+0000\n"
-+"PO-Revision-Date: 2006-02-03 15:18+0100\n"
-+"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
-+"Language-Team: zh_TW <LL@li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#: src/args.c:543
-+msgid "usage: indent file [-o outfile ] [ options ]\n"
-+msgstr "<22>冽<EFBFBD>嚗餜ndent <頛詨<E9A09B>瑼<EFBFBD>> [-o 頛詨枂瑼瑺 [<5B>賊<EFBFBD>]\n"
-+
-+#: src/args.c:544
-+msgid "       indent file1 file2 ... fileN [ options ]\n"
-+msgstr "      indent <頛詨<E9A09B>瑼<EFBFBD>1> <頛詨<E9A09B>瑼<EFBFBD>2> ... [ <20>賊<EFBFBD> ]\n"
-+
-+#: src/args.c:609
-+#, c-format
-+msgid "indent: missing argument to parameter %s\n"
-+msgstr "indent: <20>曆<EFBFBD><E69B86><EFBFBD> %s <20><><EFBFBD><EFBFBD>稞n"
-+
-+#: src/args.c:717
-+#, c-format
-+msgid "indent: unknown option \"%s\"\n"
-+msgstr "indent: <20>芰䰻<E88AB0><E4B0BB><EFBFBD><EFBFBD><EFBFBD> \"%s\"\n"
-+
-+#: src/args.c:728
-+#, c-format
-+msgid "option: %s\n"
-+msgstr "<22>賊<EFBFBD>嚗<EFBFBD>%s\n"
-+
-+#: src/args.c:744
-+#, c-format
-+msgid "GNU indent %s\n"
-+msgstr "GNU indent %s\n"
-+
-+#: src/args.c:827
-+#, c-format
-+msgid "indent: option ``%s'' requires a numeric parameter\n"
-+msgstr "indent: ``%s'' <20>賊<EFBFBD><E8B38A><EFBFBD>閬<EFBFBD><E996AC><EFBFBD>𧢲彍摮堒<E691AE><E5A092>箏<EFBFBD><E7AE8F>稞n"
-+
-+#: src/args.c:836
-+#, c-format
-+msgid "indent: set_option: internal error: p_type %d\n"
-+msgstr "indent: <20>折<EFBFBD><E68A98>航炊嚗窃et_option <20>賢<EFBFBD>銝剖枂<E58996>暸𥲤隤斤<E99AA4> proto type %d\n"
-+
-+#: src/args.c:892
-+#, fuzzy
-+msgid "Profile contains an unterminated comment"
-+msgstr "閮剖<E996AE>瑼𥪯葉<F0A5AAAF>急<EFBFBD><E680A5>航炊<E888AA><E7828A><EFBFBD><EFBFBD><EFBFBD>"
-+
-+#: src/args.c:929
-+msgid "Profile contains unpalatable characters"
-+msgstr "閮剖<E996AE>瑼𥪯葉<F0A5AAAF>急<EFBFBD><E680A5>航炊<E888AA><E7828A><EFBFBD><EFBFBD><EFBFBD>"
-+
-+#: src/backup.c:404
-+msgid "indent:  Strange version-control value\n"
-+msgstr "indent: <20><>𧋦<EFBFBD>批<EFBFBD>鞈<EFBFBD><E99E88><EFBFBD>厰𥲤隤么n"
-+
-+#: src/backup.c:405
-+msgid "indent:  Using numbered-existing\n"
-+msgstr "indent: 撠<>㺿<EFBFBD>∠𣶹摮条<E691AE><E69DA1><EFBFBD>𧋦<EFBFBD>髿n"
-+
-+#: src/backup.c:434
-+#, c-format
-+msgid "indent: Can't make backup filename of %s\n"
-+msgstr "indent: <20>⊥<EFBFBD><E28AA5>Ｙ<EFBFBD> %s <20><><EFBFBD>隞賣<E99A9E>\n"
-+
-+#: src/backup.c:442
-+#, c-format
-+msgid "Can't open backup file %s"
-+msgstr "<22>⊥<EFBFBD><E28AA5>见<EFBFBD><E8A781>嗘遢瑼<E981A2> %s"
-+
-+#: src/backup.c:449
-+#, c-format
-+msgid "Can't write to backup file %s"
-+msgstr "<22>⊥<EFBFBD>撖怠<E69296><E680A0>嗘遢瑼<E981A2> %s"
-+
-+#: src/backup.c:463
-+#, c-format
-+msgid "Can't preserve modification time on backup file %s"
-+msgstr "<22>⊥<EFBFBD><E28AA5>典<EFBFBD>隞賣<E99A9E> %s 銝凋<E98A9D><E5878B>蹱<EFBFBD>敺諹<E695BA><E8ABB9>湔𠯫<E6B994><F0A0AFAB>"
-+
-+#: src/globs.c:41 src/globs.c:64
-+msgid "indent: Virtual memory exhausted.\n"
-+msgstr "indent: <20>𥟇挱閮䀹<E996AE>擃𥪜歇<F0A5AA9C>典<EFBFBD>\n"
-+
-+#: src/globs.c:79
-+#, c-format
-+msgid "indent: %s:%d: %s:"
-+msgstr "indent: %s:%d: %s:"
-+
-+#: src/globs.c:93
-+msgid "indent: Fatal Error: "
-+msgstr "indent: <20>湧<EFBFBD><E6B9A7>航炊嚗<E7828A>"
-+
-+#: src/globs.c:103
-+msgid "indent: System Error: "
-+msgstr "indent: 蝟餌絞<E9A48C>航炊嚗<E7828A>"
-+
-+#: src/globs.h:25
-+msgid "Warning"
-+msgstr "霅血<E99C85>"
-+
-+#: src/globs.h:29
-+msgid "Error"
-+msgstr "<22>航炊"
-+
-+#: src/indent.c:156
-+msgid "Ran out of memory"
-+msgstr "閮䀹<E996AE>擃𥪜歇<F0A5AA9C>典<EFBFBD>"
-+
-+#: src/indent.c:588 src/indent.c:1248
-+#, c-format
-+msgid "Extra %c"
-+msgstr "憭𡁶<E686AD>摮堒<E691AE> %c"
-+
-+#: src/indent.c:1352 src/indent.c:1378 src/indent.c:2438
-+msgid "Line broken"
-+msgstr "<22>劐<EFBFBD><E58A90>單彍<E596AE>𡑒◤<F0A19192><E297A4>𠧧嚗諹<E59A97>蝣箄<E89DA3>"
-+
-+#: src/indent.c:1969
-+msgid "Unmatched #else"
-+msgstr "#else <20>曆<EFBFBD><E69B86>啁㮾撠齿<E692A0><E9BDBF><EFBFBD><EFBFBD><EFBFBD>萄<EFBFBD>"
-+
-+#: src/indent.c:1970
-+msgid "Unmatched #elif"
-+msgstr "#elif <20>曆<EFBFBD><E69B86>啁㮾撠齿<E692A0><E9BDBF><EFBFBD><EFBFBD><EFBFBD>萄<EFBFBD>"
-+
-+#: src/indent.c:1997
-+msgid "Unmatched #endif"
-+msgstr "#endif <20>曆<EFBFBD><E69B86>啁㮾撠齿<E692A0><E9BDBF><EFBFBD><EFBFBD><EFBFBD>萄<EFBFBD>"
-+
-+#: src/indent.c:2381
-+msgid "EOF encountered in comment"
-+msgstr "<22>刻酉閫<E98589>葉蝣啣<E89DA3>瑼娍<E791BC>蝯𣂼偏"
-+
-+#: src/indent.c:2610
-+msgid "Unexpected end of file"
-+msgstr "瑼娍<E791BC>蝯𣂼偏<F0A382BC>匧<EFBFBD>憿<EFBFBD>"
-+
-+#: src/indent.c:2616
-+#, c-format
-+msgid "There were %d non-blank output lines and %d comments\n"
-+msgstr "撌脩楊<E884A9><E6A58A> %d <20>钅<EFBFBD>蝛箇蒾<E7AE87>𡑒<EFBFBD> %d <20>贝酉閫αn"
-+
-+#: src/indent.c:2620
-+#, c-format
-+msgid "(Lines with comments)/(Lines with code): %6.3f\n"
-+msgstr "閮餉圾<E9A489>𡑒<EFBFBD>蝔见<E89D94>蝣澆<E89DA3><E6BE86><EFBFBD><EFBFBD>靘讠<E99D98>嚗<EFBFBD>%6.3f\n"
-+
-+#: src/indent.c:2644
-+#, fuzzy
-+msgid "Line broken 2"
-+msgstr "<22>劐<EFBFBD><E58A90>單彍<E596AE>𡑒◤<F0A19192><E297A4>𠧧嚗諹<E59A97>蝣箄<E89DA3>"
-+
-+#: src/indent.c:2846
-+#, c-format
-+msgid "indent: only one output file (2nd was %s)\n"
-+msgstr "indent: <20>芾<EFBFBD><E88ABE>劐<EFBFBD><E58A90>贝撓<E8B49D>箸<EFBFBD> (<28>冽<EFBFBD>摰帋<E691B0>蝚砌<E89D9A><E7A08C>贝撓<E8B49D>箸<EFBFBD><E7AEB8><EFBFBD> %s)\n"
-+
-+#: src/indent.c:2855 src/indent.c:2881
-+msgid "indent: only one input file when output file is specified\n"
-+msgstr "indent: <20><><EFBFBD>頛詨枂瑼娍<E791BC>嚗<EFBFBD>蘨<EFBFBD>賣<EFBFBD>銝<EFBFBD><E98A9D>贝撓<E8B49D>交<EFBFBD>\n"
-+
-+#: src/indent.c:2869 src/indent.c:2916
-+msgid "indent: can't have filenames when specifying standard input\n"
-+msgstr "indent: <20><><EFBFBD>雿輻鍂璅蹱<E79285>頛詨<E9A09B><E8A9A8><EFBFBD><EFBFBD>銝滩<E98A9D><E6BBA9><EFBFBD>葆頛詨<E9A09B>瑼𥪜<E791BC>\n"
-+
-+#: src/indent.c:2889
-+msgid "indent: only one input file when stdout is used\n"
-+msgstr "indent: 雿輻鍂璅蹱<E79285>頛詨枂<E8A9A8><E69E82><EFBFBD><EFBFBD>芾<EFBFBD><E88ABE>劐<EFBFBD><E58A90>贝撓<E8B49D>交<EFBFBD>\n"
-+
-+#: src/indent.c:3103
-+#, c-format
-+msgid "Read profile %s\n"
-+msgstr "霈<><E99C88>𤥁身摰𡁏<E691B0> %s\n"
-+
-+#: src/io.c:187
-+msgid "Internal buffering error"
-+msgstr "<22>折<EFBFBD><E68A98>怠<EFBFBD><E680A0>典枂<E585B8>暸𥲤隤<F0A5B2A4>"
-+
-+#: src/io.c:349
-+#, c-format
-+msgid "Can't open input file %s"
-+msgstr "<22>⊥<EFBFBD><E28AA5>见<EFBFBD>頛詨<E9A09B>瑼<EFBFBD> %s"
-+
-+#: src/io.c:354
-+#, c-format
-+msgid "Can't stat input file %s"
-+msgstr "<22>⊥<EFBFBD><E28AA5>曉<EFBFBD>頛詨<E9A09B>瑼<EFBFBD> %s <20><><EFBFBD>閮<EFBFBD>"
-+
-+#: src/io.c:359
-+#, c-format
-+msgid "Warning: Zero-length file %s"
-+msgstr "霅血<E99C85>嚗𡁏<E59A97>獢<EFBFBD> %s 瘝埝<E7989D><E59F9D>批捆"
-+
-+#: src/io.c:367
-+#, c-format
-+msgid "File %s is too big to read"
-+msgstr "瑼娍<E791BC> %s 憭芸之嚗𣬚<E59A97>瘜閗<E7989C><E99697><EFBFBD>"
-+
-+#: src/io.c:375
-+#, c-format
-+msgid "System problem reading file %s"
-+msgstr "霈<><E99C88>𡝗<EFBFBD>獢<EFBFBD> %s <20><>䔄<EFBFBD>毺頂蝯勗<E89DAF>憿<EFBFBD>"
-+
-+#: src/io.c:399
-+#, c-format
-+msgid "Error reading input file %s"
-+msgstr "霈<><E99C88>𤥁撓<F0A4A581>交<EFBFBD> %s <20><>䔄<EFBFBD>罸𥲤隤<F0A5B2A4>"
-+
-+#: src/io.c:404
-+#, c-format
-+msgid "Error closeing input file %s"
-+msgstr "<22>𣈯<EFBFBD>頛詨<E9A09B>瑼<EFBFBD> %s <20><>䔄<EFBFBD>笔<EFBFBD>憿<EFBFBD>"
-+
-+#: src/io.c:588
-+#, c-format
-+msgid "Warning: File %s contains NULL-characters\n"
-+msgstr "霅血<E99C85>嚗𡁏<E59A97>獢<EFBFBD> %s <20><>鉄蝛箏<E89D9B><E7AE8F><EFBFBD><EFBFBD>NULL-char嚗声n"
-+
-+#: src/lexi.c:756
-+msgid "Unterminated character constant"
-+msgstr "<22>航<EFBFBD>撠烐<E692A0>銝<EFBFBD><E98A9D>见<EFBFBD><E8A781><EFBFBD>鱓撘閗<E69298>"
-+
-+#: src/lexi.c:757
-+msgid "Unterminated string constant"
-+msgstr "<22>航<EFBFBD>撠烐<E692A0>銝<EFBFBD><E98A9D>见<EFBFBD>銝脤<E98A9D>撘閗<E69298>"
-+
-+#: src/lexi.c:999
-+#, c-format
-+msgid "old style assignment ambiguity in \"=%c\".  Assuming \"= %c\"\n"
-+msgstr "<22>厩<EFBFBD>蝢拍<E89DA2><E68B8D><EFBFBD><EFBFBD><EFBFBD>䁅膩 \"=%c\"嚗<>虾<EFBFBD>賜<EFBFBD><E8B39C>𠰴<EFBFBD><F0A0B0B4><EFBFBD>神瘜𨰻<E7989C><F0A8B0BB>ndent 撠<><E692A0>閮剖<E996AE><E58996><EFBFBD> \"= %c\"\n"
-+
-+#: src/output.c:1148
-+#, c-format
-+msgid "indent: can't create %s\n"
-+msgstr "indent: <20>⊥<EFBFBD><E28AA5>Ｙ<EFBFBD> %s\n"
-+
-+#: src/output.c:1187
-+#, c-format
-+msgid "Can't close output file %s"
-+msgstr "<22>⊥<EFBFBD><E28AA5>𣈯<EFBFBD>頛詨枂瑼<E69E82> %s"
-+
-+#: src/output.c:1200
-+#, c-format
-+msgid "Can't preserve modification time on output file %s"
-+msgstr "<22>⊥<EFBFBD><E28AA5>刻撓<E588BB>箸<EFBFBD> %s 靽萘<E99DBD><E89098><EFBFBD>敺諹<E695BA><E8ABB9>湔𠯫<E6B994><F0A0AFAB>"
-+
-+#: src/parse.c:399
-+msgid "Unmatched 'else'"
-+msgstr "else <20>曆<EFBFBD><E69B86>啁㮾撠齿<E692A0><E9BDBF><EFBFBD> if"
-+
-+#: src/parse.c:425
-+msgid "Stmt nesting error."
-+msgstr "撌Ｙ<E6928C><EFBCB9>䁅膩<E48185>厰𥲤隤扎<E99AA4><E6898E>"
-+
-+#: src/parse.c:467
-+msgid "Unknown code to parser"
-+msgstr "<22>⊥<EFBFBD><E28AA5>𡝗<EFBFBD><F0A19D97><EFBFBD><EFBFBD>撘讐Ⅳ"
-+
-+#: src/parse.c:477
-+#, c-format
-+msgid "ParseStack [%d]:\n"
-+msgstr "<22>𡝗<EFBFBD><F0A19D97><EFBFBD><EFBFBD> [%d]:\n"
-+
-+#: src/parse.c:481
-+#, c-format
-+msgid "  stack[%d] =>   stack: %d   ind_level: %d\n"
-+msgstr "  <20><><EFBFBD>[%d] =>   <20><><EFBFBD>: %d   <20>鍦<EFBFBD>撅斤<E69285>: %d\n"
-+
-+#: src/wildexp.c:90
-+msgid "CANNOT FIND '@' FILE!"
-+msgstr "<22>⊥<EFBFBD><E28AA5>曉<EFBFBD> '@' 瑼娍<E791BC><E5A88D><EFBFBD>"

indent.spec

@@ -1,21 +1,18 @@
 # -*- coding: utf-8 -*-
 Summary: A GNU program for formatting C code
 Name: indent
-Version: 2.2.9
-Release: 19%{?dist}
-License: GPLv2+
+Version: 2.2.10
+Release: 1%{?dist}
+License: GPLv3+
 Group: Applications/Text
-URL: http://www.gnu.org/software/indent/
-Source: ftp://ftp.gnu.org/pub/gnu/indent/indent-%{version}.tar.gz
-Patch: indent-2.2.9-fix.patch
-Patch2: indent-2.2.9-gcc4.patch
+URL: http://indent.isidore-it.eu/beautify.html
+Source: http://indent.isidore-it.eu/%{name}-%{version}.tar.gz
 Patch3: indent-2.2.9-explicits.patch
 Patch4: indent-2.2.9-cdw.patch
 Patch5: indent-2.2.9-lcall.patch
-Patch6: indent-2.2.9-zh_TW.patch
 Patch7: indent-2.2.9-man.patch
 BuildRequires: gettext texinfo
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -30,22 +27,19 @@ you want a program to format your code.
 
 %prep
 %setup -q
-%patch -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir $RPM_BUILD_ROOT/usr/bin/texinfo2man \
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir $RPM_BUILD_ROOT/%{_bindir}/texinfo2man \
 	$RPM_BUILD_ROOT/usr/doc/indent/indent.html
 
 %find_lang %name
@@ -67,13 +61,20 @@ if [ "$1" = 0 ]; then
 fi
 
 %files -f %{name}.lang
+%doc AUTHORS COPYING NEWS README
 %defattr(-,root,root)
-/usr/bin/indent
-%{_mandir}/*/*
-%{_infodir}/*
+%{_bindir}/indent
+%{_mandir}/man1/indent.*
+%{_infodir}/indent.info*
 
 
 %changelog
+* Wed Mar 12 2008 Petr Machata <pmachata@redhat.com> - 2.2.10-1
+- Rebase to 2.2.10
+  - Dropped three patches
+  - Fix Source and URL
+  - Clean up spec
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.2.9-19
 - Autorebuild for GCC 4.3