Author: goetz
Date: Mon Feb 5 18:48:12 2007
New Revision: 116367
Added:
packages/cooker/f-spot/current/SOURCES/f-spot-0.3.3.tar.bz2 (contents,
props changed)
Removed:
packages/cooker/f-spot/current/SOURCES/f-spot-0.3.2.tar.bz2
Modified:
packages/cooker/f-spot/current/SPECS/f-spot.spec
Log:
- new version
- add scrollkeeper files
- update desktop database so images are associated with the f-spot viewer
Added: packages/cooker/f-spot/current/SOURCES/f-spot-0.3.3.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/f-spot/current/SPECS/f-spot.spec
==============================================================================
--- packages/cooker/f-spot/current/SPECS/f-spot.spec (original)
+++ packages/cooker/f-spot/current/SPECS/f-spot.spec Mon Feb 5 18:48:12 2007
@@ -1,6 +1,6 @@
%define name f-spot
-%define version 0.3.2
-%define release %mkrel 2
+%define version 0.3.3
+%define release %mkrel 1
Summary: A full-featured personal photo management application for the
GNOME desktop
Name: %{name}
@@ -21,10 +21,13 @@
BuildRequires: libgphoto-devel
BuildRequires: perl-XML-Parser
BuildRequires: desktop-file-utils
+BuildRequires: scrollkeeper
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
#gw please don't drop these explicit deps, the shared libraries are imported
Requires: %mklibname exif 12
Requires: %mklibname gphoto 2
+Requires(post): shared-mime-info scrollkeeper
+Requires(postun): shared-mime-info scrollkeeper
%description
F-Spot is a full-featured personal photo management application
@@ -35,7 +38,7 @@
%patch -p1 -b .dllmap
%build
-%configure2_5x
+%configure2_5x --disable-scrollkeeper
%make
%install
@@ -81,14 +84,15 @@
%find_lang %name --with-gnome
+for omf in %buildroot%_datadir/omf/%name/%name-??*.omf;do
+echo "%lang($(basename $omf|sed -e s/%name-// -e s/.omf//)) $(echo $omf|sed -e
s!%buildroot!!)" >> %name.lang
+done
mkdir -p %buildroot{%_liconsdir,%_miconsdir}
ln -s %_datadir/icons/hicolor/48x48/apps/%name.png
%buildroot%_liconsdir/%name.png
ln -s %_datadir/icons/hicolor/32x32/apps/%name.png
%buildroot%_iconsdir/%name.png
ln -s %_datadir/icons/hicolor/16x16/apps/%name.png
%buildroot%_miconsdir/%name.png
-#gw why are they here?
-rm %buildroot%_datadir/icons/hicolor/*x*/apps/f-spot.svg
%clean
rm -rf $RPM_BUILD_ROOT
@@ -96,10 +100,15 @@
%post
%update_menus
%update_icon_cache hicolor
+%update_scrollkeeper
+%update_desktop_database
%postun
%clean_menus
%clean_icon_cache hicolor
+%clean_scrollkeeper
+%clean_desktop_database
+
%files -f %name.lang
%defattr(-,root,root)
%doc AUTHORS ChangeLog MAINTAINERS NEWS README TODO
@@ -111,6 +120,8 @@
%_datadir/applications/%name.desktop
%_datadir/applications/%name-view.desktop
%_datadir/gnome-screensaver/
+%dir %_datadir/omf/*/
+%_datadir/omf/*/*-C.omf
%_libdir/pkgconfig/*.pc
%_datadir/icons/hicolor/*/apps/f-spot*
%_menudir/%name