diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | gtk/gdk.defs | 8 | ||||
| -rw-r--r-- | pygtk.spec.in | 6 |
4 files changed, 20 insertions, 6 deletions
@@ -1,3 +1,13 @@ +2001-10-18 Matt Wilson <msw@redhat.com> + + * gtk/gdk.defs (pixbuf_new_from_inline): rename from + pixbuf_new_from_stream to match gdk-pixbuf changes in CVS. + + * pygtk.spec.in (%files devel): get header from new location + + * Makefile.am (pkgincludedir): put pygobject.h in + $(includedir)/pygtk-2.0, not $(includedir)/pygtk-2.0/pygtk + 2001-10-16 Matt Wilson <msw@redhat.com> * codegen/h2def.py (define_func): convert all argument type diff --git a/Makefile.am b/Makefile.am index 3f23331a..c42c47e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ $(srcdir)/pango.c: $(srcdir)/pango.defs $(srcdir)/pango-types.defs \ && rm -f gen-pango.c pkginclude_HEADERS = pygobject.h -pkgincludedir = $(includedir)/pygtk-2.0/pygtk +pkgincludedir = $(includedir)/pygtk-2.0 noinst_PYTHON = ltihooks.py diff --git a/gtk/gdk.defs b/gtk/gdk.defs index e1cf8ae1..60527a53 100644 --- a/gtk/gdk.defs +++ b/gtk/gdk.defs @@ -1300,12 +1300,12 @@ ) ) -(define-function pixbuf_new_from_stream - (c-name "gdk_pixbuf_new_from_stream") +(define-function pixbuf_new_from_inline + (c-name "gdk_pixbuf_new_from_inline") (return-type "GdkPixbuf*") (parameters - '("gint" "stream_length") - '("const-guchar*" "stream") + '("gint" "data_length") + '("const-guchar*" "data") '("gboolean" "copy_pixels") '("GError**" "error") ) diff --git a/pygtk.spec.in b/pygtk.spec.in index c3ea5278..0405242e 100644 --- a/pygtk.spec.in +++ b/pygtk.spec.in @@ -3,7 +3,7 @@ Summary: Python bindings for the GTK+ widget set. Name: pygtk2 Version: @VERSION@ -Release: 3 +Release: 4 Copyright: LGPL Group: Development/Languages Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.gz @@ -38,6 +38,9 @@ This package contains files required to build wrappers for GTK+ addon libraries so that they interoperate with pygtk. %changelog +* Thu Oct 18 2001 Matt Wilson <msw@redhat.com> +- fix devel filelist to match new header location + * Mon Oct 15 2001 Matt Wilson <msw@redhat.com> - get the headers from their new version-specific location @@ -84,6 +87,7 @@ make DESTDIR=$RPM_BUILD_ROOT install %{_prefix}/bin/pygtk-codegen-2.0 %defattr(644, root, root, 755) %dir %{_prefix}/include/pygtk-2.0 +%{_prefix}/include/pygtk-2.0/*.h %dir %{_prefix}/include/pygtk-2.0/pygtk %{_prefix}/include/pygtk-2.0/pygtk/*.h %{_prefix}/lib/pkgconfig/pygtk-2.0.pc |