- 0.6.1.5

[packages/f-spot.git] / f-spot.spec

diff --git a/f-spot.spec b/f-spot.spec
index 2cb42d91cd18830505989b3af9e420fccc2880f4..29f083dcaa0165b0cd73f8b1c59da2e02518f359 100644 (file)
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,23 +1,20 @@
 #
 # TODO:
-#      - update aflinta's delete.patch and send it upstream
 #      - use system libgphoto2-sharp.dll, NDesk.Glitz.dll, gnome-keyring-sharp.dll
 #        Tao (http://www.taoframework.com/), semweb (http://taubz.for.net/code/semweb)
 #
 %include       /usr/lib/rpm/macros.mono
+%define                _noautoreq 'mono(Mono.*)' 'mono(FlickrNet)' 'mono(gnome-keyring-sharp)'
 #
 Summary:       Personal photo manager
 Summary(pl.UTF-8):     Menedżer prywatnych galerii fotograficznych
 Name:          f-spot
-Version:       0.5.0.3
-Release:       2
+Version:       0.6.1.5
+Release:       1
 License:       GPL
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.5/%{name}-%{version}.tar.bz2
-# Source0-md5: 52db86f1dc715a3958425aa3d006c900
-Patch0:                %{name}-exec.patch
-Patch1:                %{name}-dir.patch
-Patch2:                %{name}-delete.patch
+Source0:       http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 411bac8266a60d9a728218d19dd5e735
 URL:           http://www.gnome.org/projects/f-spot/
 BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: autoconf
@@ -26,6 +23,7 @@ BuildRequires:        beagle-devel >= 0.3.0
 BuildRequires: dotnet-gnome-desktop-sharp-devel >= 2.16.0
 BuildRequires: dotnet-gnome-sharp-devel >= 2.16.0
 BuildRequires: dotnet-gtk-sharp2-devel >= 2.12.1
+BuildRequires: dotnet-libgphoto2-sharp-devel >= 2.1.4
 BuildRequires: dotnet-ndesk-dbus-glib-sharp-devel
 BuildRequires: gettext-devel
 BuildRequires: gnome-common
@@ -80,9 +78,6 @@ Moduł F-Spot dla gnome-screensavera.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-#%patch2 -p0
 
 %build
 %{__intltoolize}
@@ -96,12 +91,7 @@ Moduł F-Spot dla gnome-screensavera.
        --disable-scrollkeeper \
        --with-gnome-screensaver=%{_prefix}
 
-# <make-jN-workaround>
-%{__make} -C extensions/Exporters/FlickrExport/FlickrNet \
-       saverdir=%{_libdir}/gnome-screensaver \
-       themesdir=%{_desktopdir}/screensavers
-
-%{__make} \
+%{__make} -j1 \
        saverdir=%{_libdir}/gnome-screensaver \
        themesdir=%{_desktopdir}/screensavers
 
@@ -141,16 +131,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/*.addins
 %dir %{_libdir}/%{name}/extensions
 %{_libdir}/%{name}/extensions/*
-%dir %{_libdir}/gio-sharp-unstable
-%{_libdir}/gio-sharp-unstable/*.dll
-%{_libdir}/gio-sharp-unstable/*.dll.config
 %attr(755,root,root) %{_libdir}/%{name}/lib*.so*
 %{_libdir}/%{name}/*.dll
+%{_libdir}/%{name}/*.mdb
 %{_libdir}/%{name}/*.dll.config
 %{_libdir}/%{name}/*.exe.config
 %{_desktopdir}/*.desktop
 %{_pkgconfigdir}/f-spot.pc
-%{_pkgconfigdir}/gio-sharp-unstable.pc
 
 %files screensaver
 %defattr(644,root,root,755)