[geeqie] Conditionalize ufraw BR/R for Fedora, since it's not available with

Michael Schwendt mschwendt at fedoraproject.org
Sat Nov 16 19:09:36 UTC 2013


commit 2ad1c5a99a0fee2f57f12a44754c55965f40969d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Nov 16 20:09:55 2013 +0100

    Conditionalize ufraw BR/R for Fedora, since it's not available with
    
      RHEL and EPEL and is optional at run-time.
    - Drop %defattr usage.

 geeqie.spec |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/geeqie.spec b/geeqie.spec
index c1a9fab..7f2be0d 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -6,7 +6,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: User Interface/X
 Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
@@ -42,8 +42,13 @@ 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
+BuildRequires: exiv2 fbida ImageMagick zenity
+Requires: exiv2 fbida ImageMagick zenity
+# at run-time, it is only displayed in menus, if ufraw executable is available
+%if 0%{?fedora}
+BuildRequires: ufraw
+%endif
+
 
 # Experimental, still disabled by default.
 #BuildRequires: libchamplain-gtk-devel >= 0.4
@@ -61,9 +66,14 @@ and zoom.
 %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
+for f in exiftran exiv2 mogrify zenity ; do
+    type $f || exit -1
+done
+%if 0%{?fedora}
+for f in ufraw-batch ; do
     type $f || exit -1
 done
+%endif
 %patch0 -p1 -b .LDFLAGS
 %patch1 -p1 -b .keywords
 %patch2 -p1 -b .fix-fullscreen
@@ -112,7 +122,6 @@ update-desktop-database &> /dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc %{_pkgdocdir}/
 %{_bindir}/%{name}*
 %{_prefix}/lib/%{name}/
@@ -123,6 +132,11 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sat Nov 16 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-14
+- Conditionalize ufraw BR/R for Fedora, since it's not available with
+  RHEL and EPEL and is optional at run-time.
+- Drop %%defattr usage.
+
 * Tue Aug  6 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-13
 - For F-20 unversioned docdirs feature we need to build with
   configure --with-readmedir=... to override the internal GQ_HELPDIR.


More information about the scm-commits mailing list