rpms/tomboy/devel .cvsignore, 1.53, 1.54 sources, 1.53, 1.54 tomboy.spec, 1.136, 1.137

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32285

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	29 Mar 2010 21:19:46 -0000	1.53
+++ .cvsignore	27 Apr 2010 13:39:30 -0000	1.54
@@ -1 +1 @@
-tomboy-1.2.0.tar.bz2
+tomboy-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	29 Mar 2010 21:19:46 -0000	1.53
+++ sources	27 Apr 2010 13:39:31 -0000	1.54
@@ -1 +1 @@
-21632ddf2f9c4fa9fde175e598005322  tomboy-1.2.0.tar.bz2
+f5a6396b1b93919f461653446d2571c6  tomboy-1.2.1.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- tomboy.spec	29 Mar 2010 23:48:31 -0000	1.136
+++ tomboy.spec	27 Apr 2010 13:39:31 -0000	1.137
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        Note-taking application
 
@@ -62,7 +62,6 @@ export MONO_SHARED_DIR=%{_builddir}/%{?b
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -100,24 +99,16 @@ for i in *; do
   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
+%gconf_schema_upgrade tomboy
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
+%pre
+%gconf_schema_prepare tomboy
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/tomboy.schemas >/dev/null;
-fi
-
+%gconf_schema_remove tomboy
 
 %postun
 update-mime-database >&/dev/null || :
@@ -149,6 +140,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 27 2010 Matthias Clasen <mclasen at redhat.com> - 1.2.1-1
+- Update to 1.2.1
+- Spec file cleanups
+
 * Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> - 1.2.0-1
 - Update to 1.2.0