[tomboy/f14: 20/20] Merge branch 'master' into f14

[Thomas Moschny]

commit aaa95457fc1b665a33619fa506cbb3c5c6eb7cad
Merge: c533e34 610e5d2
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Jun 3 03:37:34 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	sources
    	tomboy.spec

 .gitignore                |    3 +
 no-start-here.patch       |   12 ----
 sources                   |    2 +-
 tomboy-applet-no-sm.patch |   10 ----
 tomboy-build.patch        |   13 -----
 tomboy-wrapper.patch      |   27 ----------
 tomboy.spec               |  125 ++++++++++++++++++++++++++++++---------------
 7 files changed, 88 insertions(+), 104 deletions(-)
---
diff --cc .gitignore
index 142e3a5,6e6421f..2f91556
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,6 +1,7 @@@
  tomboy-1.3.1.tar.bz2
  /tomboy-1.3.2.tar.bz2
  /tomboy-1.4.0.tar.bz2
 +/tomboy-1.4.2.tar.bz2
+ /tomboy-1.5.0.tar.bz2
+ /tomboy-1.5.2.tar.bz2
+ /tomboy-1.6.0.tar.bz2
diff --cc tomboy.spec
index 65d2b2d,73008a1..6adffc6
--- a/tomboy.spec
+++ b/tomboy.spec
@@@ -117,16 -143,45 +143,33 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_datadir}/icons/hicolor/*/apps/tomboy.*
  %{_datadir}/icons/hicolor/*/mimetypes/*
  %{_datadir}/mime/packages/tomboy.xml
+ %{_datadir}/applications/tomboy.desktop
  %{_sysconfdir}/gconf/schemas/tomboy.schemas
+ %if 0%{?with_panel_applet}
+ %{_bindir}/tomboy-panel
+ %{_libdir}/bonobo/servers/GNOME_TomboyApplet.server
+ %endif
+ 
  
  %files devel
+ %defattr(-,root,root,-)
  %{_libdir}/pkgconfig/*.pc
  
+ 
  %changelog
+ * Thu Jun  2 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.0-1
+ - Update to 1.6.0, also fixes CVE-2010-4005.
+ - Simply create the missing dir instead of patching Makefile.am.
+ - Include the .desktop file (bz 672406).
+ - Use pkgconfig(...)-style BRs.
+ - Add missing BR on GConf2.
+ - Re-enable the panel applet for F14 (bz 637416).
+ - Minor cosmetics.
+ 
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Thu Oct 28 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.5.2-2
 -- Rebuild against new mono and gmime-sharp
 -
 -* Mon Oct 25 2010 Ray Strode <rstrode at redhat.com> 1.5.2-1
 -- Update to 1.5.2
 +* Mon Oct 25 2010 Ray Strode <rstrode at redhat.com> 1.4.2-1
 +- Update to 1.4.2
    Related: #646666
  
 -* Thu Oct  7 2010 Matthias Clasen <mclasen at redhat.com> - 1.5.0-1
 -- Update to 1.5.0
 -
 -* Fri Oct 01 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.4.0-2
 -- Merge-review cleanup (#226498)
 -
  * Thu Sep 30 2010 Matthias Clasen <mclasen at redhat.com> - 1.4.0-1
  - Update to 1.4.0