- drop obsolete and outdated manual inclusion of rpm macros

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

diff --git a/f-spot.spec b/f-spot.spec
index 9b0085465d14f4aa55b9e6b1bd1545d1ccb4ef46..29f96a2d54e1933d1226ad3eaf9436f6bf81332d 100644 (file)
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,17 +1,16 @@
 #
-%include       /usr/lib/rpm/macros.mono
-%define                _noautoreq 'mono(Mono.*)' 'mono(FlickrNet)' 'mono(gnome-keyring-sharp)'
+%bcond_without gnome2
 #
 Summary:       Personal photo manager
 Summary(pl.UTF-8):     Menedżer prywatnych galerii fotograficznych
 Name:          f-spot
-Version:       0.8.0
-Release:       2
+Version:       0.8.2
+Release:       7
 License:       GPL
 Group:         X11/Applications/Graphics
 Source0:       http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5: f7d52adbf280c972adccd66338e49f3d
-Patch0:                %{name}-taglib.patch
+# Source0-md5: 3f2286835c9cdf44e50bc564d8e6b892
+Patch0:                %{name}-build.patch
 Patch1:                %{name}-PixbufLoader.patch
 URL:           http://www.gnome.org/projects/f-spot/
 BuildRequires: GConf2-devel >= 2.14.0
@@ -22,13 +21,13 @@ BuildRequires:      dotnet-gnome-keyring-sharp-devel
 BuildRequires: dotnet-gnome-sharp-devel >= 2.16.0
 BuildRequires: dotnet-gtk-sharp2-devel >= 2.12.1
 BuildRequires: dotnet-ndesk-dbus-glib-sharp-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: gnome-doc-utils
 BuildRequires: gnome-icon-theme
 BuildRequires: intltool >= 0.40.0
 BuildRequires: lcms-devel >= 1.12
-BuildRequires: libgnomeui-devel >= 2.16.0
 BuildRequires: libgnome-keyring-devel
+BuildRequires: libgnomeui-devel >= 2.16.0
 BuildRequires: libtool
 BuildRequires: libunique-devel
 BuildRequires: mono-addins-devel
@@ -38,16 +37,21 @@ BuildRequires:      rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: sqlite3-devel
 Requires(post,postun): desktop-file-utils
-Requires(post,postun): gtk+2
+Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
+Requires:      mono-addins
 Suggests:      dcraw
+Suggests:      udev-libgphoto2
+Suggests:      dbus-x11
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 ExclusiveArch: %{ix86} %{x8664} arm hppa ia64 ppc s390 s390x sparc sparcv9
 ExcludeArch:   i386
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _noautoreq mono(Mono.*) mono(FlickrNet) mono(gnome-keyring-sharp)
+
 %description
 F-Spot is an application designed to provide personal photo management
 to the GNOME desktop.
@@ -138,7 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/f-spot.pc
 %{_sysconfdir}/gconf/schemas/f-spot.schemas
 
+%if %{with gnome2}
 %files screensaver
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gnome-screensaver/f-spot-screensaver
 %{_desktopdir}/screensavers/f-spot-screensaver.desktop
+%endif