rpms/skencil/devel skencil-python2.4.patch, NONE, 1.1 skencil.spec, 1.6, 1.7

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/rpms/skencil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25249

Modified Files:
	skencil.spec 
Added Files:
	skencil-python2.4.patch 
Log Message:
* Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 0.6.16-6
- add patch from upstream bug 10345 to fix build with python2.4 (#158408)


skencil-python2.4.patch:

--- NEW FILE skencil-python2.4.patch ---
*** ../skencil-0.6.16/Pax/paxtkinter.c	Sat May  3 20:55:36 2003
--- Pax/paxtkinter.c	Sat Aug  7 21:52:22 2004
***************
*** 1866,1871 ****
--- 1866,1874 ----
  	char *className = NULL;
  	int interactive = 0;
  
+ 	int ignored_int = 0;
+ 	char *ignored_charp = NULL;
+ 
  	baseName = strrchr(Py_GetProgramName(), '/');
  	if (baseName != NULL)
  		baseName++;
***************
*** 1873,1881 ****
  		baseName = Py_GetProgramName();
  	className = "Tk";
    
! 	if (!PyArg_ParseTuple(args, "|zssi",
  			      &screenName, &baseName, &className,
! 			      &interactive))
  		return NULL;
  
  	return (PyObject *) Tkapp_New(screenName, baseName, className, 
--- 1876,1885 ----
  		baseName = Py_GetProgramName();
  	className = "Tk";
    
! 	if (!PyArg_ParseTuple(args, "|zssiiiiz:create",
  			      &screenName, &baseName, &className,
! 			      &interactive, &ignored_int, &ignored_int,
! 			      &ignored_int, &ignored_charp))
  		return NULL;
  
  	return (PyObject *) Tkapp_New(screenName, baseName, className, 


Index: skencil.spec
===================================================================
RCS file: /cvs/extras/rpms/skencil/devel/skencil.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- skencil.spec	25 May 2005 21:49:18 -0000	1.6
+++ skencil.spec	26 May 2005 19:08:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           skencil
 Version:        0.6.16
-Release: 5
+Release: 6
 
 Summary:        Vector drawing program
 
@@ -9,6 +9,7 @@
 URL:            http://www.skencil.org
 Source0:        http://dl.sf.net/sketch/skencil-0.6.16.tar.gz
 Source1:        skencil-logo.png
+Patch0: skencil-python2.4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, python-imaging-devel, PyXML
@@ -30,7 +31,7 @@
 %setup -q
 grep -rl lib/ . | xargs perl -pi -e's,lib/,%{_lib}/,g'
 grep -rl lib\' . | xargs perl -pi -es,lib\',%{_lib}\',g
-
+%patch0 -p0 -b .python24
 
 %build
 find \( -name \*.sk -or -name \*.ppm -or -name \*.jpg \) -exec chmod 644 \{\} \;
@@ -103,6 +104,9 @@
 
 
 %changelog
+* Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 0.6.16-6
+- add patch from upstream bug 10345 to fix build with python2.4 (#158408)
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 0.6.16-5
 - buildrequire desktop-file-utils (ignacio, #156245)