|
|
@@ -1,6 +1,6 @@
|
|
|
Name: meld
|
|
|
-Version: 1.3.1
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 1.3.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Summary: Graphical tool to diff and merge files
|
|
|
Summary(ja): ファイルの差分表示とマージのためのグラフィカルなツール
|
|
|
|
|
|
@@ -8,9 +8,9 @@ Group: Development/Tools
|
|
|
License: GPLv2+
|
|
|
URL: http://meld.sourceforge.net/
|
|
|
Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.2/meld-%{version}.tar.bz2
|
|
|
-Source1: meld-1.3.1-ja.po
|
|
|
-Patch0: %{name}-desktop.patch
|
|
|
-Patch1: %{name}-scrollkeeper.patch
|
|
|
+#Source1: meld-1.3.1-ja.po
|
|
|
+#Patch0: %{name}-desktop.patch
|
|
|
+#Patch1: %{name}-scrollkeeper.patch
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
|
|
|
BuildRequires: desktop-file-utils
|
|
|
@@ -35,23 +35,23 @@ with a common ancestor.
|
|
|
|
|
|
%description -l ja
|
|
|
Meld は、ユーザが二つのファイル、二つのディレクトリ、または共通の祖先を
|
|
|
-持つ二つのファイルの差分表示およびマージを行うことことができます。
|
|
|
+持つ二つのファイルの差分表示およびマージを行えます。
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch0 -p1 -b .desktop
|
|
|
-%patch1 -p1 -b .scrollkeeper
|
|
|
+#%patch0 -p1 -b .desktop
|
|
|
+#%patch1 -p1 -b .scrollkeeper
|
|
|
# copy updated japanese translation
|
|
|
-%{__cp} %{SOURCE1} po/ja.po
|
|
|
+#%{__cp} %{SOURCE1} po/ja.po
|
|
|
|
|
|
%build
|
|
|
-make prefix=%{_prefix} libdir=%{_datadir}
|
|
|
+%__make prefix=%{_prefix} libdir=%{_datadir}
|
|
|
|
|
|
|
|
|
%install
|
|
|
-rm -rf ${RPM_BUILD_ROOT}
|
|
|
+%__rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
-make prefix=%{_prefix} libdir=%{_datadir} \
|
|
|
+%__make prefix=%{_prefix} libdir=%{_datadir} \
|
|
|
DESTDIR=${RPM_BUILD_ROOT} install
|
|
|
|
|
|
|
|
|
@@ -65,13 +65,25 @@ desktop-file-install --vendor vine \
|
|
|
%post
|
|
|
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
|
|
|
|
|
|
+touch --no-create %{_datadir}/icons/hicolor
|
|
|
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
|
|
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
|
|
|
+fi
|
|
|
+update-desktop-database &> /dev/null || :
|
|
|
+
|
|
|
|
|
|
%postun
|
|
|
scrollkeeper-update -q || :
|
|
|
|
|
|
+touch --no-create %{_datadir}/icons/hicolor
|
|
|
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
|
|
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
|
|
|
+fi
|
|
|
+update-desktop-database &> /dev/null || :
|
|
|
+
|
|
|
|
|
|
%clean
|
|
|
-rm -rf ${RPM_BUILD_ROOT}
|
|
|
+%__rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
@@ -82,11 +94,15 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
|
%{_datadir}/applications/vine-%{name}.desktop
|
|
|
#%{_datadir}/application-registry/%{name}*
|
|
|
%{_datadir}/pixmaps/%{name}.png
|
|
|
+%{_datadir}/icons/hicolor/*/apps/*
|
|
|
%{_datadir}/gnome/help/%{name}/
|
|
|
%{_datadir}/omf/%{name}/
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jul 04 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.3.2-1
|
|
|
+- new upstream release
|
|
|
+
|
|
|
* Wed Sep 23 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 1.3.1-2
|
|
|
- add Source1: updated japanese translations
|
|
|
|
munepi