rpms/unifdef/F-11 fix-getline-splosion.patch, NONE, 1.1 unifdef.spec, 1.6, 1.7

Kyle McMartin kyle at fedoraproject.org
Fri Jan 15 20:53:32 UTC 2010


Author: kyle

Update of /cvs/pkgs/rpms/unifdef/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14395

Modified Files:
	unifdef.spec 
Added Files:
	fix-getline-splosion.patch 
Log Message:
* Fri Jan 15 2010 Kyle McMartin <kyle at redhat.com> 1.171-9
- fix unifdef ftbfs


fix-getline-splosion.patch:
 unifdef.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE fix-getline-splosion.patch ---
diff -Nur unifdef-1.171.orig/unifdef.c unifdef-1.171/unifdef.c
--- unifdef-1.171.orig/unifdef.c	2006-04-25 17:45:42.000000000 -0400
+++ unifdef-1.171/unifdef.c	2010-01-15 15:44:24.000000000 -0500
@@ -206,7 +206,7 @@
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         unifdef_getline(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
@@ -505,7 +505,7 @@
 
 	for (;;) {
 		linenum++;
-		lineval = getline();
+		lineval = unifdef_getline();
 		trans_table[ifstate[depth]][lineval]();
 		debug("process %s -> %s depth %d",
 		    linetype_name[lineval],
@@ -519,7 +519,7 @@
  * help from skipcomment().
  */
 static Linetype
-getline(void)
+unifdef_getline(void)
 {
 	const char *cp;
 	int cursym;


Index: unifdef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unifdef/F-11/unifdef.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- unifdef.spec	25 Feb 2009 23:01:25 -0000	1.6
+++ unifdef.spec	15 Jan 2010 20:53:32 -0000	1.7
@@ -1,11 +1,12 @@
 Summary: Unifdef tool for removing ifdef'd lines
 Name: unifdef
 Version: 1.171
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/unifdef/
 Source0: unifdef-1.171.tar.bz2
+Patch0: fix-getline-splosion.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -16,6 +17,7 @@ is inactive because it is inside a comme
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -41,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 15 2010 Kyle McMartin <kyle at redhat.com> 1.171-9
+- fix unifdef ftbfs
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.171-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



More information about the scm-commits mailing list