|
@@ -1,5 +1,5 @@
|
|
Name: f-spot
|
|
Name: f-spot
|
|
-Version: 0.7.1
|
|
|
|
|
|
+Version: 0.8.0
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
Summary: Photo management application
|
|
Summary: Photo management application
|
|
Summary(ja): 写真管理アプリケーション
|
|
Summary(ja): 写真管理アプリケーション
|
|
@@ -7,11 +7,21 @@ Summary(ja): 写真管理アプリケーション
|
|
Group: Applications/Multimedia
|
|
Group: Applications/Multimedia
|
|
License: GPLv2+ and LGPLv2+ and CPL and MIT
|
|
License: GPLv2+ and LGPLv2+ and CPL and MIT
|
|
URL: http://f-spot.org/
|
|
URL: http://f-spot.org/
|
|
-Source0: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.7/f-spot-%{version}.tar.bz2
|
|
|
|
|
|
+Source0: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.8/f-spot-%{version}.tar.bz2
|
|
Patch1: f-spot-0.7.1-build-fixes.patch
|
|
Patch1: f-spot-0.7.1-build-fixes.patch
|
|
# unmount cameras before importing
|
|
# unmount cameras before importing
|
|
Patch3: 0002-enhance-the-f-spot-import-script.patch
|
|
Patch3: 0002-enhance-the-f-spot-import-script.patch
|
|
|
|
|
|
|
|
+# Patch from fedora
|
|
|
|
+# upstream patch to prevent crash with empty databases
|
|
|
|
+# http://git.gnome.org/browse/f-spot/patch/?id=9054153b3b40f76f7e094ca8db98de0eaca62808
|
|
|
|
+Patch11: 0001-Don-t-crash-with-empty-databases.patch
|
|
|
|
+# two upstream patches to fix compile issue with Mono 2.8:
|
|
|
|
+# http://gitorious.org/taglib-sharp/mainline/commit/5b8a05f130d7e2bf6e284ae0486c9193112806fa
|
|
|
|
+Patch12: 0001-All-fields-of-a-struct-must-be-initialized-before-th.patch
|
|
|
|
+# http://git.gnome.org/browse/f-spot/commit/?id=9d6e8052b188c2b1cb310ef05842da74a730a39f
|
|
|
|
+Patch13: 0001-PixbufLoader-from-gtk-sharp-master-does-not-have-a-C.patch
|
|
|
|
+
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel
|
|
BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel
|
|
@@ -30,6 +40,7 @@ BuildRequires: desktop-file-utils
|
|
BuildRequires: gnome-keyring-sharp-devel
|
|
BuildRequires: gnome-keyring-sharp-devel
|
|
BuildRequires: unique-devel
|
|
BuildRequires: unique-devel
|
|
BuildRequires: flickrnet-devel
|
|
BuildRequires: flickrnet-devel
|
|
|
|
+BuildRequires: libSM-devel
|
|
Requires: sqlite3
|
|
Requires: sqlite3
|
|
Requires: lcms
|
|
Requires: lcms
|
|
Requires: dcraw
|
|
Requires: dcraw
|
|
@@ -66,8 +77,14 @@ photo collection in a slideshow as a screensaver.
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
-%patch1 -p1 -b .buildfix
|
|
|
|
|
|
+#%patch1 -p1 -b .buildfix
|
|
%patch3 -p1 -b .gvfs-gphoto
|
|
%patch3 -p1 -b .gvfs-gphoto
|
|
|
|
+%patch11 -p1 -b db-fix
|
|
|
|
+pushd lib/TagLib/TagLib
|
|
|
|
+%patch12 -p1 -b mono28-compile-fix
|
|
|
|
+popd
|
|
|
|
+%patch13 -p1 -b mono28-compile-fix
|
|
|
|
+
|
|
|
|
|
|
%build
|
|
%build
|
|
intltoolize --force --copy
|
|
intltoolize --force --copy
|
|
@@ -151,7 +168,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|
%{_libdir}/f-spot/*.mdb
|
|
%{_libdir}/f-spot/*.mdb
|
|
%{_libdir}/f-spot/*.so
|
|
%{_libdir}/f-spot/*.so
|
|
%{_libdir}/f-spot/*.so.*
|
|
%{_libdir}/f-spot/*.so.*
|
|
-%exclude %{_libdir}/f-spot/Extensions/FSpot.Exporters.ScreensaverConfig.dll*
|
|
|
|
|
|
+%exclude %{_libdir}/f-spot/Extensions/FSpot.Tools.ScreensaverConfig.dll*
|
|
%{_libdir}/f-spot/Extensions/
|
|
%{_libdir}/f-spot/Extensions/
|
|
%{_bindir}/f-spot
|
|
%{_bindir}/f-spot
|
|
%{_bindir}/f-spot-import
|
|
%{_bindir}/f-spot-import
|
|
@@ -159,11 +176,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|
|
|
|
|
%files screensaver
|
|
%files screensaver
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
-%{_libdir}/f-spot/Extensions/FSpot.Exporters.ScreensaverConfig.dll
|
|
|
|
|
|
+%{_libdir}/f-spot/Extensions/FSpot.Tools.ScreensaverConfig.dll
|
|
%{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
|
|
%{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
|
|
%{_datadir}/applications/screensavers/f-spot-screensaver.desktop
|
|
%{_datadir}/applications/screensavers/f-spot-screensaver.desktop
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Dec 18 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.0-1
|
|
|
|
+- new upstream release
|
|
|
|
+- drop Patch1
|
|
|
|
+- add Patch11,12,13 from fedora
|
|
|
|
+- add BuildRequires: libSM-devel
|
|
|
|
+
|
|
* Thu Aug 05 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.7.1-1
|
|
* Thu Aug 05 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.7.1-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- add patch1 to support parallel builds
|
|
- add patch1 to support parallel builds
|