summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Henstridge <james@daa.com.au>2001-10-04 05:13:58 +0000
committerJames Henstridge <jamesh@src.gnome.org>2001-10-04 05:13:58 +0000
commitd50ea06700ba532d03a9b73549e925b7c0602af4 (patch)
tree1f630947679d9041dd35c2c950254bfb6d08e9ee
parent0b1206294314bebebf25504f0101435af17c7c7b (diff)
downloadpygtk-d50ea06700ba532d03a9b73549e925b7c0602af4.tar.gz
spec file changes.
2001-10-04 James Henstridge <james@daa.com.au> * pygtk.spec: spec file changes. * gtk/gtk.defs (AccelGroup): this is an object now -- not a boxed.
-rw-r--r--ChangeLog6
-rw-r--r--gtk/gtk.defs56
-rw-r--r--pygtk.spec10
3 files changed, 39 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index 88856ba0..cf55b1b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-04 James Henstridge <james@daa.com.au>
+
+ * pygtk.spec: spec file changes.
+
+ * gtk/gtk.defs (AccelGroup): this is an object now -- not a boxed.
+
2001-10-03 Matt Wilson <msw@redhat.com>
* gobjectmodule.c (pygobject_repr): tweak the repr such that
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index 8a76026f..7d1875fd 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -4,27 +4,13 @@
; object definitions ...
-(define-boxed AccelGroup
+(define-object AccelGroup
(in-module "Gtk")
(parent "GObject")
(c-name "GtkAccelGroup")
(gtype-id "GTK_TYPE_ACCEL_GROUP")
)
-(define-boxed CTreeNode
- (in-module "Gtk")
- (c-name "GtkCTreeNode")
- (gtype-id "GTK_TYPE_CTREE_NODE")
- (fields
- '("GtkCTreeNode*" "parent")
- '("GtkCTreeNode*" "children")
- '("GtkCTreeNode*" "sibling")
- '("guint16" "level")
- '("guint" "is_leaf")
- '("guint" "expanded")
- )
-)
-
(define-object IconFactory
(in-module "Gtk")
(parent "GObject")
@@ -924,20 +910,18 @@
;; Boxed types ...
-(define-boxed TextIter
- (in-module "Gtk")
- (c-name "GtkTextIter")
- (gtype-id "GTK_TYPE_TEXT_ITER")
- (copy-func "gtk_text_iter_copy")
- (release-func "gtk_text_iter_free")
-)
-
-(define-boxed TreeIter
+(define-boxed CTreeNode
(in-module "Gtk")
- (c-name "GtkTreeIter")
- (gtype-id "GTK_TYPE_TREE_ITER")
- (copy-func "gtk_tree_iter_copy")
- (release-func "gtk_tree_iter_free")
+ (c-name "GtkCTreeNode")
+ (gtype-id "GTK_TYPE_CTREE_NODE")
+ (fields
+ '("GtkCTreeNode*" "parent")
+ '("GtkCTreeNode*" "children")
+ '("GtkCTreeNode*" "sibling")
+ '("guint16" "level")
+ '("guint" "is_leaf")
+ '("guint" "expanded")
+ )
)
(define-boxed SelectionData
@@ -955,6 +939,22 @@
)
)
+(define-boxed TextIter
+ (in-module "Gtk")
+ (c-name "GtkTextIter")
+ (gtype-id "GTK_TYPE_TEXT_ITER")
+ (copy-func "gtk_text_iter_copy")
+ (release-func "gtk_text_iter_free")
+)
+
+(define-boxed TreeIter
+ (in-module "Gtk")
+ (c-name "GtkTreeIter")
+ (gtype-id "GTK_TYPE_TREE_ITER")
+ (copy-func "gtk_tree_iter_copy")
+ (release-func "gtk_tree_iter_free")
+)
+
;; Enumerations and flags ...
diff --git a/pygtk.spec b/pygtk.spec
index 49d7d250..5cb1d451 100644
--- a/pygtk.spec
+++ b/pygtk.spec
@@ -10,8 +10,8 @@ Group: Development/Languages
Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.gz
BuildRoot: /var/tmp/pygtk-root
Packager: James Henstridge <james@daa.com.au>
-Requires: gtk+ >= 1.3.7
-Requires: python >= 2.0
+Requires: gtk+ >= 1.3.9
+Requires: python >= 2.2
%description
PyGTK is an extension module for python that gives you access to the GTK+
@@ -69,9 +69,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
%{_prefix}/include/pygtk/*.h
%{_prerix}/lib/pkgconfig/pygtk-2.0.pc
%dir %{_prefix}/share/pygtk
-%dir %{_prefix}/share/pygtk/1.2
-%dir %{_prefix}/share/pygtk/1.2/codegen
-%dir %{_prefix}/share/pygtk/1.2/defs
+%dir %{_prefix}/share/pygtk/2.0
+%dir %{_prefix}/share/pygtk/2.0/codegen
+%dir %{_prefix}/share/pygtk/2.0/defs
%{_prefix}/share/pygtk/2.0/codegen/*
%{_prefix}/share/pygtk/2.0/defs/pango.defs
%{_prefix}/share/pygtk/2.0/defs/gdk.defs