SPECS: meld.spec - remove more *.py, s|GNOME 2|GNOME|, sorted Rs

[freetz]

Author: freetz                       Date: Sat Oct 29 22:36:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- remove more *.py, s|GNOME 2|GNOME|, sorted Rs

---- Files affected:
SPECS:
   meld.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/meld.spec
diff -u SPECS/meld.spec:1.37 SPECS/meld.spec:1.38
--- SPECS/meld.spec:1.37	Sat Oct 29 21:08:27 2005
+++ SPECS/meld.spec	Sun Oct 30 00:36:37 2005
@@ -14,24 +14,24 @@
 Patch0:		%{name}-desktop.patch
 URL:		http://meld.sf.net/
 BuildRequires:	gettext-devel
-BuildRequires:	python-pyorbit-devel >= 2.0.1
 BuildRequires:	python-gnome-devel >= 2.10.0
 BuildRequires:	python-pygtk-devel >= 2:2.6.1
+BuildRequires:	python-pyorbit-devel >= 2.0.1
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
 %pyrequires_eq	python-libs
-Requires:	python-pygtk-gtk >= 2:2.6.1
 Requires:	python-gnome >= 2.10.0
-Requires:	python-gnome-ui >= 2.10.0
 Requires:	python-gnome-gconf >= 2.10.0
-Requires:	python-pyorbit >= 2.0.1
+Requires:	python-gnome-ui >= 2.10.0
 Requires:	python-pygtk-glade >= 2:2.6.1
+Requires:	python-pygtk-gtk >= 2:2.6.1
+Requires:	python-pyorbit >= 2.0.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Meld is a GNOME 2 visual diff and merge tool. It integrates especially
+Meld is a GNOME visual diff and merge tool. It integrates especially
 well with CVS. The diff viewer lets you edit files in place (diffs
 update dynamically), and a middle column shows detailed changes and
 allows merges. The margins show location of changes for easy
@@ -39,7 +39,7 @@
 open many diffs at once.
 
 %description -l pl
-Meld to przeznaczone dla GNOME 2 wizualne narzędzie do oglądania i
+Meld to przeznaczone dla GNOME wizualne narzędzie do oglądania i
 włączania zmian (w formacie diff). Integruje się szczególnie dobrze z
 CVS. Przeglądarka różnic pozwala modyfikować pliki w miejscu
 (dynamicznie uaktualniać), a środkowa kolumna pokazuje szczegółowe
@@ -65,7 +65,8 @@
 	libdir=%{py_sitedir}
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/application-registry
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/%{name}/*.py
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/{%{name},%{name}/vc}/*.py
+
 
 %find_lang %{name} --with-gnome
 
@@ -87,7 +88,7 @@
 %dir %{py_sitedir}/%{name}
 %{py_sitedir}/%{name}/*.py[co]
 %dir %{py_sitedir}/%{name}/vc
-%{py_sitedir}/%{name}/vc/*.py*
+%{py_sitedir}/%{name}/vc/*.py[co]
 %{_datadir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*
@@ -99,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2005/10/29 22:36:37  freetz
+- remove more *.py, s|GNOME 2|GNOME|, sorted Rs
+
 Revision 1.37  2005/10/29 19:08:27  pawcioos
 - updated to 1.1.1
 - removed patch1 (is included in source)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/meld.spec?r1=1.37&r2=1.38&f=u