2005-10-27 Laszlo Peter <[email protected]>
authorlaca
Fri, 28 Oct 2005 01:19:44 +0000
changeset 6199 fcbbb25b6fc8
parent 6198 1d4f2f4d0b1c
child 6200 19ff8721b8f2
2005-10-27 Laszlo Peter <[email protected]> * pygtk2.spec: add patch uninstalled.pc.diff * patches/pygtk2-01-uninstalled.pc.diff: add uninstalled pkgconfig files so that pygtk2 can be included in SUNWgnome-python-libs together with gnome-python.
ChangeLog
patches/pygtk2-01-uninstalled.pc.diff
pygtk2.spec
--- a/ChangeLog	Fri Oct 28 01:18:22 2005 +0000
+++ b/ChangeLog	Fri Oct 28 01:19:44 2005 +0000
@@ -1,3 +1,10 @@
+2005-10-27  Laszlo Peter  <[email protected]>
+
+	* pygtk2.spec: add patch uninstalled.pc.diff
+	* patches/pygtk2-01-uninstalled.pc.diff: add uninstalled pkgconfig
+	  files so that pygtk2 can be included in SUNWgnome-python-libs
+	  together with gnome-python.
+
 2005-10-27  Laszlo Peter  <[email protected]>
 
 	* pyxml.spec: new. python xml module from pyxml.sf.net; needed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pygtk2-01-uninstalled.pc.diff	Fri Oct 28 01:19:44 2005 +0000
@@ -0,0 +1,59 @@
+--- pygtk-2.7.4.orig/configure.in	2005-10-27 18:14:45.686875000 -0400
++++ pygtk-2.7.4/configure.in	2005-10-27 18:22:43.478049000 -0400
+@@ -181,7 +181,9 @@
+ AC_CONFIG_FILES(
+   Makefile
+   pygobject-2.0.pc
++  pygobject-2.0-uninstalled.pc
+   pygtk-2.0.pc
++  pygtk-2.0-uninstalled.pc
+   codegen/Makefile
+   gobject/Makefile
+   gtk/Makefile
+--- /dev/null	2005-10-27 18:34:42.000000000 -0400
++++ pygtk-2.7.4/pygtk-2.0-uninstalled.pc.in	2005-10-27 18:26:08.995301000 -0400
+@@ -0,0 +1,21 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++includedir=@includedir@
++datarootdir=@datarootdir@
++datadir=@datadir@
++pyexecdir=@pyexecdir@
++
++# you can use the --variable=pygtkincludedir argument to
++# pkg-config to get this value.  You might want to use this to
++# install additional headers.
++pygtkincludedir=${includedir}/pygtk-2.0
++
++# same here.  Useful when calling the code generator in addon packages.
++defsdir=${pc_top_builddir}/${pcfiledir}
++codegendir=${pc_top_builddir}/${pcfiledir}/codegen
++
++Name: PyGTK
++Description: Python bindings for GTK+ and related libraries
++Requires: pygobject-2.0
++Version: @VERSION@
++Cflags: -I${pc_top_builddir}/${pcfiledir}/. @THREADING_CFLAGS@
+--- /dev/null	2005-10-27 18:34:42.000000000 -0400
++++ pygtk-2.7.4/pygobject-2.0-uninstalled.pc.in	2005-10-27 18:27:31.486513000 -0400
+@@ -0,0 +1,20 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++includedir=@includedir@
++datarootdir=@datarootdir@
++datadir=@datadir@
++
++# you can use the --variable=pygtkincludedir argument to
++# pkg-config to get this value.  You might want to use this to
++# install additional headers.
++pygtkincludedir=${includedir}/pygtk-2.0
++
++# same here.  Useful when calling the code generator in addon packages.
++defsdir=${pc_top_builddir}/${pcfiledir}/.
++codegendir=${pc_top_builddir}/${pcfiledir}/gobject/codegen
++
++Name: PyGObject
++Description: Python bindings for GObject
++Requires: gobject-2.0
++Version: @VERSION@
++Cflags: -I${pc_top_builddir}/${pcfiledir}/gobject
--- a/pygtk2.spec	Fri Oct 28 01:18:22 2005 +0000
+++ b/pygtk2.spec	Fri Oct 28 01:19:44 2005 +0000
@@ -14,6 +14,7 @@
 Vendor:			Sun Microsystems, Inc.
 Summary:		Python bindings for GTK+
 Source:			http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.7/pygtk-%{version}.tar.bz2	
+Patch1:                 pygtk2-01-uninstalled.pc.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
@@ -64,8 +65,10 @@
 
 %prep
 %setup -q -n pygtk-%{version}
+%patch1 -p1
 
 %build
+autoconf
 CFLAGS="$RPM_OPT_FLAGS"				\
 ./configure 	--prefix=%{_prefix}		\
 	    	--sysconfdir=%{_sysconfdir}
@@ -124,6 +127,10 @@
 %{_datadir}/pygtk/2.0/defs/*.defs
 
 %changelog -n pygtk2
+* Thu Oct 27 2005 - [email protected]
+- add patch uninstalled.pc.diff so the pygtk can be included in the same
+  Solaris pkg as gnome-python
+
 * Tue Sep 27 2005 - [email protected]
 - Bump to 2.7.4.