Browse Source

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1243 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 14 years ago
parent
commit
6f8a2ee51d
2 changed files with 21 additions and 7 deletions
  1. 17 6
      g/gnumeric/gnumeric-vl.spec
  2. 4 1
      g/goffice/goffice-vl.spec

+ 17 - 6
g/gnumeric/gnumeric-vl.spec

@@ -1,10 +1,10 @@
 %define gnumeric_version %{version}-bonobo
-%define goffice_version  0.8.2
+%define goffice_version  0.8.6
 
 Summary:     A spreadsheet program for GNOME.
 Summary(ja): GNOME スプレッドシート
 Name: 	     gnumeric
-Version:     1.10.2
+Version:     1.10.6
 Release:     1%{?_dist_release}
 License:     GPLv2
 Group: 	     Applications/Productivity
@@ -78,10 +78,6 @@ MS Excelファイルや他の多くのフォーマット(csv, latex, xbase, appl
 %prep
 %setup -q
 
-# fix desktop file Icon path
-sed -i -e "s/Icon=/Icon=\/usr\/share\/pixmaps\//" \
-    gnumeric.desktop.in
-
 %build
 %ifarch alpha
 	MYARCH_FLAGS="--host=alpha-redhat-linux"
@@ -128,6 +124,11 @@ scrollkeeper-update > /dev/null 2>&1 || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null
 
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -146,6 +147,12 @@ fi
 /sbin/ldconfig
 scrollkeeper-update > /dev/null 2>&1 || :
 
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files -f %{name}.lang
 %defattr (-, root, root)
 %doc AUTHORS BUGS *ChangeLog* COPYING HACKING NEWS README
@@ -182,6 +189,10 @@ scrollkeeper-update > /dev/null 2>&1 || :
 
 
 %changelog
+* Wed Jun 23 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.6-1
+- new upstream release
+- fix %post and %postun
+
 * Thu Apr 29 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.2-1
 - new upstream release
 

+ 4 - 1
g/goffice/goffice-vl.spec

@@ -1,6 +1,6 @@
 Summary: Set of document centric objects and utilities for glib/gtk
 Name: goffice
-Version: 0.8.2
+Version: 0.8.6
 Release: 1%{?_dist_release}
 Source0: http://ftp.gnome.org/pub/GNOME/sources/goffice/0.6/%{name}-%{version}.tar.bz2
 Patch0: goffice-0.6.6-pcre_path.patch
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/goffice-0.8
 
 %changelog
+* Wed Jun 23 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.6-1
+- new upstream release
+
 * Thu Apr 29 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.2-1
 - new upstream release