rpms/geeqie/F-12 geeqie.spec,1.25,1.26

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/geeqie/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4758/F-12

Modified Files:
	geeqie.spec 
Log Message:
* Tue Apr  6 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-2
- require exiv2, ImageMagick, fbida, ufraw, zenity for plug-in scripts
- BR gnome-doc-utils for HTML documentation (and "Help > Contents" menu)



Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-12/geeqie.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- geeqie.spec	19 Feb 2010 17:53:57 -0000	1.25
+++ geeqie.spec	6 Apr 2010 08:49:45 -0000	1.26
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3
 Group: User Interface/X
 # svn + autogen
@@ -16,6 +16,11 @@ BuildRequires: lcms-devel
 BuildRequires: exiv2-devel
 BuildRequires: lirc-devel
 BuildRequires: gettext intltool desktop-file-utils
+BuildRequires: gnome-doc-utils
+
+# for the included plug-in scripts
+BuildRequires: exiv2 fbida ImageMagick ufraw zenity
+Requires: exiv2 fbida ImageMagick ufraw zenity
 
 # Not in Fedora yet. It's a development release, btw.
 #BuildRequires: libchamplain-gtk-devel >= 0.3
@@ -36,11 +41,15 @@ and zoom.
 
 %prep
 %setup -q -n %{name}-%{upstreamversion}
+# guard against missing executables at (re)build-time,
+# these are needed by the plug-in scripts
+for f in exiftran exiv2 mogrify ufraw-batch zenity ; do
+    type $f || exit -1
+done
 
 
 %build
 %configure --enable-lirc
-#make clean
 make %{?_smp_mflags}
 
 
@@ -48,6 +57,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install
 
+# guard against missing HTML tree
+[ ! -f ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}/html/index.html ] && exit -1
+
 # We want these _docdir files in GQ_HELPDIR.
 install -p -m 0644 AUTHORS COPYING NEWS README* TODO \
     ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}
@@ -86,6 +98,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Apr  6 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-2
+- require exiv2, ImageMagick, fbida, ufraw, zenity for plug-in scripts
+- BR gnome-doc-utils for HTML documentation (and "Help > Contents" menu)
+
 * Fri Feb 19 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-1
 - update to 1.0 final release