- no longer needed

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

diff --git a/f-spot.spec b/f-spot.spec
index 113937924a62c05807b068812b879f619ea59a4b..c661e8e19fde0800fb9f51f602cddf8bad6eae4c 100644 (file)
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,19 +1,25 @@
 #
+# 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.UTF-8):   Menedżer prywatnych galerii fotograficznych
+Summary(pl.UTF-8):     Menedżer prywatnych galerii fotograficznych
 Name:          f-spot
-Version:       0.3.2
-Release:       1
+Version:       0.4.0
+Release:       0.5
 License:       GPL
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/pub/gnome/sources/f-spot/0.3/%{name}-%{version}.tar.bz2
-# Source0-md5: 1084f359ee7de5a4d24ed37a72b1342a
+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 >= 2.14.0
 BuildRequires: autoconf
@@ -36,6 +42,7 @@ 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
@@ -48,7 +55,7 @@ F-Spot jest prywatnym menedżerem galerii fotograficznych dla
 
 %package screensaver
 Summary:       Module for gnome-screensaver
-Summary(pl.UTF-8):   Moduł dla gnome-screensavera
+Summary(pl.UTF-8):     Moduł dla gnome-screensavera
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      gnome-screensaver
@@ -61,10 +68,11 @@ Moduł F-Spot dla gnome-screensavera.
 
 %prep
 %setup -q
-%patch0 -p1
+#%%patch0 -p1
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+#%patch4 -p0
 
 %build
 %{__intltoolize}
@@ -73,6 +81,7 @@ Moduł F-Spot dla gnome-screensavera.
 %{__autoconf}
 %configure \
        --disable-static \
+       --disable-scrollkeeper \
        --with-gnome-screensaver=%{_prefix}
 
 %{__make} \
@@ -95,10 +104,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 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
 
@@ -106,14 +117,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
-%{_iconsdir}/hicolor/*/apps/%{name}.*
+%{_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
+%{_omf_dest_dir}/%{name}
 %{_pkgconfigdir}/f-spot.pc
 
 %files screensaver