|
@@ -1,6 +1,6 @@
|
|
Name: diffuse
|
|
Name: diffuse
|
|
-Version: 0.4.6
|
|
+Version: 0.4.7
|
|
-Release: 2%{?_dist_release}
|
|
+Release: 1%{?_dist_release}
|
|
Summary: Graphical tool for comparing and merging text files
|
|
Summary: Graphical tool for comparing and merging text files
|
|
Summary(ja): テキストファイルをマージして比較するためのグラフィックツール
|
|
Summary(ja): テキストファイルをマージして比較するためのグラフィックツール
|
|
|
|
|
|
@@ -11,8 +11,11 @@ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
|
|
|
|
|
|
BuildRequires: desktop-file-utils gettext scrollkeeper
|
|
BuildRequires: desktop-file-utils gettext scrollkeeper
|
|
Requires: python >= 2.4 pygtk2 >= 2.10
|
|
Requires: python >= 2.4 pygtk2 >= 2.10
|
|
-Requires(post): scrollkeeper
|
|
+#Requires(post): scrollkeeper
|
|
-Requires(postun): scrollkeeper
|
|
+#Requires(postun): scrollkeeper
|
|
|
|
+
|
|
|
|
+Requires(post): rarian-compat
|
|
|
|
+Requires(postun): rarian-compat
|
|
|
|
|
|
BuildArch: noarch
|
|
BuildArch: noarch
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
@@ -26,8 +29,8 @@ Monotone, Subversion, and SVK repositories for comparison and merging.
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
-sed -i 's|Categories=Development;GTK;TextEditor;TextTools;|Categories=Development;GTK;Utility;|g' \
|
|
+#sed -i 's|Categories=Development;GTK;TextEditor;TextTools;|Categories=Development;GTK;Utility;|g' \
|
|
- src/usr/share/applications/%{name}.desktop
|
|
+# src/usr/share/applications/%{name}.desktop
|
|
|
|
|
|
%build
|
|
%build
|
|
|
|
|
|
@@ -76,6 +79,11 @@ update-desktop-database &> /dev/null || :
|
|
%doc AUTHORS ChangeLog COPYING README
|
|
%doc AUTHORS ChangeLog COPYING README
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Thu May 23 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.4.7-1
|
|
|
|
+- new upstream release
|
|
|
|
+- changed Requires(post,postun): rarian-compat instead of scrollkeeper
|
|
|
|
+- disabled modifing .desktop
|
|
|
|
+
|
|
* Wed Feb 29 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.4.6-2
|
|
* Wed Feb 29 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.4.6-2
|
|
- rebuilt with python-2.7
|
|
- rebuilt with python-2.7
|
|
- fixed %%files
|
|
- fixed %%files
|