rpms/nbtk/devel nbtk-1.2.3-types.patch,1.1,1.2 nbtk.spec,1.40,1.41

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv303

Modified Files:
	nbtk-1.2.3-types.patch nbtk.spec 
Log Message:
* Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 1.2.3-5
- fix implicit types warnings, caused crash on s390(x), patch from Debian


nbtk-1.2.3-types.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 nbtk        |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

Index: nbtk-1.2.3-types.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk-1.2.3-types.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nbtk-1.2.3-types.patch	12 Jul 2010 15:02:25 -0000	1.1
+++ nbtk-1.2.3-types.patch	12 Jul 2010 15:09:37 -0000	1.2
@@ -1,8 +1,7 @@
-Index: nbtk-1.2.3/docs/reference/libnbtk/Makefile.am
-===================================================================
---- nbtk-1.2.3.orig/docs/reference/libnbtk/Makefile.am	2010-04-17 14:16:07.890565869 +0800
-+++ nbtk-1.2.3/docs/reference/libnbtk/Makefile.am	2010-04-17 14:18:22.194571038 +0800
-@@ -83,7 +83,7 @@
+diff -up nbtk-1.2.3/docs/reference/libnbtk/Makefile.am.types nbtk-1.2.3/docs/reference/libnbtk/Makefile.am
+--- nbtk-1.2.3/docs/reference/libnbtk/Makefile.am.types	2009-11-09 12:50:14.000000000 +0100
++++ nbtk-1.2.3/docs/reference/libnbtk/Makefile.am	2010-07-12 17:02:40.000000000 +0200
+@@ -83,7 +83,7 @@ expand_content_files=
  # signals and properties.
  # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
  # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
@@ -11,10 +10,22 @@ Index: nbtk-1.2.3/docs/reference/libnbtk
  GTKDOC_LIBS=$(NBTK_LIBS) $(top_builddir)/nbtk/libnbtk-$(NBTK_API_VERSION).la $(top_builddir)/nbtk/libnbtk-gtk-$(NBTK_API_VERSION).la
  
  # This includes the standard gtk-doc make rules, copied by gtkdocize.
-Index: nbtk-1.2.3/docs/reference/libnbtk/nbtk.types
-===================================================================
---- nbtk-1.2.3.orig/docs/reference/libnbtk/nbtk.types	2010-04-17 14:16:07.890565869 +0800
-+++ nbtk-1.2.3/docs/reference/libnbtk/nbtk.types	2010-04-17 14:18:22.194571038 +0800
+diff -up nbtk-1.2.3/docs/reference/libnbtk/Makefile.in.types nbtk-1.2.3/docs/reference/libnbtk/Makefile.in
+--- nbtk-1.2.3/docs/reference/libnbtk/Makefile.in.types	2010-07-12 17:03:33.000000000 +0200
++++ nbtk-1.2.3/docs/reference/libnbtk/Makefile.in	2010-07-12 17:03:49.000000000 +0200
+@@ -308,7 +308,7 @@ expand_content_files = 
+ # signals and properties.
+ # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+-GTKDOC_CFLAGS = -I$(NBTK_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -DNBTK_COMPILATION
++GTKDOC_CFLAGS = $(NBTK_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -DNBTK_COMPILATION
+ GTKDOC_LIBS = $(NBTK_LIBS) $(top_builddir)/nbtk/libnbtk-$(NBTK_API_VERSION).la $(top_builddir)/nbtk/libnbtk-gtk-$(NBTK_API_VERSION).la
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -up nbtk-1.2.3/docs/reference/libnbtk/nbtk.types nbtk-1.2.3/docs/reference/libnbtk/nbtk
+diff -up nbtk-1.2.3/docs/reference/libnbtk/nbtk.types.types nbtk-1.2.3/docs/reference/libnbtk/nbtk.types
+--- nbtk-1.2.3/docs/reference/libnbtk/nbtk.types.types	2009-11-27 11:58:44.000000000 +0100
++++ nbtk-1.2.3/docs/reference/libnbtk/nbtk.types	2010-07-12 17:02:40.000000000 +0200
 @@ -1,4 +1,6 @@
  #include <nbtk/nbtk.h>
 +#include <nbtk/nbtk-subtexture.h>


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- nbtk.spec	12 Jul 2010 15:02:25 -0000	1.40
+++ nbtk.spec	12 Jul 2010 15:09:37 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        1.2.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries