X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=f-spot.spec;h=1adcc01e19808ecc297efbac94528090d9279bd4;hb=087895502385371431658a28d19f11924efd04fa;hp=d7cf2960ef9a24f80c56d70ac33ab458ef9294a2;hpb=4ceee637038e1fa41bd2b5d3971ceb0b0d7c9909;p=packages%2Ff-spot.git

diff --git a/f-spot.spec b/f-spot.spec
index d7cf296..1adcc01 100644
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,33 +1,37 @@
 #
 # 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
+%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.4.2
-Release:	0.1
+Version:	0.6.0.0
+Release:	1
 License:	GPL
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	970b8c9de9acf97c90e3d9608827606d
-Patch0:		%{name}-exec.patch
-Patch1:		%{name}-dir.patch
-Patch2:		%{name}-fs.patch
-Patch3:		%{name}-delete.patch
-Patch4:		%{name}-DESTDIR.patch
+Source0:	http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	9115f9df72c5fc1c82eb46b3af01e67d
 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-libgphoto2-sharp-devel >= 2.1.4
 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
@@ -35,7 +39,8 @@ BuildRequires:	libgphoto2-devel >= 2.2.1
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-BuildRequires:	mono-csharp >= 1.1.16.1
+BuildRequires:	mono-addins-devel
+BuildRequires:	mono-csharp >= 1.1.17
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
@@ -47,6 +52,8 @@ 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
@@ -72,23 +79,20 @@ Moduł F-Spot dla gnome-screensavera.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
-#%patch2 -p1
-#%patch3 -p0
-%patch4 -p1
 
 %build
 %{__intltoolize}
+%{__libtoolize}
 %{__aclocal}
-%{__automake}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--disable-static \
 	--disable-scrollkeeper \
 	--with-gnome-screensaver=%{_prefix}
 
-%{__make} \
+%{__make} -j 1 \
 	saverdir=%{_libdir}/gnome-screensaver \
 	themesdir=%{_desktopdir}/screensavers
 
@@ -102,8 +106,6 @@ 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 --with-omf
 
 %clean
@@ -132,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/extensions/*
 %attr(755,root,root) %{_libdir}/%{name}/lib*.so*
 %{_libdir}/%{name}/*.dll
+%{_libdir}/%{name}/*.mdb
 %{_libdir}/%{name}/*.dll.config
 %{_libdir}/%{name}/*.exe.config
 %{_desktopdir}/*.desktop