|
|
@@ -1,5 +1,5 @@
|
|
|
Name: diffuse
|
|
|
-Version: 0.4.7
|
|
|
+Version: 0.4.8
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: Graphical tool for comparing and merging text files
|
|
|
Summary(ja): テキストファイルをマージして比較するためのグラフィックツール
|
|
|
@@ -9,7 +9,7 @@ License: GPLv2+
|
|
|
URL: http://%{name}.sourceforge.net/
|
|
|
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
|
|
|
|
|
|
-BuildRequires: desktop-file-utils gettext scrollkeeper
|
|
|
+BuildRequires: desktop-file-utils gettext hicolor-icon-theme rarian-compat
|
|
|
Requires: python >= 2.4 pygtk2 >= 2.10
|
|
|
#Requires(post): scrollkeeper
|
|
|
#Requires(postun): scrollkeeper
|
|
|
@@ -29,8 +29,6 @@ Monotone, Subversion, and SVK repositories for comparison and merging.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-#sed -i 's|Categories=Development;GTK;TextEditor;TextTools;|Categories=Development;GTK;Utility;|g' \
|
|
|
-# src/usr/share/applications/%{name}.desktop
|
|
|
|
|
|
%build
|
|
|
|
|
|
@@ -44,27 +42,32 @@ desktop-file-install --vendor="" \
|
|
|
--delete-original \
|
|
|
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
|
|
|
|
|
|
-#desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
|
|
|
-
|
|
|
%find_lang %{name}
|
|
|
|
|
|
+%check
|
|
|
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
|
|
|
+
|
|
|
%clean
|
|
|
rm -rf %{buildroot}
|
|
|
|
|
|
%post
|
|
|
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
|
|
|
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
|
|
|
update-desktop-database &> /dev/null || :
|
|
|
|
|
|
%postun
|
|
|
-scrollkeeper-update -q || :
|
|
|
+if [ $1 -eq 0 ] ; then
|
|
|
+ touch --no-create %{_datadir}/icons/hicolor &> /dev/null
|
|
|
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
|
|
|
+fi
|
|
|
update-desktop-database &> /dev/null || :
|
|
|
|
|
|
+%posttrans
|
|
|
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
|
|
|
+
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root,root,-)
|
|
|
%dir %{_datadir}/gnome/help/*
|
|
|
-#%dir %{_datadir}/gnome/help/%{name}/ru/*
|
|
|
-#%dir %{_datadir}/gnome/help/%{name}/it/*
|
|
|
%dir %{_datadir}/omf/%{name}
|
|
|
|
|
|
%{_bindir}/%{name}
|
|
|
@@ -72,13 +75,19 @@ update-desktop-database &> /dev/null || :
|
|
|
%{_datadir}/applications/%{name}.desktop
|
|
|
%{_datadir}/gnome/help/%{name}/*
|
|
|
%{_datadir}/omf/%{name}/%{name}*.omf
|
|
|
-%{_datadir}/pixmaps/%{name}.png
|
|
|
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
|
|
|
%config(noreplace) %{_sysconfdir}/diffuserc
|
|
|
%{_mandir}/*
|
|
|
|
|
|
%doc AUTHORS ChangeLog COPYING README
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Aug 29 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.4.8-1
|
|
|
+- new upstream release
|
|
|
+- replaced BuildRequires: scrollkeeper to rarian-compat
|
|
|
+- added BuildRequires: hicolor-icon-theme
|
|
|
+- run gtk-update-icon-cache in %%post, %%postun, %%posttrans
|
|
|
+
|
|
|
* 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
|
kudoh