rpms/tomboy/F-13 sources,1.52,1.53 tomboy.spec,1.128,1.129

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	sources tomboy.spec 
Log Message:
1.2.0



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/F-13/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	10 Mar 2010 05:32:29 -0000	1.52
+++ sources	29 Mar 2010 23:59:25 -0000	1.53
@@ -1 +1 @@
-d0efcdbcd4cb33e88d66f2c32e180291  tomboy-1.1.4.tar.bz2
+21632ddf2f9c4fa9fde175e598005322  tomboy-1.2.0.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/F-13/tomboy.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- tomboy.spec	10 Mar 2010 05:28:54 -0000	1.128
+++ tomboy.spec	29 Mar 2010 23:59:25 -0000	1.129
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        1.1.4
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Note-taking application
 
@@ -10,7 +10,7 @@ License:        LGPLv2+ and GPLv2+ and M
 # Mono.Addins is MIT
 URL:            http://projects.gnome.org/tomboy/
 #VCS: git:git://git.gnome.org/tomboy
-Source0:        http://download.gnome.org/sources/tomboy/1.1/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/tomboy/1.2/%{name}-%{version}.tar.bz2
 Patch1:         tomboy-wrapper.patch
 
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -30,6 +30,8 @@ BuildRequires:	mono-addins-devel
 BuildRequires:  automake, autoconf, libtool, intltool
 
 Requires:	gtkspell
+Requires(post): shared-mime-info
+Requires(postun): shared-mime-info
 
 ExcludeArch:    sparc64
 
@@ -91,17 +93,22 @@ done
 
 %find_lang %name --with-gnome
 
+cd $RPM_BUILD_ROOT%{_datadir}/mime
+for i in *; do
+  if [ ! "$i" = "packages" ]; then
+    rm -rf ./$i
+  fi
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+update-mime-database >&/dev/null || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/tomboy.schemas > /dev/null
-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 || :
 
 
 %preun
@@ -113,11 +120,14 @@ fi
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+update-mime-database >&/dev/null || :
+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,-)
@@ -131,12 +141,17 @@ fi
 %{_mandir}/man1/%{name}.1.gz
 %{_datadir}/tomboy
 %{_datadir}/icons/hicolor/*/apps/tomboy.*
+%{_datadir}/icons/hicolor/*/mimetypes/*
+%{_datadir}/mime/packages/tomboy.xml
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %files devel
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> - 1.2.0-1
+- Update to 1.2.0
+
 * Tue Mar  9 2010 Matthias Clasen <mclasen at redhat.com> - 1.1.4-1
 - Update to 1.0.4