- Disable building of diffimg, as recommended by upstream

This commit is contained in:
Patrick Laughton 2008-02-07 21:07:33 +00:00
parent 99dce1d099
commit 9843d527bc
2 changed files with 30 additions and 1 deletions

24
graphviz-diffimg.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up graphviz-2.12/contrib/Makefile.am.orig graphviz-2.12/contrib/Makefile.am
--- graphviz-2.12/contrib/Makefile.am.orig 2006-04-07 13:50:32.000000000 -0500
+++ graphviz-2.12/contrib/Makefile.am 2008-02-07 15:05:31.000000000 -0600
@@ -1,7 +1,7 @@
# $Id: Makefile.am,v 1.6 2006/04/07 18:50:32 ellson Exp $ $Revision: 1.6 $
## Process this file with automake to produce Makefile.in
-SUBDIRS = prune diffimg
+SUBDIRS = prune
EXTRA_DIST = INDEX dotmcl.pl gprof2dot.awk webdot.cgi Makefile.old \
sdlshapes lefty-grace dirgraph
diff -up graphviz-2.12/contrib/Makefile.in.orig graphviz-2.12/contrib/Makefile.in
--- graphviz-2.12/contrib/Makefile.in.orig 2006-12-04 16:03:14.000000000 -0600
+++ graphviz-2.12/contrib/Makefile.in 2008-02-07 15:05:39.000000000 -0600
@@ -354,7 +354,7 @@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = prune diffimg
+SUBDIRS = prune
EXTRA_DIST = INDEX dotmcl.pl gprof2dot.awk webdot.cgi Makefile.old \
sdlshapes lefty-grace dirgraph

View File

@ -7,7 +7,7 @@
#-- graphviz src.rpm --------------------------------------------------------
Name: graphviz
Version: 2.12
Release: 9%{?dist}
Release: 10%{?dist}
License: CPL
URL: http://www.graphviz.org/
@ -15,6 +15,7 @@ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz
Patch0: %{name}-php5.patch
Patch1: %{name}-libcdt.patch
Patch2: %{name}-black.patch
Patch3: %{name}-diffimg.patch
# graphviz is relocatable
#Prefix: /usr
@ -409,6 +410,7 @@ Provides some additional PDF and HTML documentation for graphviz.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
# XXX ix86 only used to have -ffast-math, let's use everywhere
@ -445,6 +447,9 @@ rm -rf $RPM_BUILD_ROOT
#-- changelog --------------------------------------------------
%changelog
* Thu Feb 07 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-10
- Disable building of diffimg, as recommended by upstream
* Thu Feb 07 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-9
- Use system gd instead of internal