- some more deps, one less; removed *.la

Changed files:
    python-gnome.spec -> 1.21

diff --git a/python-gnome.spec b/python-gnome.spec
index 4219dd6756a44122b2a571e33affb56faaee32f2..9db4778c93c0b0392e845103f2cd447c28b94f41 100644 (file)
--- a/python-gnome.spec
+++ b/python-gnome.spec
@@ -2,7 +2,8 @@
 %include       /usr/lib/rpm/macros.python
 
 %define                module  gnome-python
-
+%define                pygtk_req       1:1.99.16
+%define                pyorbit_req     1.99.4
 Summary:       Gnome bindings for Python
 Summary(pl):   Wi±zania Pythona do bibliotek Gnome
 Name:          python-gnome
@@ -17,13 +18,13 @@ BuildRequires:      gnome-vfs2-devel >= 2.0.4
 BuildRequires: libgnomeprintui-devel >= 2.2.1.1
 BuildRequires: libgtkhtml-devel >= 2.0.2
 BuildRequires: nautilus-devel >= 2.0.7
-BuildRequires: python-devel >= 2.2.1
-BuildRequires: python-pyorbit-devel >= 1.99.4
-BuildRequires: python-pygtk-devel >= 1.99.16
 BuildRequires: pkgconfig
+BuildRequires: python-devel >= 2.2.1
+BuildRequires: python-pyorbit-devel >= %{pyorbit_req}
+BuildRequires: python-pygtk-devel >= %{pygtk_req}
 BuildRequires: rpm-pythonprov
 %pyrequires_eq python-modules
-Requires:              python-pygtk-gobject
+Requires:      python-pygtk-gobject >= pygtk_req
 Obsoletes:     %{module}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,7 +40,8 @@ Wi
 Summary:       Bonobo bindings for Python
 Summary(pl):   Wi±zania Pythona do biblioteki Bonobo
 Group:         Libraries/Python
-Requires:      python-pygtk-gobject
+Requires:      python-pygtk-gobject >= %{pygtk_req}
+Requires:      python-pyorbit >= %{pyorbit_req}
 
 %description bonobo
 Bonobo bindings for Python.
@@ -64,8 +66,8 @@ Wi
 Summary:       Gnome Applet bindings for Python
 Summary(pl):   Wi±zania Pythona do biblioteki Gnome Applet
 Group:         Libraries/Python
-Requires:      python-pygtk-gtk
 Requires:      %{name} = %{version}
+Requires:      python-pygtk-gtk >= %{pygtk_req}
 
 %description applet
 Gnome Applet bindings for Python.
@@ -78,6 +80,7 @@ Summary:      Gnome Canvas bindings for Python
 Summary(pl):   Wi±zania Pythona do biblioteki Gnome Canvas
 Group:         Libraries/Python
 Requires:      %{name} = %{version}
+Requires:      python-pygtk-gtk >= %{pygtk_req}
 
 %description canvas
 Gnome Canvas bindings for Python.
@@ -89,7 +92,7 @@ Wi
 Summary:       GConf bindings for Python
 Summary(pl):   Wi±zania Pythona do biblioteki GConf
 Group:         Libraries/Python
-Requires:      python-pygtk-gobject
+Requires:      python-pygtk-gobject >= %{pygtk_req}
 
 %description gconf
 GConf bindings for Python.
@@ -101,7 +104,7 @@ Wi
 Summary:       GtkHtml bindings for Python
 Summary(pl):   Wi±zania Pythona do biblioteki GtkHtml
 Group:         Libraries/Python
-Requires:      python-pygtk-gobject
+Requires:      python-pygtk-gtk >= %{pygtk_req}
 
 %description gtkhtml
 GtkHtml bindings for Python.
@@ -126,6 +129,7 @@ Summary:    Gnome Print bindings for Python
 Summary(pl):   Wi±zania Pythona do biblioteki Gnome obs³ugi drukowania
 Group:         Libraries/Python
 Requires:      %{name} = %{version}
+Requires:      python-pygtk-pango >= %{pygtk_req}
 
 %description print
 Gnome Print bindings for Python.
@@ -137,7 +141,8 @@ Wi
 Summary:       Gnome Print User Interface bindings for Python
 Summary(pl):   Wi±zania Pythona do biblioteki interfejsu u¿ytkownika Gnome obs³ugi drukowania
 Group:         Libraries/Python
-Requires:      %{name}-ui = %{version}
+Requires:      %{name}-canvas = %{version}
+Requires:      %{name}-print = %{version}
 
 %description print-ui
 Gnome Print User Interface bindings for Python.
@@ -174,7 +179,7 @@ Wi
 Summary:       Development files for Gnome bindings for Python
 Summary(pl):   Pliki programistyczne wi±zañ Pythona do Gnome
 Group:         Libraries/Python
-Requires:      python-pygtk-devel >= 1.99.13
+Requires:      python-pygtk-devel >= %{pygtk_req}
 Requires:      %{name}-bonobo = %{version}
 Requires:      %{name}-bonobo-ui = %{version}
 Requires:      %{name}-applet = %{version}
@@ -203,7 +208,10 @@ Pliki programistyczne wi
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/gtk-2.0/{*.la,*/*.la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -217,68 +225,55 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/gtk-2.0/gnome
 %{py_sitedir}/gtk-2.0/gnome/__init__.py?
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnome/_gnome*.so
-%{py_sitedir}/gtk-2.0/gnome/_gnome*.la
 
 %files bonobo
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/gtk-2.0/bonobo
 %{py_sitedir}/gtk-2.0/bonobo/__init__.py?
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/bonobo/_bonobo*.so
-%{py_sitedir}/gtk-2.0/bonobo/_bonobo*.la
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/bonobo/activation*.so
-%{py_sitedir}/gtk-2.0/bonobo/activation*.la
 
 %files bonobo-ui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/bonobo/ui*.so
-%{py_sitedir}/gtk-2.0/bonobo/ui*.la
 
 %files applet
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnome/applet*.so
-%{py_sitedir}/gtk-2.0/gnome/applet*.la
 
 %files canvas
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnome/canvas*.so
-%{py_sitedir}/gtk-2.0/gnome/canvas*.la
 
 %files gconf
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gconf*.so
-%{py_sitedir}/gtk-2.0/gconf*.la
 
 %files gtkhtml
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gtkhtml*.so
-%{py_sitedir}/gtk-2.0/gtkhtml*.la
 
 %files nautilus
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnome/nautilus*.so
-%{py_sitedir}/gtk-2.0/gnome/nautilus*.la
 
 %files print
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/gtk-2.0/gnomeprint
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnomeprint/_printmod*.so
-%{py_sitedir}/gtk-2.0/gnomeprint/_printmod*.la
 %{py_sitedir}/gtk-2.0/gnomeprint/*.py[co]
 
 %files print-ui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnomeprint/uimodule.so
-%{py_sitedir}/gtk-2.0/gnomeprint/uimodule.la
 
 %files ui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnome/ui*.so
-%{py_sitedir}/gtk-2.0/gnome/ui*.la
 
 %files vfs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnome/vfs*.so
-%{py_sitedir}/gtk-2.0/gnome/vfs*.la
 
 %files devel
 %defattr(644,root,root,755)