Browse Source

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2183 ec354946-7b23-47d6-9f5a-488ba84defc7

kudoh 13 years ago
parent
commit
d2dd19458b
1 changed files with 17 additions and 15 deletions
  1. 17 15
      m/midori/midori-vl.spec

+ 17 - 15
m/midori/midori-vl.spec

@@ -1,7 +1,7 @@
 Summary:	A lightweight GTK+ web browser
 Summary(ja):	軽量な GTK+ ウェブブラウザ
 Name:		midori
-Version:	0.2.8
+Version:	0.2.9
 Release:        1%{?_dist_release}
 
 Group:		Applications/Internet
@@ -9,7 +9,7 @@ License:	LGPLv2.1+
 URL:		http://software.twotoasts.de/?page=midori
 
 Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-0.2.4-docdir.patch
+Patch0:		%{name}-0.2.9-docdir.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
@@ -41,10 +41,7 @@ BuildRequires:	gtksourceview2-devel
 BuildRequires:	intltool
 BuildRequires:  libnotify-devel
 BuildRequires:  libXScrnSaver-devel
-
-#%if %{?_dist_release} == "vl6"
-#BuildRequires:	vala-devel
-#%endif
+BuildRequires:	vala-devel
 
 Requires:	WebKit-gtk
 
@@ -122,17 +119,18 @@ install -Dpm 644 _build_/docs/api/midori/html/* \
 rm -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/
@@ -145,13 +143,17 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-#%if %{?_dist_release} == "vl6"
 %doc %{_datadir}/gtk-doc/
 %{_datadir}/vala/
 %{_includedir}/%{name}-0.2/
-#%endif
 
 %changelog
+* Sun Nov 7 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.2.9-1
+- new upstream release
+- recreated patch0
+- probed %%post and %%postun
+  - added %%posttrans
+
 * Mon Sep 27 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.2.8-1
 - new upstream release