|
@@ -1,5 +1,5 @@
|
|
Name: meld
|
|
Name: meld
|
|
-Version: 1.5.3
|
|
|
|
|
|
+Version: 1.5.4
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
Summary: Graphical tool to diff and merge files
|
|
Summary: Graphical tool to diff and merge files
|
|
Summary(ja): ファイルの差分表示とマージのためのグラフィカルなツール
|
|
Summary(ja): ファイルの差分表示とマージのためのグラフィカルなツール
|
|
@@ -8,7 +8,6 @@ Group: Development/Tools
|
|
License: GPLv2+
|
|
License: GPLv2+
|
|
URL: http://meldmerge.org/
|
|
URL: http://meldmerge.org/
|
|
Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.5/meld-%{version}.tar.xz
|
|
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
|
|
#Source1: meld-1.3.1-ja.po
|
|
#Patch0: %{name}-desktop.patch
|
|
#Patch0: %{name}-desktop.patch
|
|
#Patch1: %{name}-scrollkeeper.patch
|
|
#Patch1: %{name}-scrollkeeper.patch
|
|
@@ -45,7 +44,6 @@ Meld は、ユーザが二つのファイル、二つのディレクトリ、ま
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
-%patch0 -p1 -b .orig
|
|
|
|
#%patch0 -p1 -b .desktop
|
|
#%patch0 -p1 -b .desktop
|
|
#%patch1 -p1 -b .scrollkeeper
|
|
#%patch1 -p1 -b .scrollkeeper
|
|
# copy updated japanese translation
|
|
# copy updated japanese translation
|
|
@@ -109,6 +107,10 @@ update-desktop-database &> /dev/null || :
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Thu Apr 26 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.5.4-1
|
|
|
|
+- new upstream release
|
|
|
|
+- dropt patch0 to merge upstream
|
|
|
|
+
|
|
* Wed Feb 01 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.5.3-1
|
|
* Wed Feb 01 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.5.3-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- fixed URL
|
|
- fixed URL
|