[f-spot] - Merge-review cleanup (#225773)

[chkr]

commit 3c719fff3bae48ebeb2f233207a56b6311e47b6a
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sun Dec 12 17:28:03 2010 +0100

    - Merge-review cleanup (#225773)

 f-spot.spec |   46 +++++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/f-spot.spec b/f-spot.spec
index 1c8a502..7659678 100644
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,10 +1,19 @@
 Name:           f-spot
 Version:        0.8.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
-License:        GPLv2+ and LGPLv2+ and CPL and MIT
+#f-spot/src: GPLv2+
+#f-spot/lib/gio-sharp: MIT
+#f-spot/lib/gtk-sharp-beans: LGPLv2
+#f-spot/lib/Hyena: MIT
+#f-spot/lib/libfspot: GPLv2+
+#f-spot/lib/Mono.Google: MIT
+#f-spot/lib/Mono.Tabblo: MIT
+#f-spot/lib/TagLib: LGPLv2
+#f-spot/lib/unique-sharp: GPLv2+
+License:        GPLv2+ and LGPLv2 and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.8/f-spot-%{version}.tar.bz2
 # upstream patch to prevent crash with empty databases
@@ -18,12 +27,10 @@ Patch4:         0001-All-fields-of-a-struct-must-be-initialized-before-th.patch
 # http://git.gnome.org/browse/f-spot/commit/?id=9d6e8052b188c2b1cb310ef05842da74a730a39f
 Patch5:         0001-PixbufLoader-from-gtk-sharp-master-does-not-have-a-C.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
-BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 
-BuildRequires:  gtk-sharp2-devel >= 2.7 libgnome-devel libgnomeui-devel
-BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
+BuildRequires:  libexif-devel gphoto2-devel
+BuildRequires:  gtk-sharp2-devel libgnome-devel libgnomeui-devel
+BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel
 BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel gtk-sharp2-gapi
 BuildRequires:  gettext
 BuildRequires:  autoconf, automake, libtool, intltool
@@ -36,10 +43,7 @@ BuildRequires:  gnome-keyring-sharp-devel
 BuildRequires:  GConf2
 BuildRequires:  unique-devel
 BuildRequires:  flickrnet-devel
-# explicitly require libSM and libICE since they are not required by libgnomeui-devel anymore
-# https://bugzilla.redhat.com/show_bug.cgi?id=638938
-BuildRequires:  libSM-devel libICE-devel
-Requires:       sqlite >= 3.3.1
+Requires:       sqlite
 Requires:       lcms-libs
 Requires:       dcraw
 Requires:       hicolor-icon-theme 
@@ -47,8 +51,6 @@ Requires:       yelp
 Requires:       libgphoto2
 Requires:       gtk2, gnome-vfs2, libgnomeui, libGL, libXcomposite
 Requires:       unique
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
 Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun):GConf2
@@ -72,7 +74,6 @@ Summary: F-Spot gnome-screensaver plugin
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Requires: gnome-screensaver
-Obsoletes: f-spot < 0.6.1.1
 
 %description screensaver
 F-Spot provides a plugin for gnome-screensaver which displays parts of the
@@ -89,16 +90,16 @@ popd
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --disable-static
 make V=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p"
+
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc
 
 # only files marked executable are used to auto-generate the
@@ -106,6 +107,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc
 find $RPM_BUILD_ROOT \( -name '*.exe' -or -name '*.dll' \) \
      -exec chmod a+x {} \;
 
+# mono's .config files don't need to be executable
+find $RPM_BUILD_ROOT -name '*.config' -exec chmod a-x {} \;
+
 for file in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 do
    desktop-file-validate $file
@@ -113,9 +117,6 @@ done
 
 %find_lang %name
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %pre
 %gconf_schema_prepare f-spot
 
@@ -166,6 +167,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Sun Dec 12 2010 Christian Krause <chkr at fedoraproject.org> - 0.8.0-5
+- Merge-review cleanup (#225773)
+
 * Sun Oct 24 2010 Christian Krause <chkr at fedoraproject.org> - 0.8.0-4
 - Rebuilt for Mono 2.8
 - Add two upstream patches to fix compile issues with Mono 2.8