|
@@ -1,5 +1,5 @@
|
|
Name: meld
|
|
Name: meld
|
|
-Version: 1.4.0
|
|
+Version: 1.5.0
|
|
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): ファイルの差分表示とマージのためのグラフィカルなツール
|
|
@@ -17,11 +17,13 @@ BuildRequires: desktop-file-utils
|
|
BuildRequires: gettext
|
|
BuildRequires: gettext
|
|
BuildRequires: intltool
|
|
BuildRequires: intltool
|
|
BuildRequires: scrollkeeper
|
|
BuildRequires: scrollkeeper
|
|
-BuildRequires: perl(XML::Parser)
|
|
+BuildRequires: perl-XML-Parser
|
|
|
|
|
|
|
|
+Requires: gnome-python
|
|
Requires: pygtk2 >= 2.14.0
|
|
Requires: pygtk2 >= 2.14.0
|
|
Requires: pygtk2-libglade
|
|
Requires: pygtk2-libglade
|
|
Requires: pygobject >= 2.14.0
|
|
Requires: pygobject >= 2.14.0
|
|
|
|
+Requires: pygtksourceview >= 2.4
|
|
|
|
|
|
Requires(post): scrollkeeper
|
|
Requires(post): scrollkeeper
|
|
Requires(postun): scrollkeeper
|
|
Requires(postun): scrollkeeper
|
|
@@ -57,7 +59,9 @@ Meld は、ユーザが二つのファイル、二つのディレクトリ、ま
|
|
|
|
|
|
desktop-file-install --vendor vine \
|
|
desktop-file-install --vendor vine \
|
|
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
|
|
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
|
|
- --delete-original ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
|
|
+ --delete-original \
|
|
|
|
+ --add-category "GTK;" \
|
|
|
|
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
|
|
|
|
|
|
%find_lang %{name}
|
|
%find_lang %{name}
|
|
|
|
|
|
@@ -93,13 +97,22 @@ update-desktop-database &> /dev/null || :
|
|
%{_datadir}/%{name}/
|
|
%{_datadir}/%{name}/
|
|
%{_datadir}/applications/vine-%{name}.desktop
|
|
%{_datadir}/applications/vine-%{name}.desktop
|
|
#%{_datadir}/application-registry/%{name}*
|
|
#%{_datadir}/application-registry/%{name}*
|
|
-%{_datadir}/pixmaps/%{name}.png
|
|
+#%{_datadir}/pixmaps/%{name}.png
|
|
%{_datadir}/icons/hicolor/*/apps/*
|
|
%{_datadir}/icons/hicolor/*/apps/*
|
|
%{_datadir}/gnome/help/%{name}/
|
|
%{_datadir}/gnome/help/%{name}/
|
|
%{_datadir}/omf/%{name}/
|
|
%{_datadir}/omf/%{name}/
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Thu Jan 27 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.5.0-1
|
|
|
|
+- new upstream release
|
|
|
|
+- changed BuildRequires: perl(XML::Parser) to perl-XML-Parser
|
|
|
|
+- added Requires: gnome-python, pygtksourceview >= 2.4
|
|
|
|
+- modified installing desktop file
|
|
|
|
+ - added --add-category "GTK;"
|
|
|
|
+- fixed %%files
|
|
|
|
+ disabled %%{_datadir}/pixmaps/%{name}.png
|
|
|
|
+
|
|
* Sat Oct 30 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.4.0-1
|
|
* Sat Oct 30 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.4.0-1
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|