[tomboy] - Merge-review cleanup (#226498)

[paragn]

commit d2a0915a3efe16aabc1cfa6cd768452fa7404f08
Author: paragn <paragn at fedoraproject.org>
Date:   Mon Oct 4 21:28:41 2010 +0530

    - Merge-review cleanup (#226498)

 tomboy.spec |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)
---
diff --git a/tomboy.spec b/tomboy.spec
index 83a99d2..c6f7d97 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -11,28 +11,26 @@ License:        LGPLv2+ and GPLv2+ and MIT
 URL:            http://projects.gnome.org/tomboy/
 #VCS: git:git://git.gnome.org/tomboy
 Source0:        http://download.gnome.org/sources/tomboy/1.3/%{name}-%{version}.tar.bz2
-
+# Fedora specific patch
 Patch0:         tomboy-build.patch
 
-BuildRequires:  gtk2-devel >= 2.6.0
-BuildRequires:  atk-devel >= 1.2.4
+BuildRequires:  gtk2-devel 
+BuildRequires:  atk-devel 
 BuildRequires:  gnome-panel-devel
 BuildRequires:  gtkspell-devel
-BuildRequires:  libgnomeprintui22-devel >= 2.2
+BuildRequires:  libgnomeprintui22-devel 
 BuildRequires:  gtk-sharp2-devel
 BuildRequires:  gnome-sharp-devel
 BuildRequires:  gnome-desktop-sharp-devel
 BuildRequires:  ndesk-dbus-glib-devel
 BuildRequires:  gmime-sharp
-BuildRequires:	mono-devel
-BuildRequires:	gettext
-BuildRequires:	gnome-doc-utils
-BuildRequires:	mono-addins-devel
+BuildRequires:  mono-devel
+BuildRequires:  gettext
+BuildRequires:  gnome-doc-utils
+BuildRequires:  mono-addins-devel
 BuildRequires:  automake, autoconf, libtool, intltool
 
-Requires:	gtkspell
-Requires(post): shared-mime-info
-Requires(postun): shared-mime-info
+Requires: gtkspell
 
 ExcludeArch:    sparc64
 
@@ -45,7 +43,6 @@ ideas together with Wiki style interconnects.
 Summary: Support for developing addings for tomboy
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 Tomboy is a desktop note-taking application. This package allows you
@@ -57,18 +54,24 @@ to develop addins that add new functionality to tomboy.
 
 autoreconf -i -f
 
+# Convert to utf-8
+for file in ChangeLog ; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
+
 %build
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --disable-static
 make %{?_smp_mflags}
 
 %install
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-rm $RPM_BUILD_ROOT%{_libdir}/tomboy/*.la
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/addins/*.dll
 
@@ -120,9 +123,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %files devel
+%defattr(-,root,root,-)
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* 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