[tomboy] Spec file cleanups.

[Thomas Moschny]

commit 3ed2ba4951c6c4502d39e6c1aaff305cce44c082
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Jun 2 15:01:53 2011 +0200

    Spec file cleanups.

 tomboy.spec |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)
---
diff --git a/tomboy.spec b/tomboy.spec
index 7177ddc..ddd8a02 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -2,7 +2,6 @@ Name:           tomboy
 Version:        1.6.0
 Release:        1%{?dist}
 Summary:        Note-taking application
-
 Group:          User Interface/Desktops
 License:        LGPLv2+ and GPLv2+ and MIT
 # Tomboy itself is LGPLv2+
@@ -48,20 +47,24 @@ Requires(preun): GConf2
 
 ExcludeArch:    sparc64
 
+
 %description
 Tomboy is a desktop note-taking application which is simple and easy to use.
 It lets you organise your notes intelligently by allowing you to easily link
 ideas together with Wiki style interconnects.
 
+
 %package devel
 Summary: Support for developing addings for tomboy
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
+
 %description devel
 Tomboy is a desktop note-taking application. This package allows you
 to develop addins that add new functionality to tomboy.
 
+
 %prep
 %setup -q
 
@@ -72,43 +75,49 @@ for file in ChangeLog ; do
     mv $file.new $file
 done
 
+
 %build
 %configure --disable-scrollkeeper --disable-static %{?with_panel_applet:--enable-panel-applet}
 mkdir bin
 make %{?_smp_mflags}
 
+
 %install
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/addins/*.dll
+chmod a+x %{buildroot}%{_libdir}/%{name}/*.exe
+chmod a+x %{buildroot}%{_libdir}/%{name}/addins/*.dll
 
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/tomboy.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/tomboy.desktop
 
 %find_lang %name --with-gnome
 
-cd $RPM_BUILD_ROOT%{_datadir}/mime
+cd %{buildroot}%{_datadir}/mime
 for i in *; do
   if [ ! "$i" = "packages" ]; then
     rm -rf ./$i
   fi
 done
 
+
 %post
 update-mime-database >&/dev/null || :
 %gconf_schema_upgrade tomboy
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
+
 %pre
 %gconf_schema_prepare tomboy
 
+
 %preun
 %gconf_schema_remove tomboy
 
+
 %postun
 update-mime-database >&/dev/null || :
 if [ $1 -eq 0 ]; then
@@ -116,17 +125,19 @@ if [ $1 -eq 0 ]; then
   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,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %dir %{_libdir}/%{name}
-%{_bindir}/%{name}
-%{_libdir}/%{name}/*
+%{_bindir}/tomboy
+%{_libdir}/tomboy/*
 %{_datadir}/dbus-1/services/org.gnome.Tomboy.service
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/tomboy.1.gz
 %{_datadir}/tomboy
 %{_datadir}/icons/hicolor/*/apps/tomboy.*
 %{_datadir}/icons/hicolor/*/mimetypes/*
@@ -138,17 +149,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/bonobo/servers/GNOME_TomboyApplet.server
 %endif
 
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/*.pc
 
+
 %changelog
-* Wed Jun  1 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.0-1
-- Update to 1.6.0.
+* 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.
+- Include the .desktop file (bz 672406).
 - Use pkgconfig(...)-style BRs, add missing BR on GConf2.
-- Re-enable the panel applet for F14.
+- 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