rpms/dia/FC-4 dia-0.94-gnomeflags.patch, NONE, 1.1 dia.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/dia/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv11740

Modified Files:
	dia.spec 
Added Files:
	dia-0.94-gnomeflags.patch 
Log Message:
build gone stale

dia-0.94-gnomeflags.patch:
 app/Makefile.am            |    3 ++-
 plug-ins/cairo/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE dia-0.94-gnomeflags.patch ---
--- dia-0.94.orig/plug-ins/cairo/Makefile.am	2006-01-03 13:45:06.000000000 +0000
+++ dia-0.94/plug-ins/cairo/Makefile.am	2006-01-03 13:45:30.000000000 +0000
@@ -11,4 +11,4 @@
 
 libcairo_filter_la_LIBADD = $(CAIRO_LIBS)
 
-INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
+INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS) $(GNOME_CFLAGS)
--- dia-0.94.orig/app/Makefile.am	2006-01-03 13:53:07.000000000 +0000
+++ dia-0.94/app/Makefile.am	2006-01-03 13:53:27.000000000 +0000
@@ -8,6 +8,7 @@
 	-I$(top_srcdir)/lib \
 	$(DEBUG_FLAGS) \
 	$(GTK_CFLAGS) \
+	$(GNOME_CFLAGS) \
         -DPREFIX=\""$(prefix)"\" \
         -DSYSCONFDIR=\""$(sysconfdir)"\" \
         -DDATADIR=\""$(datadir)"\" \
--- dia-0.94.orig/app/Makefile.am	2006-01-03 14:02:08.000000000 +0000
+++ dia-0.94/app/Makefile.am	2006-01-03 14:04:00.000000000 +0000
@@ -168,7 +168,7 @@
 
 dia_LDADD = ../lib/libdia.la \
 	$(EFENCE) \
-	$(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS)
+	$(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS)
 
 #diaconv_LDADD = ../lib/libdia.la \
 #	$(EFENCE) \


Index: dia.spec
===================================================================
RCS file: /cvs/dist/rpms/dia/FC-4/dia.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dia.spec	31 Mar 2006 11:20:31 -0000	1.30
+++ dia.spec	31 Mar 2006 12:54:44 -0000	1.31
@@ -32,7 +32,8 @@
 Patch3: dia-0.94-gcc4.patch
 Patch4: dia-0.94-fallbacktoxpmicons.patch
 Patch5: dia-0.94-rh165337.patch
-Patch6: dia-0.94-rh187402.patch
+Patch6: dia-0.94-gnomeflags.patch
+Patch7: dia-0.94-rh187402.patch
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -51,7 +52,8 @@
 %patch3 -p1 -b .gcc4
 %patch4 -p1 -b .fallbacktoxpmicons
 %patch5 -p1 -b .rh165337
-%patch6 -p1 -b .rh187402
+%patch6 -p1 -b .gnomeflags
+%patch7 -p1 -b .rh187402
 
 %build
 aclocal-1.7
@@ -119,7 +121,7 @@
 
 %changelog
 * Fri Mar 31 2006 Caolan McNamara <caolanm at redhat.com>
-- rh#187402# buffer overflow fix
+- CVE-2006-1550 rh#187402# buffer overflow fix
 
 * Mon Apr  8 2005 Caolan McNamara <caolanm at redhat.com>
 - rh#165337# crash on >= 1000% xoom