packages: meld/meld-glob.patch, meld/meld.spec - updated to 1.3.1 - updated...

[qwiat]

Author: qwiat                        Date: Wed Sep 30 21:22:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.3.1
- updated patch
- adapterized

---- Files affected:
packages/meld:
   meld-glob.patch (1.1 -> 1.2) , meld.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: packages/meld/meld-glob.patch
diff -u packages/meld/meld-glob.patch:1.1 packages/meld/meld-glob.patch:1.2
--- packages/meld/meld-glob.patch:1.1	Thu Jul 24 20:33:56 2008
+++ packages/meld/meld-glob.patch	Wed Sep 30 23:22:49 2009
@@ -1,12 +1,11 @@
-diff -ruN meld-1.2/vc/__init__.py meld-1.2./vc/__init__.py
---- meld-1.2/vc/__init__.py	2005-10-20 00:36:18.000000000 +0200
-+++ meld-1.2./vc/__init__.py	2008-07-24 20:30:34.685677280 +0200
+--- meld-1.3.1/vc/__init__.py	2009-08-14 07:01:33.000000000 +0200
++++ meld-1.3.1/vc/__init__.py.new	2009-09-30 20:18:47.250060327 +0200
 @@ -28,7 +28,7 @@
  def load_plugins():
      _vcdir = os.path.dirname(os.path.abspath(__file__))
      ret = []
--    for plugin in glob.glob("%s/[a-z]*.py" % _vcdir):
-+    for plugin in glob.glob("%s/[a-z]*.pyc" % _vcdir):
-         modname = "vc.%s" % os.path.basename(plugin)[:-3]
+-    for plugin in glob.glob(os.path.join(_vcdir, "[a-z]*.py")):
++    for plugin in glob.glob(os.path.join(_vcdir, "[a-z]*.pyc")):
+         modname = "vc.%s" % os.path.basename(os.path.splitext(plugin)[0])
          ret.append( __import__(modname, globals(), locals(), "*") )
      return ret

================================================================
Index: packages/meld/meld.spec
diff -u packages/meld/meld.spec:1.59 packages/meld/meld.spec:1.60
--- packages/meld/meld.spec:1.59	Sun Nov 23 22:23:37 2008
+++ packages/meld/meld.spec	Wed Sep 30 23:22:49 2009
@@ -5,19 +5,21 @@
 Summary:	Visual diff and merge tool
 Summary(pl.UTF-8):	Wizualne narzędzie do oglądania i włączania zmian (diff)
 Name:		meld
-Version:	1.2.1
+Version:	1.3.1
 Release:	1
 License:	GPL
 Group:		Applications/Text
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/meld/1.2/%{name}-%{version}.tar.bz2
-# Source0-md5:	78f6084b14ee5334cf3578e62383b341
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/meld/1.3/%{name}-%{version}.tar.bz2
+# Source0-md5:	05885811cf0bccc051c3f44938ff54ed
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-GNUmakefile.patch
 Patch2:		%{name}-glob.patch
 URL:		http://meld.sourceforge.net/
 BuildRequires:	gettext-devel
+BuildRequires:	intltool
 BuildRequires:	python-gnome-devel >= 2.15.1
 BuildRequires:	python-pyorbit-devel >= 2.14.0
+BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
@@ -64,7 +66,7 @@
 # Nasty quickfix - some translations are broken for now
 rm -f po/{hu,ja,ru}.po
 %{__make} \
-	prefix=/usr \
+prefix=%{_prefix} \
 	libdir=%{py_sitedir}
 
 %install
@@ -79,7 +81,6 @@
 
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-rm -r $RPM_BUILD_ROOT%{_datadir}/application-registry
 
 %py_postclean
 
@@ -98,7 +99,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS changelog
+%doc AUTHORS
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{py_sitedir}/%{name}
 %{py_sitedir}/%{name}/*.py[co]
@@ -113,6 +114,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2009/09/30 21:22:49  qwiat
+- updated to 1.3.1
+- updated patch
+- adapterized
+
 Revision 1.59  2008/11/23 21:23:37  aredridel
 - 1.2.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/meld/meld-glob.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/meld/meld.spec?r1=1.59&r2=1.60&f=u