From abfac43c5d1a12c087df8d0d8682de692ddc6ea2 Mon Sep 17 00:00:00 2001
From: Kiyoshi Matsui <kmatsui@fedoraproject.org>
Date: Jun 04 2007 13:16:45 +0000
Subject: upstream update


---

diff --git a/.cvsignore b/.cvsignore
index b26bef2..9f5f937 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mcpp-2.6.3.tar.gz
+mcpp-2.6.4.tar.gz
diff --git a/mcpp.spec b/mcpp.spec
index a491c54..ad1c3e0 100644
--- a/mcpp.spec
+++ b/mcpp.spec
@@ -2,14 +2,13 @@
 
 Summary:    Alternative C/C++ preprocessor
 Name:       mcpp
-Version:    2.6.3
-Release:    5%{?dist}
+Version:    2.6.4
+Release:    1%{?dist}
 License:    BSD
 Group:      Development/Languages
 Source:     http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 URL:        http://mcpp.sourceforge.net/
 Patch0:     mcpp-manual.html.patch
-Patch1:     support.c.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -30,7 +29,6 @@ behaves independent from GCC.
 %prep
 %setup -q
 %patch0 -p0 -b .euc-jp
-%patch1 -p0 -b .orig
 
 %build
 %configure
@@ -48,13 +46,16 @@ iconv -f euc-jp -t utf-8 doc-jp/mcpp-manual.html > doc-jp/mcpp-manual-jp.html
 %doc    ChangeLog ChangeLog.old LICENSE NEWS README
 %doc    doc/mcpp-manual.html
 %lang(ja) %doc  doc-jp/mcpp-manual-jp.html
-%{_bindir}/%{name}
 %{_datadir}/man/man1/%{name}.1.gz
+%{_bindir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu May 19 2007 Kiyoshi Matsui <kmatsui@t3.rim.or.jp> 2.6.4-1
+- Upstream new release.
+
 * Fri Apr 27 2007 Kiyoshi Matsui <kmatsui@t3.rim.or.jp> 2.6.3-5
 - Apply the new patch (patch1) for mcpp.
 
diff --git a/sources b/sources
index 58c7d68..31e5f06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae64027a2d474f31656ad44ef656ca21  mcpp-2.6.3.tar.gz
+c0f5aa9b13e36ea0f2ab9358c5d65153  mcpp-2.6.4.tar.gz
diff --git a/support.c.patch b/support.c.patch
deleted file mode 100644
index a837929..0000000
--- a/support.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/support.c.orig	2007-03-23 22:51:59.000000000 +0900
-+++ src/support.c	2007-04-25 22:56:48.000000000 +0900
-@@ -1801,7 +1801,7 @@
-         }
-         if (*(ptr + len - 1) != '\n')   /* Unterminated source line */
-             break;
--        if (*(ptr + len - 2) == '\r') {         /* [CR+LF]          */
-+        if (len >= 2 && *(ptr + len - 2) == '\r') {         /* [CR+LF]      */
-             *(ptr + len - 2) = '\n';
-             *(ptr + --len) = EOS;
-             if (! cr_converted && (warn_level & cr_warn_level)) {