rpms/seahorse/F-13 seahorse.spec,1.91,1.92 sources,1.40,1.41

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4460

Modified Files:
	seahorse.spec sources 
Log Message:
2.30.0



Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/F-13/seahorse.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- seahorse.spec	22 Feb 2010 15:24:19 -0000	1.91
+++ seahorse.spec	31 Mar 2010 03:34:57 -0000	1.92
@@ -1,5 +1,5 @@
 Name:		seahorse
-Version:	2.29.91
+Version:	2.30.0
 Release:	1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group:		User Interface/Desktops
@@ -7,8 +7,8 @@ Group:		User Interface/Desktops
 # libcryptui is LGPLv2+
 License:        GPLv2+ and LGPLv2+
 URL:            http://projects.gnome.org/seahorse/
-Source:         http://download.gnome.org/sources/seahorse/2.29/%{name}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#VCS: git:git://git.gnome.org/seahorse
+Source:         http://download.gnome.org/sources/seahorse/2.30/%{name}-%{version}.tar.bz2
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -32,13 +32,11 @@ BuildRequires:  dbus-glib-devel
 BuildRequires:  gobject-introspection-devel >= 0.6.4
 BuildRequires:  gir-repository-devel
 # for g-ir-scanner
-BuildRequires:  libtool 
+BuildRequires:  libtool
 Requires(post): desktop-file-utils
 Requires(post): GConf2
-Requires(post): scrollkeeper
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
-Requires(postun): scrollkeeper
 Requires(postun): shared-mime-info
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=474419
@@ -122,26 +120,22 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 \
      --makefile-install-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-scrollkeeper-update -q ||:
 update-mime-database %{_datadir}/mime/ > /dev/null
 update-desktop-database %{_datadir}/applications > /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
-
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %postun
 /sbin/ldconfig
-scrollkeeper-update -q ||:
 update-mime-database %{_datadir}/mime/ > /dev/null
 update-desktop-database %{_datadir}/applications > /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 || :
+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,-)
@@ -171,6 +165,9 @@ fi
 %{_datadir}/gir-1.0
 
 %changelog
+* Tue Mar 30 2010 Matthias Clasen <mclasen at redhat.com> 2.30.0-1
+- Update to 2.30.0
+
 * Mon Feb 22 2010 Tomas Bzatek <tbzatek at redhat.com> 2.29.91-1
 - Update to 2.29.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/F-13/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	22 Feb 2010 15:24:19 -0000	1.40
+++ sources	31 Mar 2010 03:34:57 -0000	1.41
@@ -1 +1 @@
-4c4718151043b25d9a8bd7b0bf9b13eb  seahorse-2.29.91.tar.bz2
+46f3f1b50138d26ffcd22d331a9dcf7b  seahorse-2.30.0.tar.bz2