X-Git-Url: http://git.pld-linux.org/?p=packages%2Ff-spot.git;a=blobdiff_plain;f=f-spot.spec;h=46a1d49c274a6af10499cd15017fe1f16ba0363f;hp=3518467c8b44e783f8a1d7b67c9667fe6927423d;hb=401cc5bdbe6256b7dfc1d0fd3cfba0bccc8de1a4;hpb=f98867cbeb7e54330578a339be6fb8475154af48

diff --git a/f-spot.spec b/f-spot.spec
index 3518467..46a1d49 100644
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,54 +1,46 @@
 #
-# TODO:
-#	- 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.6.1.1
+Version:	0.8.2
 Release:	1
 License:	GPL
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.6/%{name}-%{version}.tar.bz2
-# Source0-md5:	06bf6ef59be0be8dd8f5ee2d5c69d172
+Source0:	http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	3f2286835c9cdf44e50bc564d8e6b892
+Patch1:		%{name}-PixbufLoader.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-flickrnet
+BuildRequires:	dotnet-gnome-keyring-sharp-devel
 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:	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
-BuildRequires:	libgphoto2-devel >= 2.2.1
-BuildRequires:	libjpeg-devel
-BuildRequires:	libstdc++-devel
+BuildRequires:	libgnome-keyring-devel
 BuildRequires:	libtool
+BuildRequires:	libunique-devel
 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
+BuildRequires:	sqlite3-devel
 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
+Suggests:	dcraw
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 ExclusiveArch:	%{ix86} %{x8664} arm hppa ia64 ppc s390 s390x sparc sparcv9
@@ -78,14 +70,16 @@ Moduł F-Spot dla gnome-screensavera.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I build/m4/f-spot -I build/m4/shamrock -I build/m4/shave
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+CFLAGS="-pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng14"
 %configure \
 	--disable-static \
 	--disable-scrollkeeper \
@@ -114,11 +108,13 @@ rm -rf $RPM_BUILD_ROOT
 %scrollkeeper_update_post
 %update_desktop_database_post
 %update_icon_cache hicolor
+%gconf_schema_install:
 
 %postun
 %scrollkeeper_update_postun
 %update_desktop_database_postun
 %update_icon_cache hicolor
+%gconf_schema_uninstall
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -129,8 +125,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*.exe
 %{_libdir}/%{name}/*.addins
-%dir %{_libdir}/%{name}/extensions
-%{_libdir}/%{name}/extensions/*
+%dir %{_libdir}/%{name}/Extensions
+%{_libdir}/%{name}/Extensions/*
 %attr(755,root,root) %{_libdir}/%{name}/lib*.so*
 %{_libdir}/%{name}/*.dll
 %{_libdir}/%{name}/*.mdb
@@ -138,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/*.exe.config
 %{_desktopdir}/*.desktop
 %{_pkgconfigdir}/f-spot.pc
+%{_sysconfdir}/gconf/schemas/f-spot.schemas
 
 %files screensaver
 %defattr(644,root,root,755)