|
@@ -1,5 +1,5 @@
|
|
|
Name: meld
|
|
|
-Version: 1.7.0
|
|
|
+Version: 1.7.2
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: Graphical tool to diff and merge files
|
|
|
Summary(ja): ファイルの差分表示とマージのためのグラフィカルなツール
|
|
@@ -8,7 +8,7 @@ Group: Development/Tools
|
|
|
License: GPLv2+
|
|
|
URL: http://meldmerge.org/
|
|
|
Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.7/meld-%{version}.tar.xz
|
|
|
-#Source1: meld-1.3.1-ja.po
|
|
|
+Source1: meld-1.7.2-ja.po
|
|
|
#Patch0: %{name}-desktop.patch
|
|
|
#Patch1: %{name}-scrollkeeper.patch
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
@@ -27,6 +27,8 @@ Requires: pygtksourceview >= 2.10
|
|
|
|
|
|
Requires(post): scrollkeeper
|
|
|
Requires(postun): scrollkeeper
|
|
|
+Requires(post): shared-mime-info
|
|
|
+Requires(postun): shared-mime-info
|
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
@@ -47,7 +49,8 @@ Meld は、ユーザが二つのファイル、二つのディレクトリ、ま
|
|
|
#%patch0 -p1 -b .desktop
|
|
|
#%patch1 -p1 -b .scrollkeeper
|
|
|
# copy updated japanese translation
|
|
|
-#%{__cp} %{SOURCE1} po/ja.po
|
|
|
+%{__cp} %{SOURCE1} po/ja.po
|
|
|
+sed -i 's/\(x-meld-comparison\)/\1;/' data/meld.desktop.in
|
|
|
|
|
|
%build
|
|
|
%__make prefix=%{_prefix} libdir=%{_datadir}
|
|
@@ -59,6 +62,8 @@ Meld は、ユーザが二つのファイル、二つのディレクトリ、ま
|
|
|
%__make prefix=%{_prefix} libdir=%{_datadir} \
|
|
|
DESTDIR=${RPM_BUILD_ROOT} install
|
|
|
|
|
|
+#add-hoc fixed
|
|
|
+%{__install} data/icons/meld-vc-icon.svg ${RPM_BUILD_ROOT}%{_datadir}/icons/meld-vc-icon.svg
|
|
|
|
|
|
desktop-file-install --vendor vine \
|
|
|
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
|
|
@@ -77,6 +82,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
|
|
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
|
|
|
fi
|
|
|
update-desktop-database &> /dev/null || :
|
|
|
+update-mime-database %{_datadir}/mime &> /dev/null || :
|
|
|
|
|
|
|
|
|
%postun
|
|
@@ -87,6 +93,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
|
|
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
|
|
|
fi
|
|
|
update-desktop-database &> /dev/null || :
|
|
|
+update-mime-database %{_datadir}/mime &> /dev/null || :
|
|
|
|
|
|
|
|
|
%clean
|
|
@@ -101,12 +108,22 @@ update-desktop-database &> /dev/null || :
|
|
|
%{_datadir}/applications/vine-%{name}.desktop
|
|
|
#%{_datadir}/application-registry/%{name}*
|
|
|
#%{_datadir}/pixmaps/%{name}.png
|
|
|
+%{_datadir}/icons/meld-vc-icon.svg
|
|
|
+%{_datadir}/icons/HighContrast/scalable/apps/meld.svg
|
|
|
%{_datadir}/icons/hicolor/*/apps/*
|
|
|
%{_datadir}/gnome/help/%{name}/
|
|
|
+%{_datadir}/mime/packages/%{name}.xml
|
|
|
%{_datadir}/omf/%{name}/
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Apr 29 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.7.2-1
|
|
|
+- new upstream release
|
|
|
+- added Source1: updated japanese translations
|
|
|
+- added Requires(post)/(postun): shared-mime-info
|
|
|
+- run update-mime-database in %%post, %%postun
|
|
|
+- fixed desktop file a little
|
|
|
+
|
|
|
* Fri Nov 23 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.7.0-1
|
|
|
- new upstream release
|
|
|
|