|
|
@@ -1,13 +1,14 @@
|
|
|
Name: meld
|
|
|
-Version: 1.5.2
|
|
|
+Version: 1.5.3
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: Graphical tool to diff and merge files
|
|
|
Summary(ja): ファイルの差分表示とマージのためのグラフィカルなツール
|
|
|
|
|
|
Group: Development/Tools
|
|
|
License: GPLv2+
|
|
|
-URL: http://meld.sourceforge.net/
|
|
|
+URL: http://meldmerge.org/
|
|
|
Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.5/meld-%{version}.tar.xz
|
|
|
+Patch0: meld_ja_po.patch
|
|
|
#Source1: meld-1.3.1-ja.po
|
|
|
#Patch0: %{name}-desktop.patch
|
|
|
#Patch1: %{name}-scrollkeeper.patch
|
|
|
@@ -23,7 +24,7 @@ Requires: gnome-python
|
|
|
Requires: pygtk2 >= 2.14.0
|
|
|
Requires: pygtk2-libglade
|
|
|
Requires: pygobject >= 2.14.0
|
|
|
-Requires: pygtksourceview >= 2.4
|
|
|
+Requires: pygtksourceview >= 2.10
|
|
|
|
|
|
Requires(post): scrollkeeper
|
|
|
Requires(postun): scrollkeeper
|
|
|
@@ -44,6 +45,7 @@ Meld は、ユーザが二つのファイル、二つのディレクトリ、ま
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
+%patch0 -p1 -b .orig
|
|
|
#%patch0 -p1 -b .desktop
|
|
|
#%patch1 -p1 -b .scrollkeeper
|
|
|
# copy updated japanese translation
|
|
|
@@ -95,7 +97,7 @@ update-desktop-database &> /dev/null || :
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root,root,-)
|
|
|
-%doc AUTHORS COPYING
|
|
|
+%doc COPYING NEWS
|
|
|
%{_bindir}/%{name}
|
|
|
%{_datadir}/%{name}/
|
|
|
%{_datadir}/applications/vine-%{name}.desktop
|
|
|
@@ -107,6 +109,13 @@ update-desktop-database &> /dev/null || :
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Feb 01 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.5.3-1
|
|
|
+- new upstream release
|
|
|
+- fixed URL
|
|
|
+- added patch0 to fix Japanese translation a little
|
|
|
+- changed Requires: pygtksourceview >= 2.4 to 2.10
|
|
|
+- added NEWS in %%doc of %%files
|
|
|
+
|
|
|
* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.5.2-1
|
|
|
- new upstream release
|
|
|
|
kudoh