rpms/dia/devel dia-0.94-gnomeflags.patch,NONE,1.1 dia.spec,1.5,1.6

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	dia.spec 
Added Files:
	dia-0.94-gnomeflags.patch 
Log Message:
make buildable

dia-0.94-gnomeflags.patch:

--- 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/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dia.spec	3 Jan 2006 11:24:14 -0000	1.5
+++ dia.spec	3 Jan 2006 14:17:55 -0000	1.6
@@ -5,7 +5,7 @@
 Name: 		dia
 Summary:	A diagram drawing program.
 Version:	0.94
-Release:	18
+Release:	19
 Epoch:		1
 Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Group:		Applications/Multimedia
@@ -33,6 +33,7 @@
 Patch3: dia-0.94-gcc4.patch
 Patch4: dia-0.94-fallbacktoxpmicons.patch
 Patch5: dia-0.94-rh165337.patch
+Patch6: dia-0.94-gnomeflags.patch
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -51,6 +52,7 @@
 %patch3 -p1 -b .gcc4
 %patch4 -p1 -b .fallbacktoxpmicons
 %patch5 -p1 -b .rh165337
+%patch6 -p1 -b .gnomeflags
 
 %build
 rm doc/*/dia.1
@@ -60,6 +62,8 @@
 autoconf
 %configure --enable-gnome --enable-db2html --with-cairo=no
 
+export GNOME_CFLAGS=`pkg-config --cflags libgnomeui-2.0 libgnome-2.0`
+export GNOME_LIBS=`pkg-config --libs libgnomeui-2.0 libgnome-2.0`
 CFLAGS=$RPM_OPT_FLAGS make
  
 %install
@@ -113,6 +117,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-19
+- make buildable
+
 * Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-18
 - rh#176504# add BuildRequires