rpms/conduit/F-7 pygoocanvas-api-0.9.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 conduit.spec, 1.2, 1.3 sources, 1.2, 1.3

[Bernard Johnson (bjohnson)]

Author: bjohnson

Update of /cvs/pkgs/rpms/conduit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24681/F-7

Modified Files:
	.cvsignore conduit.spec sources 
Added Files:
	pygoocanvas-api-0.9.patch 
Log Message:
- 0.3.3
- patch for pygoocanvas API = 0.9
- update license tag to GPLv2+


pygoocanvas-api-0.9.patch:

--- NEW FILE pygoocanvas-api-0.9.patch ---
Index: conduit/Canvas.py
===================================================================
--- conduit/Canvas.py	(revision 794)
+++ conduit/Canvas.py	(working copy)
@@ -70,7 +70,7 @@
         """
         #setup the canvas
         goocanvas.Canvas.__init__(self)
-        self.set_size_request(Canvas.INITIAL_WIDTH, Canvas.INITIAL_HEIGHT)
+        self.set_size_request(Canvas.CANVAS_WIDTH, Canvas.CANVAS_HEIGHT)
         self.set_bounds(0, 0, Canvas.CANVAS_WIDTH, Canvas.CANVAS_HEIGHT)
         self.root = self.get_root_item()
 
@@ -147,8 +147,14 @@
         return items
 
     def _canvas_resized(self, widget, allocation):
+
+        w = max(allocation.width,Canvas.CANVAS_WIDTH)
+        h = max(allocation.height,Canvas.CANVAS_HEIGHT)
+
+        self.set_bounds(0,0,w,h)
+
         for i in self._get_child_conduit_items():
-            i.set_width(allocation.width)
+            i.set_width(w)
 
     def _on_conduit_button_press(self, view, target, event):
         """
@@ -486,33 +492,27 @@
         self.model = model
 
     def get_height(self):
-        b = goocanvas.Bounds()
-        self.get_bounds(b)
+        b = self.get_bounds()
         return b.y2-b.y1
 
     def get_width(self):
-        b = goocanvas.Bounds()
-        self.get_bounds(b)
+        b = self.get_bounds()
         return b.x2-b.x1
 
     def get_top(self):
-        b = goocanvas.Bounds()
-        self.get_bounds(b)
+        b = self.get_bounds()
         return b.y1
 
     def get_bottom(self):
-        b = goocanvas.Bounds()
-        self.get_bounds(b)
+        b = self.get_bounds()
         return b.y2
 
     def get_left(self):
-        b = goocanvas.Bounds()
-        self.get_bounds(b)
+        b = self.get_bounds()
         return b.x1
 
     def get_right(self):
-        b = goocanvas.Bounds()
-        self.get_bounds(b)
+        b = self.get_bounds()
         return b.x2
 
 class DataProviderCanvasItem(_CanvasItem):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jun 2007 03:10:17 -0000	1.2
+++ .cvsignore	20 Aug 2007 04:38:13 -0000	1.3
@@ -1 +1 @@
-conduit-0.3.1.tar.gz
+conduit-0.3.3.tar.gz


Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-7/conduit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- conduit.spec	12 Jul 2007 08:44:08 -0000	1.2
+++ conduit.spec	20 Aug 2007 04:38:13 -0000	1.3
@@ -1,14 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           conduit
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.3.3
+Release:        1%{?dist}
 Summary:        A synchronization solution for GNOME
 
 Group:          Applications/Productivity
-License:        GPL
+License:        GPLv2+
 URL:            http://www.conduit-project.org/
 Source0:        http://files.conduit-project.org/releases/%{name}-%{version}.tar.gz 
+Patch0:         pygoocanvas-api-0.9.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q -n conduit-%{version}
+%patch0 -p0 -b .pygoocanvas-api-0.9
 
 # fix eol encoding in a couple of files
 sed -i 's/\r//' NEWS TODO
@@ -91,8 +93,12 @@
 
 
 %changelog
-* Thu Jul 12 2007 Bernard Johnson <bjohnson at symetrix.com> -
+* Sun Aug 19 2007 Bernard Johnson <bjohnson at symetrix.com> - 0.3.3-1
 - conduit requires Tomboy >= 0.5.10 for the dbus interface
+- 0.3.3
+- patch for pygoocanvas API = 0.9
+- update license tag to GPLv2+
+
 
 * Mon Jun 11 2007 Bernard Johnson <bjohnson at symetrix.com> - 0.3.1-2
 - remove Application from desktop file category


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jun 2007 03:10:17 -0000	1.2
+++ sources	20 Aug 2007 04:38:13 -0000	1.3
@@ -1 +1 @@
-157c5bae586ef4b79a615a9b38caa8bd  conduit-0.3.1.tar.gz
+03737db54a5682c972a601b5c15e504a  conduit-0.3.3.tar.gz