X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=f-spot.spec;h=c661e8e19fde0800fb9f51f602cddf8bad6eae4c;hb=96802e1585e03077cb83a984ebdd3675d8331264;hp=8ce8d26a6ad6e5f890943d1500a2557050682275;hpb=a5e79fe10703a1f52075be2e4cc44439937b8cb0;p=packages%2Ff-spot.git

diff --git a/f-spot.spec b/f-spot.spec
index 8ce8d26..c661e8e 100644
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,50 +1,61 @@
-
+#
+# TODO:
+#	- update aflinta's delete.patch
+#	- update desktop patch
+#	- check if fs patch is still needed, propably causes weird effects on my box
+#
 %include	/usr/lib/rpm/macros.mono
+#
 Summary:	Personal photo manager
-Summary(pl):	Mened¿er prywatnych galerii fotograficznych
+Summary(pl.UTF-8):	Menedżer prywatnych galerii fotograficznych
 Name:		f-spot
-Version:	0.1.11
-Release:	4
+Version:	0.4.0
+Release:	0.5
 License:	GPL
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/pub/gnome/sources/f-spot/0.1/%{name}-%{version}.tar.bz2
-# Source0-md5:	d4d75f6a5272fa15b5658abdf708b050
+Source0:	http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.4/%{name}-%{version}.tar.bz2
+# Source0-md5:	0f21ff56d310329185cc17a2fadda5fe
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-exec.patch
 Patch2:		%{name}-dir.patch
+Patch3:		%{name}-fs.patch
+Patch4:		%{name}-delete.patch
 URL:		http://www.gnome.org/projects/f-spot/
-BuildRequires:	GConf2-devel
+BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	dotnet-dbus-sharp-devel
-BuildRequires:	dotnet-gtk-sharp2-gnome-devel >= 2.7
+BuildRequires:	dotnet-dbus-sharp-devel >= 0.63
+BuildRequires:	dotnet-gnome-sharp-devel >= 2.16.0
 BuildRequires:	gettext-devel
-BuildRequires:	intltool >= 0.21
+BuildRequires:	intltool >= 0.35
 BuildRequires:	lcms-devel >= 1.12
-BuildRequires:	libexif-devel >= 1:0.6.12
-BuildRequires:	libgnomeui-devel >= 2.4.0
-BuildRequires:	libgphoto2-devel >= 2.1.99
+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:	libtool
-BuildRequires:	mono-csharp >= 1.1.7
+BuildRequires:	mono-csharp >= 1.1.16.1
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.197
+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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 F-Spot is an application designed to provide personal photo management
 to the GNOME desktop.
 
-%description -l pl
-F-Spot jest prywatnym mened¿erem galerii fotograficznych dla
-¶rodowiska GNOME.
+%description -l pl.UTF-8
+F-Spot jest prywatnym menedżerem galerii fotograficznych dla
+środowiska GNOME.
 
 %package screensaver
 Summary:	Module for gnome-screensaver
-Summary(pl):	Modu³ dla gnome-screensavera
+Summary(pl.UTF-8):	Moduł dla gnome-screensavera
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 Requires:	gnome-screensaver
@@ -52,14 +63,16 @@ Requires:	gnome-screensaver
 %description screensaver
 F-Spot module for gnome-screensaver.
 
-%description -l pl screensaver
-Modu³ F-Spot dla gnome-screensavera.
+%description screensaver -l pl.UTF-8
+Moduł F-Spot dla gnome-screensavera.
 
 %prep
 %setup -q
-%patch0 -p1
+#%%patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
+#%patch4 -p0
 
 %build
 %{__intltoolize}
@@ -67,43 +80,59 @@ Modu
 %{__automake}
 %{__autoconf}
 %configure \
-	--disable-static
-%{__make}
+	--disable-static \
+	--disable-scrollkeeper \
+	--with-gnome-screensaver=%{_prefix}
+
+%{__make} \
+	saverdir=%{_libdir}/gnome-screensaver \
+	themesdir=%{_desktopdir}/screensavers
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	saverdir=%{_libdir}/gnome-screensaver \
+	themesdir=%{_desktopdir}/screensavers
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
-%find_lang %{name}
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%scrollkeeper_update_post
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun
+%scrollkeeper_update_postun
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
+%{_datadir}/%{name}
+%{_iconsdir}/hicolor/*/*/*.*
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*.exe
+%{_libdir}/%{name}/*.addins
+%dir %{_libdir}/%{name}/extensions
+%{_libdir}/%{name}/extensions/*
 %attr(755,root,root) %{_libdir}/%{name}/lib*.so*
 %{_libdir}/%{name}/*.dll
 %{_libdir}/%{name}/*.dll.config
 %{_libdir}/%{name}/*.exe.config
 %{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.png
+%{_omf_dest_dir}/%{name}
+%{_pkgconfigdir}/f-spot.pc
 
 %files screensaver
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gnome-screensaver/f-spot-screensaver
-%{_datadir}/gnome-screensaver/themes/f-spot-screensaver.desktop
+%{_desktopdir}/screensavers/f-spot-screensaver.desktop