rpms/indent/devel indent-2.2.9-cdw.patch, 1.1, 1.2 indent-2.2.9-explicits.patch, 1.1, 1.2 indent-2.2.9-lcall.patch, 1.1, 1.2 indent-2.2.9-man.patch, 1.1, 1.2 indent.spec, 1.31, 1.32 indent-2.2.9-fix.patch, 1.1, NONE indent-2.2.9-gcc4.patch, 1.1, NONE indent-2.2.9-zh_TW.patch, 1.1, NONE

Petr Machata (pmachata) fedora-extras-commits at redhat.com
Wed Mar 12 15:31:18 UTC 2008


Author: pmachata

Update of /cvs/pkgs/rpms/indent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16280

Modified Files:
	indent-2.2.9-cdw.patch indent-2.2.9-explicits.patch 
	indent-2.2.9-lcall.patch indent-2.2.9-man.patch indent.spec 
Removed Files:
	indent-2.2.9-fix.patch indent-2.2.9-gcc4.patch 
	indent-2.2.9-zh_TW.patch 
Log Message:
- Rebase to 2.2.10
  - Dropped three patches
  - Fix Source and URL
  - Clean up spec


indent-2.2.9-cdw.patch:

Index: indent-2.2.9-cdw.patch
===================================================================
RCS file: /cvs/pkgs/rpms/indent/devel/indent-2.2.9-cdw.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- indent-2.2.9-cdw.patch	27 Jan 2006 16:42:29 -0000	1.1
+++ indent-2.2.9-cdw.patch	12 Mar 2008 15:31:03 -0000	1.2
@@ -38,15 +38,15 @@
 --- 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:

Index: indent-2.2.9-explicits.patch
===================================================================
RCS file: /cvs/pkgs/rpms/indent/devel/indent-2.2.9-explicits.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- indent-2.2.9-explicits.patch	18 Jan 2006 17:35:44 -0000	1.1
+++ indent-2.2.9-explicits.patch	12 Mar 2008 15:31:03 -0000	1.2
@@ -9,65 +9,3 @@
  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-lcall.patch:

Index: indent-2.2.9-lcall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/indent/devel/indent-2.2.9-lcall.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- indent-2.2.9-lcall.patch	1 Feb 2006 13:25:16 -0000	1.1
+++ indent-2.2.9-lcall.patch	12 Mar 2008 15:31:03 -0000	1.2
@@ -4,9 +4,9 @@
 @@ -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:

Index: indent-2.2.9-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/indent/devel/indent-2.2.9-man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- indent-2.2.9-man.patch	16 Jul 2006 12:04:09 -0000	1.1
+++ indent-2.2.9-man.patch	12 Mar 2008 15:31:03 -0000	1.2
@@ -35,23 +35,17 @@
  @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 at var{n}\ } 
- \line{ --paren-indentation \leaderfill             -pi at var{n}\ }
-+\line{ --preprocessor-indentation at var{n} \leaderfill     -ppi at var{n}\ }
+@@ -1979,6 +1989,7 @@ the corresponding short option.
+ \line{ --preprocessor-indentation \leaderfill      -ppi at 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 at var{n}      
- --paren-indentation                             -pi at var{n}
-+--preprocessor-indentation at var{n}               -ppi at var{n}
+@@ -2063,6 +2075,7 @@ the corresponding short option.
  --preserve-mtime				-pmt
+ --preprocessor-indentation                      -ppi at var{n}
  --procnames-start-lines                         -psl            
 +--remove-preprocessor-space                     -nlps
  --space-after-cast                              -cs             


Index: indent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/indent/devel/indent.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- indent.spec	19 Feb 2008 19:57:27 -0000	1.31
+++ indent.spec	12 Mar 2008 15:31:03 -0000	1.32
@@ -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 @@
 
 %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 @@
 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 at 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 at fedoraproject.org> - 2.2.9-19
 - Autorebuild for GCC 4.3
 


--- indent-2.2.9-fix.patch DELETED ---


--- indent-2.2.9-gcc4.patch DELETED ---


--- indent-2.2.9-zh_TW.patch DELETED ---




More information about the fedora-extras-commits mailing list