- drop fullscreen patch

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

diff --git a/f-spot.spec b/f-spot.spec
index bfd3ea9b864f40962fb59cb9fd214e26998545a0..91a5b6c34f122941582d7d3906b20772da2d0adc 100644 (file)
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,32 +1,32 @@
 #
 # TODO:
-#      - update aflinta's delete.patch
-#      - update desktop 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 mono-addins
 #
 %include       /usr/lib/rpm/macros.mono
 #
 Summary:       Personal photo manager
 Summary(pl.UTF-8):     Menedżer prywatnych galerii fotograficznych
 Name:          f-spot
-Version:       0.4.0
-Release:       0.6
+Version:       0.4.2
+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: 0f21ff56d310329185cc17a2fadda5fe
-Patch0:                %{name}-desktop.patch
-Patch1:                %{name}-exec.patch
-Patch2:                %{name}-dir.patch
-Patch3:                %{name}-fs.patch
-Patch4:                %{name}-delete.patch
-Patch5:                %{name}-dbus.patch
+# Source0-md5: 970b8c9de9acf97c90e3d9608827606d
+Patch0:                %{name}-exec.patch
+Patch1:                %{name}-dir.patch
+Patch3:                %{name}-delete.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=516620
+Patch4:                %{name}-DESTDIR.patch
 URL:           http://www.gnome.org/projects/f-spot/
 BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: dotnet-gnome-sharp-devel >= 2.16.0
+BuildRequires: dotnet-ndesk-dbus-glib-sharp-devel
 BuildRequires: gettext-devel
+BuildRequires: gnome-doc-utils
 BuildRequires: intltool >= 0.35
 BuildRequires: lcms-devel >= 1.12
 BuildRequires: libexif-devel >= 1:0.6.13
@@ -37,12 +37,16 @@ BuildRequires:      libstdc++-devel
 BuildRequires: libtool
 BuildRequires: mono-csharp >= 1.1.16.1
 BuildRequires: pkgconfig
+BuildRequires: rpmbuild(find_lang) >= 1.23
 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
+Requires:      dotnet-libgphoto2-sharp
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -68,12 +72,10 @@ Moduł F-Spot dla gnome-screensavera.
 
 %prep
 %setup -q
-#%%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p1
-#%patch4 -p0
-%patch5 -p1
+%patch0 -p1
+%patch1 -p0
+#%patch3 -p0
+%patch4 -p1
 
 %build
 %{__intltoolize}
@@ -85,6 +87,20 @@ Moduł F-Spot dla gnome-screensavera.
        --disable-scrollkeeper \
        --with-gnome-screensaver=%{_prefix}
 
+# <make-jN-workaround>
+%{__make} -C extensions/FlickrExport/FlickrNet \
+       saverdir=%{_libdir}/gnome-screensaver \
+       themesdir=%{_desktopdir}/screensavers
+
+%{__make} -C extensions/PicasaWebExport/google-sharp \
+       saverdir=%{_libdir}/gnome-screensaver \
+       themesdir=%{_desktopdir}/screensavers
+
+%{__make} -C extensions/SmugMugExport/SmugMugNet \
+       saverdir=%{_libdir}/gnome-screensaver \
+       themesdir=%{_desktopdir}/screensavers
+# </make-jN-workaround>
+
 %{__make} \
        saverdir=%{_libdir}/gnome-screensaver \
        themesdir=%{_desktopdir}/screensavers
@@ -99,7 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 
-%find_lang %{name} --with-gnome
+[ -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
 rm -rf $RPM_BUILD_ROOT
@@ -130,7 +148,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/*.dll.config
 %{_libdir}/%{name}/*.exe.config
 %{_desktopdir}/*.desktop
-%{_omf_dest_dir}/%{name}
 %{_pkgconfigdir}/f-spot.pc
 
 %files screensaver