SPECS: python-gnome-desktop.spec - unified

[qboosh]

Author: qboosh                       Date: Tue Jan 31 20:43:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   python-gnome-desktop.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/python-gnome-desktop.spec
diff -u SPECS/python-gnome-desktop.spec:1.4 SPECS/python-gnome-desktop.spec:1.5
--- SPECS/python-gnome-desktop.spec:1.4	Tue Jan 31 19:00:11 2006
+++ SPECS/python-gnome-desktop.spec	Tue Jan 31 21:43:27 2006
@@ -53,12 +53,12 @@
 Summary:	Development files for GNOME bindings for Python
 Summary(pl):	Pliki programistyczne wiązań Pythona do GNOME
 Group:		Libraries/Python
-Obsoletes:	python-gnome-extras-devel < 2.13.3
 Requires:	%{name}-applet = %{version}-%{release}
 Requires:	%{name}-nautilus-cd-burner = %{version}-%{release}
 Requires:	%{name}-print = %{version}-%{release}
 Requires:	%{name}-libwnck = %{version}-%{release}
 Requires:	python-pygtk-devel >= %{pygtk_req}
+Obsoletes:	python-gnome-extras-devel < 2.13.3
 
 %description devel
 Development files for GNOME bindings for Python.
@@ -85,9 +85,9 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	python-gnome-ui >= %{gnome_python_req}
 Requires:	python-pygtk-glade >= %{pygtk_req}
+Provides:	python-gnome-applet
 Obsoletes:	python-gnome-applet
 Obsoletes:	python-gnome-extras-applet
-Provides:	python-gnome-applet
 
 %description applet
 GNOME Applet bindings for Python.
@@ -99,8 +99,8 @@
 Summary:	Gtksourceview bindings for Python
 Summary(pl):	Wiązania Pythona do biblioteki gtksourceview
 Group:		Libraries/Python
-Obsoletes:	python-gnome-extras-gtksourceview
 Requires:	%{name}-print = %{version}-%{release}
+Obsoletes:	python-gnome-extras-gtksourceview
 
 %description gtksourceview
 Gtksourceview bindings for Python.
@@ -112,8 +112,8 @@
 Summary:	Libgtop bindings for Python
 Summary(pl):	Wiązania Pythona do biblioteki libgtop
 Group:		Libraries/Python
-Obsoletes:	python-gnome-extras-libgtop
 Requires:	python-pygtk-gobject >= %{pygtk_req}
+Obsoletes:	python-gnome-extras-libgtop
 
 %description libgtop
 Libgtop bindings for Python.
@@ -125,8 +125,8 @@
 Summary:	Libwnck bindings for Python
 Summary(pl):	Wiązania Pythona do biblioteki libwnck
 Group:		Libraries/Python
-Obsoletes:	python-gnome-extras-libwnck
 Requires:	python-pygtk-gtk >= %{pygtk_req}
+Obsoletes:	python-gnome-extras-libwnck
 
 %description libwnck
 Libwnck bindings for Python.
@@ -138,9 +138,9 @@
 Summary:	gnome-media-profiles bindings for Python
 Summary(pl):	Wiązania Pythona do gnome-media-profiles
 Group:		Libraries/Python
-Obsoletes:	python-gnome-extras-mediaprofiles
 Requires:	python-gnome-ui >= %{gnome_python_req}
 Requires:	python-pygtk-glade >= %{pygtk_req}
+Obsoletes:	python-gnome-extras-mediaprofiles
 
 %description mediaprofiles
 gnome-media-profiles bindings for Python.
@@ -165,8 +165,8 @@
 Summary:	Nautilus-cd-burner bindings for Python
 Summary(pl):	Wiązania Pythona do biblioteki nautilus-cd-burner
 Group:		Libraries/Python
-Obsoletes:	python-gnome-extras-nautilus-cd-burner
 Requires:	python-pygtk-gtk >= %{pygtk_req}
+Obsoletes:	python-gnome-extras-nautilus-cd-burner
 
 %description nautilus-cd-burner
 Nautilus-cd-burner bindings for Python.
@@ -180,11 +180,11 @@
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
 Requires:	python-gnome-canvas >= %{gnome_python_req}
+Provides:	python-gnome-print
+Provides:	python-gnome-print-ui
 Obsoletes:	python-gnome-extras-print
 Obsoletes:	python-gnome-print
 Obsoletes:	python-gnome-print-ui
-Provides:	python-gnome-print
-Provides:	python-gnome-print-ui
 
 %description print
 GNOME Print bindings for Python.
@@ -196,9 +196,9 @@
 Summary:	Totem bindings for Python
 Summary(pl):	Wiązania Pythona do biblioteki totem
 Group:		Libraries/Python
-Obsoletes:	python-gnome-extras-totem
 Requires:	python-gnome-vfs >= %{gnome_python_req}
 Requires:	python-pygtk-gtk >= %{pygtk_req}
+Obsoletes:	python-gnome-extras-totem
 
 %description totem
 Totem bindings for Python.
@@ -220,7 +220,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} install \
@@ -299,6 +298,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/01/31 20:43:27  qboosh
+- unified
+
 Revision 1.4  2006/01/31 18:00:11  patrys
 - proper R: on libgtop
 
@@ -310,4 +312,3 @@
 
 Revision 1.1  2006/01/31 15:55:32  freetz
 - stolen from -extras
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/python-gnome-desktop.spec?r1=1.4&r2=1.5&f=u