update spec files so they should work with any version of python out of the

box.

1 files changed, 40 insertions, 45 deletions

diff --git a/pygtk.spec b/pygtk.spec
index f559e667..14039797 100644
--- a/pygtk.spec
+++ b/pygtk.spec
@@ -1,18 +1,13 @@
-%define py_prefix /usr
-# py_ver should only be 3 characters (1.5.1 == 1.5)
-%define py_ver 1.5
-%define ver 0.6.8
-
 # you may want to remove some of the sub packages depending on what you
 # have installed on your system when building this package.
 
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk
-Version: %ver
+Version: 0.6.8
 Release: 1
 Copyright: GPL
 Group: Development/Languages
-Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{ver}.tar.gz
+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.2.6
@@ -27,7 +22,7 @@ in python with PyGTK (within reason), but with all the benefits of python.
 %package glarea
 Summary: A wrapper for the GtkGLArea widget for use with PyGTK
 Group: Development/Languages
-Requires: pygtk = %{ver}
+Requires: pygtk = %{version}
 
 %description glarea
 This module contains a wrapper for the GtkGLArea widget, which allows you
@@ -37,7 +32,7 @@ Python OpenGL bindings such as PyOpenGL to actually do any OpenGL rendering.
 %package libglade
 Summary: A wrapper for the libglade library for use with PyGTK
 Group: Development/Languages
-Requires: pygtk = %{ver}
+Requires: pygtk = %{version}
 
 %description libglade
 This module contains a wrapper for the libglade library.  Libglade is a
@@ -55,7 +50,7 @@ libraries so that they interoperate with pygtk.
 
 %prep
 %setup
-./configure --prefix=%{py_prefix}
+./configure --prefix=%{_prefix}
 
 %build
 make
@@ -65,50 +60,50 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 %files
-%{py_prefix}/lib/python%{py_ver}/site-packages/gtk.py*
-%{py_prefix}/lib/python%{py_ver}/site-packages/GtkExtra.py*
-%{py_prefix}/lib/python%{py_ver}/site-packages/GTK.py*
-%{py_prefix}/lib/python%{py_ver}/site-packages/GDK.py*
-%{py_prefix}/lib/python%{py_ver}/site-packages/GdkImlib.py*
-%{py_prefix}/lib/python%{py_ver}/site-packages/pyglade/*.py*
+%{_prefix}/lib/python?.?/site-packages/gtk.py*
+%{_prefix}/lib/python?.?/site-packages/GtkExtra.py*
+%{_prefix}/lib/python?.?/site-packages/GTK.py*
+%{_prefix}/lib/python?.?/site-packages/GDK.py*
+%{_prefix}/lib/python?.?/site-packages/GdkImlib.py*
+%{_prefix}/lib/python?.?/site-packages/pyglade/*.py*
 
-%{py_prefix}/lib/python%{py_ver}/site-packages/_gtkmodule.so
-%{py_prefix}/lib/python%{py_ver}/site-packages/_gdkimlibmodule.so
-%{py_prefix}/lib/python%{py_ver}/site-packages/gdkpixbufmodule.so
+%{_prefix}/lib/python?.?/site-packages/_gtkmodule.so
+%{_prefix}/lib/python?.?/site-packages/_gdkimlibmodule.so
+%{_prefix}/lib/python?.?/site-packages/gdkpixbufmodule.so
 
-%{py_prefix}/include/pygtk
+%{_prefix}/include/pygtk
 
 %doc AUTHORS NEWS README MAPPING ChangeLog description.py
 %doc examples
 
 %files glarea
-%{py_prefix}/lib/python%{py_ver}/site-packages/gtkgl.py*
-%{py_prefix}/lib/python%{py_ver}/site-packages/_gtkglmodule.so
+%{_prefix}/lib/python?.?/site-packages/gtkgl.py*
+%{_prefix}/lib/python?.?/site-packages/_gtkglmodule.so
 
 %files libglade
-%{py_prefix}/lib/python%{py_ver}/site-packages/libglade.py*
-%{py_prefix}/lib/python%{py_ver}/site-packages/_libglademodule.so
+%{_prefix}/lib/python?.?/site-packages/libglade.py*
+%{_prefix}/lib/python?.?/site-packages/_libglademodule.so
 
 %files devel
-%{py_prefix}/bin/pygtk-codegen-1.2
-%dir %{py_prefix}/include/pygtk
-%{py_prefix}/include/pygtk/*.h
-%dir %{py_prefix}/share/pygtk
-%dir %{py_prefix}/share/pygtk/1.2
-%dir %{py_prefix}/share/pygtk/1.2/codegen
-%dir %{py_prefix}/share/pygtk/1.2/defs
-%{py_prefix}/share/pygtk/1.2/codegen/*
-%{py_prefix}/share/pygtk/1.2/defs/gtk.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkbase.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkcontainers.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkdata.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkdnd.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkedit.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkenums.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkgl.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtklists.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkmenus.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkmisc.defs
-%{py_prefix}/share/pygtk/1.2/defs/gtkranges.defs
-%{py_prefix}/share/pygtk/1.2/defs/libglade.defs
+%{_prefix}/bin/pygtk-codegen-1.2
+%dir %{_prefix}/include/pygtk
+%{_prefix}/include/pygtk/*.h
+%dir %{_prefix}/share/pygtk
+%dir %{_prefix}/share/pygtk/1.2
+%dir %{_prefix}/share/pygtk/1.2/codegen
+%dir %{_prefix}/share/pygtk/1.2/defs
+%{_prefix}/share/pygtk/1.2/codegen/*
+%{_prefix}/share/pygtk/1.2/defs/gtk.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkbase.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkcontainers.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkdata.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkdnd.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkedit.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkenums.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkgl.defs
+%{_prefix}/share/pygtk/1.2/defs/gtklists.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkmenus.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkmisc.defs
+%{_prefix}/share/pygtk/1.2/defs/gtkranges.defs
+%{_prefix}/share/pygtk/1.2/defs/libglade.defs