rpms/gegl/devel gegl-0.1.0-cflags.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 gegl.spec, 1.16, 1.17 sources, 1.9, 1.10

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gegl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23252

Modified Files:
	.cvsignore gegl.spec sources 
Added Files:
	gegl-0.1.0-cflags.patch 
Log Message:
fix cflags for building


gegl-0.1.0-cflags.patch:

--- NEW FILE gegl-0.1.0-cflags.patch ---
diff -up gegl-0.1.0/operations/workshop/external/Makefile.am.cflags gegl-0.1.0/operations/workshop/external/Makefile.am
--- gegl-0.1.0/operations/workshop/external/Makefile.am.cflags	2009-06-28 19:18:20.000000000 +0200
+++ gegl-0.1.0/operations/workshop/external/Makefile.am	2009-07-03 13:32:08.551667739 +0200
@@ -7,7 +7,7 @@ ops =
 if HAVE_CAIRO
 line_profile_la_SOURCES = line-profile.c
 line_profile_la_LIBADD = $(op_libs) $(CAIRO_LIBS) $(PANGO_LIBS)
-line_profile_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(BABL_CFLAGS)
+line_profile_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
 ops += line_profile.la
 endif
 
@@ -15,21 +15,21 @@ if HAVE_GTK
 ops += gtk_display.la
 gtk_display_la_SOURCES = gtk-display.c
 gtk_display_la_LIBADD  = $(op_libs) $(GTK_LIBS)
-gtk_display_la_CFLAGS  = $(GTK_CFLAGS) $(BABL_CFLAGS)
+gtk_display_la_CFLAGS  = $(GTK_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
 endif
 
 if HAVE_AVFORMAT
 ops += ff_save.la
 ff_save_la_SOURCES = ff-save.c
 ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS) -lswscale
-ff_save_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS)
+ff_save_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(GLIB_CFLAGS)
 endif
 
 if HAVE_LUA
 ops += gluas.la
 gluas_la_SOURCES = gluas.c
 gluas_la_LIBADD  = $(op_libs) $(LUA_LIBS)
-gluas_la_CFLAGS  = $(LUA_CFLAGS)
+gluas_la_CFLAGS  = $(LUA_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
 endif
 
 opdir = $(libdir)/gegl- at GEGL_API_VERSION@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Jul 2009 12:46:41 -0000	1.9
+++ .cvsignore	3 Jul 2009 13:06:40 -0000	1.10
@@ -1 +1,2 @@
 gegl-0.1.0.tar.bz2
+gegl-0.1.0-autoreconf.patch.bz2


Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/gegl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gegl.spec	2 Jul 2009 14:10:30 -0000	1.16
+++ gegl.spec	3 Jul 2009 13:06:40 -0000	1.17
@@ -7,6 +7,8 @@ License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/
 Source0:	ftp://ftp.gtk.org/pub/gegl/0.1/%{name}-%{version}.tar.bz2
+Patch0:		gegl-0.1.0-cflags.patch
+Patch1:		gegl-0.1.0-autoreconf.patch.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	asciidoc
 BuildRequires:	babl-devel >= 0.1.0
@@ -49,6 +51,8 @@ developing with %{name}.
 %prep
 %setup -q
 chmod -x operations/external/ff-load.c operations/common/perlin/perlin.*
+%patch0 -p1 -b .cflags
+%patch1 -p1 -b .autoreconf
 
 %build
 %configure \
@@ -101,7 +105,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
-* Thu Jul 02 2009 Nils Philippsen - 0.1.0-1
+* Fri Jul 02 2009 Nils Philippsen - 0.1.0-1
+- fix cflags for building
+
+* Thu Jul 02 2009 Nils Philippsen
 - version 0.1.0
 - use "--disable-gtk-doc" to avoid rebuilding documentation (#481404)
 - remove *.la files in %%{_libdir}/gegl-*/ (#509292)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Jul 2009 12:46:42 -0000	1.9
+++ sources	3 Jul 2009 13:06:40 -0000	1.10
@@ -1 +1,2 @@
 5a989ad617801c5dbec3d47c30bd64f0  gegl-0.1.0.tar.bz2
+b571b86849b943955208fb7caf02d079  gegl-0.1.0-autoreconf.patch.bz2