f-spot: update to 0.7.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1547 ec354946-7b23-47d6-9f5a-488ba84defc7

f/f-spot/f-spot-vl.spec

@@ -1,5 +1,5 @@
 Name:           f-spot
-Version:        0.6.1.5
+Version:        0.7.1
 Release:        1%{?_dist_release}
 Summary:        Photo management application
 Summary(ja):    写真管理アプリケーション
@@ -7,13 +7,10 @@ Summary(ja):    写真管理アプリケーション
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
-Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# Use system mono-addins
-Patch2:         0001-use-system-Mono.Addins-if-available.patch
+Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.7/f-spot-%{version}.tar.bz2
+Patch1:         f-spot-0.7.1-build-fixes.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
-# Use system gnome-keyring
-Patch4:         0003-use-system-Gnome.Keyring-if-available.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -31,6 +28,8 @@ BuildRequires:  ndesk-dbus-glib
 BuildRequires:  mono-addins
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-keyring-sharp-devel
+BuildRequires:  unique-devel
+BuildRequires:  flickrnet-devel
 Requires:       sqlite3
 Requires:       lcms
 Requires:       dcraw
@@ -67,12 +66,18 @@ photo collection in a slideshow as a screensaver.
 
 %prep
 %setup -q
-%patch2 -p1 -F 2 -b .link-system-mono-addins
+%patch1 -p1 -b .buildfix
 %patch3 -p1 -b .gvfs-gphoto
-%patch4 -p1 -b .link-system-keyring
 
 %build
-autoreconf -f -i
+intltoolize --force --copy
+libtoolize --force --copy --automake
+aclocal -I build/m4/f-spot -I build/m4/shamrock -I build/m4/shave
+autoconf
+autoheader
+test -f config.h.in && touch config.h.in
+automake --gnu --add-missing --force --copy -Wno-portability
+
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --disable-scrollkeeper
 make %{?_smp_mflags}
@@ -102,9 +107,23 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/f-spot.schemas > /dev/null || :
+fi
+
 %post
 update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/f-spot.schemas > /dev/null || :
+
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/f-spot.schemas > /dev/null || :
+fi
 
 %postun
 update-desktop-database &> /dev/null ||:
@@ -119,6 +138,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
+%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome/help/f-spot/
 %{_datadir}/icons/hicolor/*/*/*.png
@@ -131,20 +151,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/f-spot/*.mdb
 %{_libdir}/f-spot/*.so
 %{_libdir}/f-spot/*.so.*
-%exclude %{_libdir}/f-spot/extensions/ScreensaverConfig.dll
-%{_libdir}/f-spot/extensions/
+%exclude %{_libdir}/f-spot/Extensions/FSpot.Exporters.ScreensaverConfig.dll*
+%{_libdir}/f-spot/Extensions/
 %{_bindir}/f-spot
 %{_bindir}/f-spot-import
 %{_bindir}/f-spot-sqlite-upgrade
-%{_datadir}/omf/f-spot/
 
 %files screensaver
 %defattr(-,root,root,-)
-%{_libdir}/f-spot/extensions/ScreensaverConfig.dll
+%{_libdir}/f-spot/Extensions/FSpot.Exporters.ScreensaverConfig.dll
 %{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Thu Aug 05 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.7.1-1
+- new upstream release
+- add patch1 to support parallel builds
+- add BR: unique-devel, flickrnet-devel
+
 * Sun May 02 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.6.1.5-1
 - initial build for Vine Linux