rpms/dvdauthor/devel dvdauthor.spec,1.7,1.8

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/dvdauthor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12799

Modified Files:
	dvdauthor.spec 
Log Message:
* Wed Feb 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-4
- Add build time conditional for GraphicsMagick, disabled by default (#432651).
- Get rid of need for BuildConflicts.



Index: dvdauthor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvdauthor/devel/dvdauthor.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dvdauthor.spec	16 Nov 2007 07:48:36 -0000	1.7
+++ dvdauthor.spec	13 Feb 2008 17:14:42 -0000	1.8
@@ -1,12 +1,15 @@
+%bcond_with     imagemagick
+%bcond_with     graphicsmagick
+
 Name:           dvdauthor
 Version:        0.6.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Command line DVD authoring tool
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://dvdauthor.sourceforge.net/
-Source0:        http://downloads.sf.net/dvdauthor/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/dvdauthor/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libdvdread-devel >= 0.9.4-4
@@ -16,12 +19,15 @@
 BuildRequires:  libxml2-devel >= 2.6.0
 BuildRequires:  fribidi-devel
 BuildRequires:  freetype-devel
-# ImageMagick not built by default due to big dependency chain, #212478
-%if 0%{?_with_imagemagick:1}
-BuildRequires:  ImageMagick-devel
+%if %{with graphicsmagick}
+# Wait for dep bloat to decrease before making this default to on: #432651
+BuildRequires:  GraphicsMagick-devel
 %else
-BuildConflicts: ImageMagick-devel
-%endif
+# Ditto here: #212478
+%if %{with imagemagick}
+BuildRequires:  ImageMagick-devel
+%endif # imagemagick
+%endif # graphicsmagick
 
 %description
 dvdauthor is a program that will generate a DVD movie from a valid
@@ -30,9 +36,20 @@
 
 %prep
 %setup -q
+%if %{with graphicsmagick}
+# No ImageMagick compat built in Fedora GraphicsMagick
+sed -i -e 's/ExportImagePixels/DispatchImage/g' configure src/subgen-image.c
+%endif # graphicsmagick
 
 
 %build
+%if %{with graphicsmagick}
+export MAGICKCONFIG=GraphicsMagick-config
+%else
+%if ! %{with imagemagick}
+export MAGICKCONFIG=/bin/true
+%endif # imagemagick
+%endif # graphicsmagick
 %configure --disable-rpath --disable-dependency-tracking
 make %{?_smp_mflags}
 
@@ -65,6 +82,10 @@
 
 
 %changelog
+* Wed Feb 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-4
+- Add build time conditional for GraphicsMagick, disabled by default (#432651).
+- Get rid of need for BuildConflicts.
+
 * Fri Nov 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-3
 - Rebuild.