- make -jN workaround for FlickrNet comes back, others go away

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

diff --git a/f-spot.spec b/f-spot.spec
index 52b8870ccd7d49f472dc80a32fe491f07db7677f..2cb42d91cd18830505989b3af9e420fccc2880f4 100644 (file)
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,31 +1,38 @@
 #
 # TODO:
-#      - update aflinta's delete.patch
-#      - check if fs patch is still needed, propably causes weird effects on my box
+#      - 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
 #
 Summary:       Personal photo manager
 Summary(pl.UTF-8):     Menedżer prywatnych galerii fotograficznych
 Name:          f-spot
-Version:       0.4.1
-Release:       1
+Version:       0.5.0.3
+Release:       2
 License:       GPL
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.4/%{name}-%{version}.tar.bz2
-# Source0-md5: b3ab702f608ab0cf477de47fb0d675fe
+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}-fs.patch
-Patch3:                %{name}-delete.patch
+Patch2:                %{name}-delete.patch
 URL:           http://www.gnome.org/projects/f-spot/
 BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: autoconf
 BuildRequires: automake
+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-ndesk-dbus-glib-sharp-devel
 BuildRequires: gettext-devel
+BuildRequires: gnome-common
 BuildRequires: gnome-doc-utils
-BuildRequires: intltool >= 0.35
+BuildRequires: gnome-icon-theme
+BuildRequires: gtk+2-devel >= 2:2.12.0
+BuildRequires: intltool >= 0.40.0
 BuildRequires: lcms-devel >= 1.12
 BuildRequires: libexif-devel >= 1:0.6.13
 BuildRequires: libgnomeui-devel >= 2.16.0
@@ -33,17 +40,21 @@ BuildRequires:      libgphoto2-devel >= 2.2.1
 BuildRequires: libjpeg-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
-BuildRequires: mono-csharp >= 1.1.16.1
-BuildRequires: ndesk-dbus-glib
+BuildRequires: mono-addins-devel
+BuildRequires: mono-csharp >= 1.1.17
 BuildRequires: pkgconfig
+BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: sqlite-devel >= 2.8.6
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
+Requires:      dotnet-libgphoto2-sharp
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
+ExclusiveArch: %{ix86} %{x8664} arm hppa ia64 ppc s390 s390x sparc sparcv9
+ExcludeArch:   i386
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -70,20 +81,26 @@ Moduł F-Spot dla gnome-screensavera.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p1
-#%patch3 -p0
+%patch1 -p1
+#%patch2 -p0
 
 %build
 %{__intltoolize}
+%{__libtoolize}
 %{__aclocal}
-%{__automake}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --disable-static \
        --disable-scrollkeeper \
        --with-gnome-screensaver=%{_prefix}
 
+# <make-jN-workaround>
+%{__make} -C extensions/Exporters/FlickrExport/FlickrNet \
+       saverdir=%{_libdir}/gnome-screensaver \
+       themesdir=%{_desktopdir}/screensavers
+
 %{__make} \
        saverdir=%{_libdir}/gnome-screensaver \
        themesdir=%{_desktopdir}/screensavers
@@ -98,9 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
-       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -126,13 +141,16 @@ 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}/*.dll.config
 %{_libdir}/%{name}/*.exe.config
 %{_desktopdir}/*.desktop
-%{_omf_dest_dir}/%{name}
 %{_pkgconfigdir}/f-spot.pc
+%{_pkgconfigdir}/gio-sharp-unstable.pc
 
 %files screensaver
 %defattr(644,root,root,755)