- no longer required as we use external ndesk dbus implementation

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

diff --git a/f-spot.spec b/f-spot.spec
index b21e5c42a371820e20ecd68ec011ec34c7b5152f..52b8870ccd7d49f472dc80a32fe491f07db7677f 100644 (file)
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -8,23 +8,23 @@
 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.1
+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
+# Source0-md5: b3ab702f608ab0cf477de47fb0d675fe
 Patch0:                %{name}-exec.patch
 Patch1:                %{name}-dir.patch
 Patch2:                %{name}-fs.patch
 Patch3:                %{name}-delete.patch
-Patch4:                %{name}-dbus.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: gettext-devel
+BuildRequires: gnome-doc-utils
 BuildRequires: intltool >= 0.35
 BuildRequires: lcms-devel >= 1.12
 BuildRequires: libexif-devel >= 1:0.6.13
@@ -34,6 +34,7 @@ BuildRequires:        libjpeg-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: mono-csharp >= 1.1.16.1
+BuildRequires: ndesk-dbus-glib
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: sqlite-devel >= 2.8.6
@@ -41,6 +42,8 @@ Requires(post,postun):        desktop-file-utils
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -70,7 +73,6 @@ Moduł F-Spot dla gnome-screensavera.
 %patch1 -p0
 %patch2 -p1
 #%patch3 -p0
-%patch4 -p1
 
 %build
 %{__intltoolize}
@@ -96,6 +98,8 @@ rm -rf $RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --with-gnome
 
 %clean