rpms/global/devel global-4.8.4-gcc4.patch, NONE, 1.1 global.spec, 1.8, 1.9

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/rpms/global/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27255

Modified Files:
	global.spec 
Added Files:
	global-4.8.4-gcc4.patch 
Log Message:
* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 4.8.4-4
- fix build with gcc4 (#156212)


global-4.8.4-gcc4.patch:

--- NEW FILE global-4.8.4-gcc4.patch ---
--- global-4.8.4/htags/lexcommon.h.gcc4	2005-05-25 17:59:20.000000000 -0400
+++ global-4.8.4/htags/lexcommon.h	2005-05-25 17:59:40.000000000 -0400
@@ -28,7 +28,7 @@
  * and PREPROCESSOR_LINE as %start values, even if they are not used.
  * It assumed that CPP_COMMENT and SHELL_COMMENT is one line comment.
  */
-static int lineno;
+extern int lineno;
 static int begin_line;
 /*
  * If you want newline to terminate string, set this variable to 1.


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/devel/global.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- global.spec	22 May 2005 23:07:54 -0000	1.8
+++ global.spec	25 May 2005 22:03:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           global
 Version:        4.8.4
-Release: 3
+Release: 4
 
 Summary:        Source code tag system
 
@@ -8,6 +8,7 @@
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
 Source:         http://tamacom.com/global/global-4.8.4.tar.gz
+Patch0: global-4.8.4-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc4
 
 %build
 %configure
@@ -48,6 +50,9 @@
 %{_datadir}/gtags
 
 %changelog
+* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 4.8.4-4
+- fix build with gcc4 (#156212)
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 4.8.4-3
 - rebuild on all arches