Dropped format-string patch, not needed

Resolves: rhbz#1167869

.cvsignore

@@ -1 +0,0 @@
-graphviz-1.12.tar.gz

.gitignore

@@ -0,0 +1 @@
+graphviz-2.12.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: graphviz
-# $Id$
-NAME := graphviz
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

graphviz-2.12-CVE-2014-0978-CVE-2014-1235.patch

@@ -0,0 +1,64 @@
+diff -up graphviz-2.12/lib/agraph/Makefile.am.origy graphviz-2.12/lib/agraph/Makefile.am
+--- graphviz-2.12/lib/agraph/Makefile.am.origy	2006-09-26 18:47:54.000000000 +0200
++++ graphviz-2.12/lib/agraph/Makefile.am	2014-01-07 13:59:14.868361095 +0100
+@@ -6,7 +6,8 @@ pkgconfigdir = $(libdir)/pkgconfig
+ 
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+-	-I$(top_srcdir)/lib/cdt
++	-I$(top_srcdir)/lib/cdt \
++	-I$(top_srcdir)/lib/graph
+ 
+ pkginclude_HEADERS = aghdr.h agraph.h malloc.h vmstub.h grammar.h
+ noinst_LTLIBRARIES = libagraph_C.la
+@@ -22,7 +23,8 @@ libagraph_C_la_SOURCES = agerror.c apply
+ 
+ libagraph_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+ libagraph_la_SOURCES = $(libagraph_C_la_SOURCES)
+-libagraph_la_LIBADD = $(top_builddir)/lib/cdt/libcdt.la
++libagraph_la_LIBADD = $(top_builddir)/lib/cdt/libcdt.la \
++	$(top_builddir)/lib/graph/libgraph.la
+ 
+ scan.o scan.lo: scan.c grammar.h
+ 
+diff --git a/lib/agraph/scan.l b/lib/agraph/scan.l
+index b3c4875..a46cd92 100644
+--- a/lib/agraph/scan.l
++++ b/lib/agraph/scan.l
+@@ -20,6 +20,7 @@
+ #include <ctype.h>
+ #include "grammar.h"
+ #include "aghdr.h"
++#include "agxbuf.h"
+ #ifdef WIN32
+ #include <io.h>
+ #endif
+@@ -153,13 +154,22 @@ ID		({NAME}|{NUMBER})
+ %%
+ void yyerror(char *str)
+ {
++	unsigned char	xbuf[BUFSIZ];
+ 	char	buf[BUFSIZ];
+-	if (InputFile)
+-		sprintf(buf,"%s:%d: %s in line %d near '%s'",InputFile, line_num,
+-			str,line_num,yytext);
+-	else
+-		sprintf(buf," %s in line %d near '%s'", str,line_num,yytext);
+-	agerror(AGERROR_SYNTAX,buf);
++	agxbuf  xb;
++
++	agxbinit(&xb, BUFSIZ, xbuf);
++	if (InputFile) {
++		agxbput (&xb, InputFile);
++		agxbput (&xb, ": ");
++	}
++	agxbput (&xb, str);
++	sprintf(buf," in line %d near '", line_num);
++	agxbput (&xb, buf);
++	agxbput (&xb, yytext);
++	agxbput (&xb,"'\n");
++	agerror(AGERROR_SYNTAX,agxbuse(&xb));
++	agxbfree(&xb);
+ }
+ /* must be here to see flex's macro defns */
+ void aglexeof() { unput(GRAPH_EOF_TOKEN); }

graphviz-2.12-CVE-2014-1236.patch

@@ -0,0 +1,40 @@
+diff --git a/lib/agraph/scan.l b/lib/agraph/scan.l
+index 4eabcdc..02eaaab 100644
+--- a/lib/agraph/scan.l
++++ b/lib/agraph/scan.l
+@@ -93,15 +93,26 @@ static void endstr_html(void) {
+  * and report this to the user.
+  */
+ static int chkNum(void) {
+-  unsigned char	c = (unsigned char)yytext[yyleng-1];   /* last character */
+-  if (!isdigit(c) && (c != '.')) {  /* c is letter */
+-	char	buf[BUFSIZ];
+-	sprintf(buf,"badly formed number '%s' in line %d\n",yytext,line_num);
+-    strcat (buf, "Splits into two name tokens");
+-	agerror(AGERROR_SYNTAX,buf);
+-    return 1;
+-  }
+-  else return 0;
++    unsigned char c = (unsigned char)yytext[yyleng-1];   /* last character */
++    if (!isdigit(c) && (c != '.')) {  /* c is letter */
++	unsigned char xbuf[BUFSIZ];
++	char buf[BUFSIZ];
++	agxbuf  xb;
++	char* fname;
++
++	agxbinit(&xb, BUFSIZ, xbuf);
++
++	agxbput(&xb,"syntax ambiguity - badly delimited number '");
++	agxbput(&xb,yytext);
++	sprintf(buf,"' in line %d", line_num);
++	agxbput(&xb,buf);
++	agxbput(&xb, " splits into two tokens\n");
++	agerror(AGERROR_SYNTAX,agxbuse(&xb));
++
++	agxbfree(&xb);
++	return 1;
++    }
++    else return 0;
+ }
+ 
+ /* The LETTER class below consists of ascii letters, underscore, all non-ascii

graphviz-libcdt.patch

@@ -0,0 +1,11 @@
+--- graphviz-2.12/lib/expr/Makefile.am.orig	2006-09-26 11:47:54.000000000 -0500
++++ graphviz-2.12/lib/expr/Makefile.am	2007-05-05 11:49:49.000000000 -0500
+@@ -34,7 +34,7 @@
+ 
+ libexpr_la_LDFLAGS = -version-info @VERSION_INFO@
+ libexpr_la_SOURCES = $(libexpr_C_la_SOURCES)
+-libexpr_la_LIBADD = $(libexpr_C_la_LIBADD)
++libexpr_la_LIBADD = $(libexpr_C_la_LIBADD) \
+ 	$(top_builddir)/lib/cdt/libcdt.la
+ 
+ $(libexpr_la_OBJECTS): exparse.h exparse.c exgram.h exop.h

graphviz-php5.patch

@@ -0,0 +1,30 @@
+diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure
+--- graphviz-2.12/configure	2006-12-04 16:02:10.000000000 -0600
++++ graphviz-2.12-patched/configure	2006-12-08 09:45:19.000000000 -0600
+@@ -25552,7 +25552,7 @@
+ 
+ fi;
+ if test "x$enable_php" != "xno"; then
+-if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
++if test `$SWIG -help 2>&1 | $GREP -c '\-php[5 ]*- Generate'` = 0; then
+ 	PHP=
+ 	{ echo "$as_me:$LINENO: WARNING: swig does not support php. The PHP packages will not be built" >&5
+ echo "$as_me: WARNING: swig does not support php. The PHP packages will not be built" >&2;}
+diff -urN graphviz-2.12/configure.ac graphviz-2.12-patched/configure.ac
+--- graphviz-2.12/configure.ac	2006-12-04 15:11:58.000000000 -0600
++++ graphviz-2.12-patched/configure.ac	2006-12-08 08:07:10.000000000 -0600
+@@ -1,4 +1,4 @@
+-# $Id: configure.ac,v 1.168 2006/12/04 21:11:58 erg Exp $ $Revision: 1.168 $
++# $Id: configure.ac,v 1.170 2006/12/07 17:25:53 ellson Exp $ $Revision: 1.170 $
+ 
+ # Process this file with autoconf to produce a configure script
+ AC_PREREQ(2.54)
+@@ -628,7 +628,7 @@
+ AC_ARG_ENABLE(php,
+   [AC_HELP_STRING([--disable-php], [don't support php language bindings])])
+ if test "x$enable_php" != "xno"; then
+-if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
++if test `$SWIG -help 2>&1 | $GREP -c '\-php[[5 ]]*- Generate'` = 0; then
+ 	PHP=
+ 	AC_MSG_WARN([swig does not support php. The PHP packages will not be built])
+ else

graphviz.spec

@@ -1,116 +1,513 @@
-# Note: graphviz requires gd with gif support, hence use internal one for now.
+# $Id: graphviz.spec,v 1.29 2007/05/24 17:05:14 jima Exp $ $Revision: 1.29 $
+# graphviz.spec.  Generated from graphviz.spec.in by configure.
 
-Summary: 	Graph Visualization Tools
+# Note: graphviz requires gd with gif support (and other fixes), hence use
-Name: 		graphviz
+# internal one for now.
-Version: 	1.12
+
-Release: 	0.fdr.2.2
+#-- graphviz src.rpm --------------------------------------------------------
-Epoch:		0
+Name:		graphviz
-Group: 		Applications/Multimedia
+Version:	2.12
-License: 	AT&T open source (see COPYING)
+Release:	12%{?dist}
-URL:  		http://www.graphviz.org/
+
-Source: 	http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz
+License:	CPL
-BuildRoot: 	%{_tmppath}/%{name}-root
+URL:		http://www.graphviz.org/
-BuildRequires:	zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel
+Source:		http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz
-BuildRequires:	bison m4 flex tk tcl >= 0:8.3
+Patch0:		%{name}-php5.patch
+Patch1:		%{name}-libcdt.patch
+# Fix yyerror overflow (CVE-2014-0978, CVE-2014-1235)
+Patch2:		graphviz-2.12-CVE-2014-0978-CVE-2014-1235.patch
+# Fix chknum overflow (CVE-2014-1236)
+Patch3:		graphviz-2.12-CVE-2014-1236.patch
+
+# graphviz is relocatable
+#Prefix: /usr
+# not until we can figure out why relocatabilty is broken
+
+#-- feature and package selection -------------------------------------------
+#	depends on %dist and %fedora (or %rhl or %rhel) which are set
+#	in .rpmmacros on each build host
+
+# Define a default set of features incase none of the conditionals apply
+%define SHARP	0
+%define GUILE	0
+%define _IO	0
+%define JAVA	0
+%define LUA	0
+%define OCAML	0
+%define PERL	0
+%define PHP	0
+%define PYTHON	0
+%define RUBY	0
+%define TCL	1
+%define IPSEPCOLA	--without-ipsepcola
+%define MYLIBGD		--with-mylibgd
+%define MING		--without-ming
+
+# SuSE uses a different mechanism to generate BuildRequires
+# norootforbuild
+# neededforbuild  expat freetype2 freetype2-devel gcc libjpeg libpng-devel-packages tcl tcl-devel tk tk-devel x-devel-packages
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2
+BuildRequires:	/bin/ksh bison m4 flex tk tcl >= 8.3 swig
+
+# This just indicates the requirement for tcl.h, tk.h, but doesn't identify
+# where to get them from. In RH9 and earlier they were in the tcl, tk,
+# base packages which are always BR'd anyway (above).
 BuildRequires:	/usr/include/tcl.h /usr/include/tk.h
 
-%package devel
+%if 0%{?rhl}
-Summary: 	Development package for %{name}
+%define PERL	1
-Group: 		Development/Libraries
+%define TCL	1
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+BuildRequires: XFree86-devel perl
+%endif
+
+%if 0%{?rhel}
+%define PERL	1
+%define TCL	1
+BuildRequires: perl
+%if "%rhel" < "4"
+BuildRequires: XFree86-devel
+%endif
+%if "%rhel" >= "3"
+%define IPSEPCOLA --with-ipsepcola
+BuildRequires: fontconfig-devel tcl-devel tk-devel
+%endif
+%if "%rhel" == "4"
+BuildRequires: xorg-x11-devel
+%endif
+%if "%rhel" >= "4"
+%define PHP	1
+%define RUBY	1
+BuildRequires: php-devel ruby ruby-devel
+%endif
+%if "%rhel" >= "5"
+BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel
+BuildRequires: libICE-devel libXpm-devel libXt-devel libXmu-devel
+BuildRequires: libXext-devel libX11-devel glib2-devel libtool
+%endif
+%endif
+
+%if 0%{?fedora}
+%define PERL	1
+%define TCL	1
+BuildRequires: fontconfig-devel tcl-devel tk-devel 
+%if "%fedora" < "3"
+BuildRequires: XFree86-devel
+%endif
+%if "%fedora" == "3"
+BuildRequires: xorg-x11-devel
+%endif
+%if "%fedora" == "4"
+BuildRequires: xorg-x11-devel
+%endif
+%if "%fedora" >= "3"
+%define IPSEPCOLA --with-ipsepcola
+%endif
+%if "%fedora" >= "4"
+%define PHP	1
+%define RUBY	1
+%define GUILE	1
+BuildRequires: libtool-ltdl libtool-ltdl-devel php-devel ruby ruby-devel guile-devel
+%endif
+%if "%fedora" >= "5"
+%define JAVA	1
+%define PYTHON	1
+BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel libgcj-devel python-devel java-devel
+%ifnarch ppc64
+%define SHARP	1
+%define OCAML	1
+BuildRequires: mono-core ocaml
+%endif
+%endif
+%if "%fedora" >= "6"
+%define LUA	1
+BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel
+%endif
+%endif
+
+#-- graphviz rpm --------------------------------------------------
+Group:		Applications/Multimedia
+Summary:	Graph Visualization Tools
+Requires:	urw-fonts
+Requires(post):	/sbin/ldconfig
+Requires(postun):	/sbin/ldconfig
 
 %description
-A collection of tools and tcl packages for the manipulation and layout
+A collection of tools for the manipulation and layout
 of graphs (as in nodes and edges, not as in barcharts).
 
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_bindir}/*
+%dir %{_libdir}/graphviz
+%{_libdir}/*.so.*
+%{_libdir}/graphviz/*.so.*
+%{_mandir}/man1/*.1*
+%dir %{_datadir}/graphviz
+%{_datadir}/graphviz/lefty
+%exclude %{_libdir}/graphviz/*/*
+%exclude %{_libdir}/graphviz/libgvplugin_gd.*
+
+# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
+%post
+%{_bindir}/dot -c
+/sbin/ldconfig
+
+# if there is no dot after everything else is done, the remove config
+%postun
+if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/graphviz/config; fi
+/sbin/ldconfig
+
+#-- graphviz-gd rpm --------------------------------------------------
+%package gd
+Group:		Applications/Multimedia
+Summary:	Graphviz plugin for renderers based on gd
+Requires:	graphviz = %{version}-%{release}
+
+%description gd
+graphviz plugin for renderers based on gd
+
+%files gd
+%{_libdir}/graphviz/libgvplugin_gd.so.*
+
+# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
+%post gd
+%{_bindir}/dot -c
+
+# if there is not dot after everything else is done, the remove config
+%postun gd
+if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/graphviz/config; fi
+
+#-- graphviz-sharp rpm --------------------------------------------
+%if %{SHARP}
+%package sharp
+Group:		Applications/Multimedia
+Summary:	C# extension for graphviz
+Requires:	graphviz = %{version}-%{release} mono-core
+
+%description sharp
+C# extension for graphviz.
+
+%files sharp
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/sharp
+%{_libdir}/graphviz/sharp/*
+%endif
+
+#-- graphviz-guile rpm --------------------------------------------
+%if %{GUILE}
+%package guile
+Group:		Applications/Multimedia
+Summary:	Guile extension for graphviz
+Requires:	graphviz = %{version}-%{release} guile
+
+%description guile
+Guile extension for graphviz.
+
+%files guile
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/guile
+%{_libdir}/graphviz/guile/*
+%endif
+
+#-- graphviz-io rpm -----------------------------------------------
+%if %{_IO}
+%package io
+Group:		Applications/Multimedia
+Summary:	Io extension for graphviz
+Requires:	graphviz = %{version}-%{release} io
+
+%description io
+Io extension for graphviz.
+
+%files io
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/io
+%{_libdir}/graphviz/io/*
+%endif
+
+#-- graphviz-java rpm ---------------------------------------------
+%if %{JAVA}
+%package java
+Group:		Applications/Multimedia
+Summary:	Java extension for graphviz
+Requires:	graphviz = %{version}-%{release} java
+
+%description java
+Java extension for graphviz.
+
+%files java
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/java
+%{_libdir}/graphviz/java/*
+%endif
+
+#-- graphviz-lua rpm ----------------------------------------------
+%if %{LUA}
+%package lua
+Group:		Applications/Multimedia
+Summary:	Lua extension for graphviz
+Requires:	graphviz = %{version}-%{release} lua
+
+%description lua
+Lua extension for graphviz.
+
+%files lua
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/lua
+%{_libdir}/graphviz/lua/*
+%endif
+
+#-- graphviz-ocaml rpm --------------------------------------------
+%if %{OCAML}
+%package ocaml
+Group:		Applications/Multimedia
+Summary:	Ocaml extension for graphviz
+Requires:	graphviz = %{version}-%{release} ocaml
+
+%description ocaml
+Ocaml extension for graphviz.
+
+%files ocaml
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/ocaml
+%{_libdir}/graphviz/ocaml/*
+%endif
+
+#-- graphviz-perl rpm ---------------------------------------------
+%if %{PERL}
+%package perl
+Group:		Applications/Multimedia
+Summary:	Perl extension for graphviz
+Requires:	graphviz = %{version}-%{release} perl
+
+%description perl
+Perl extension for graphviz.
+
+%files perl
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/perl
+%{_libdir}/graphviz/perl/*
+%endif
+
+#-- graphviz-php rpm ----------------------------------------------
+%if %{PHP}
+%package php
+Group:		Applications/Multimedia
+Summary:	PHP extension for graphviz
+Requires:	graphviz = %{version}-%{release} php
+
+%description php
+PHP extension for graphviz.
+
+%files php
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/php
+%{_libdir}/graphviz/php/*
+%endif
+
+#-- graphviz-python rpm -------------------------------------------
+%if %{PYTHON}
+%package python
+Group:		Applications/Multimedia
+Summary:	Python extension for graphviz
+Requires:	graphviz = %{version}-%{release} python
+
+%description python
+Python extension for graphviz.
+
+%files python
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/python
+%{_libdir}/graphviz/python/*
+%endif
+
+#-- graphviz-ruby rpm ---------------------------------------------
+%if %{RUBY}
+%package ruby
+Group:		Applications/Multimedia
+Summary:	Ruby extension for graphviz
+Requires:	graphviz = %{version}-%{release} ruby
+
+%description ruby
+Ruby extension for graphviz.
+
+%files ruby
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/ruby
+%{_libdir}/graphviz/ruby/*
+%endif
+
+#-- graphviz-tcl rpm ----------------------------------------------
+%if %{TCL}
+%package tcl
+Group:		Applications/Multimedia
+Summary:	Tcl extension & tools for graphviz
+Requires:	graphviz = %{version}-%{release} tcl >= 8.3 tk
+
+%description tcl
+Various tcl packages (extensions) for the graphviz tools.
+
+%files tcl
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/tcl
+%{_libdir}/graphviz/tcl/*
+%{_libdir}/graphviz/pkgIndex.tcl
+%{_datadir}/graphviz/demo
+%{_mandir}/mann/*.n*
+%endif
+
+#-- graphviz-devel rpm --------------------------------------------
+%package devel
+Group:		Development/Libraries
+Summary:	Development package for graphviz
+Requires:	graphviz = %{version}-%{release} pkgconfig
+
 %description devel
-A collection of tools and tcl packages for the manipulation and layout
+A collection of tools for the manipulation and layout
 of graphs (as in nodes and edges, not as in barcharts).
-This package contains development files for %{name}
+This package contains development files for graphviz.
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/graphviz
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_mandir}/man3/*.3*
+%exclude %{_libdir}/graphviz/*/*
+%exclude %{_libdir}/graphviz/libgvplugin*
+%exclude %{_libdir}/graphviz/*.so
+
+#-- graphviz-graphs rpm -------------------------------------------
+%package graphs
+Group:		Applications/Multimedia
+Summary:	Demo graphs for graphviz
+
+%description graphs
+Some demo graphs for graphviz.
+
+%files graphs
+%defattr(-,root,root,-)
+%dir %{_datadir}/graphviz
+%{_datadir}/graphviz/graphs
+
+#-- graphviz-doc rpm ----------------------------------------------
+%package doc
+Group:		Documentation
+Summary:	PDF and HTML documents for graphviz
+
+%description doc
+Provides some additional PDF and HTML documentation for graphviz.
+
+%files doc
+%defattr(-,root,root,-)
+%doc __doc/*
+
+#-- building --------------------------------------------------
 
 %prep
 %setup -q
-
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1 -b .CVE-2014-0978-CVE-2014-1235
+%patch3 -p1 -b .CVE-2014-1236
 
 %build
 # XXX ix86 only used to have -ffast-math, let's use everywhere
 %{expand: %%define optflags %{optflags} -ffast-math}
-%configure --with-x
+# %%configure is broken in RH7.3 rpmbuild
-make docdir=%{_docdir}/%{name} %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS" \
-
+./configure \
+	--prefix=%{_prefix} \
+	--bindir=%{_bindir} \
+	--libdir=%{_libdir} \
+	--includedir=%{_includedir} \
+	--datadir=%{_datadir} \
+	--mandir=%{_mandir} \
+	--with-x \
+	--disable-static \
+	--disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING}
+%__make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT __doc
-make \
+%{__make} \
-    DESTDIR=$RPM_BUILD_ROOT \
+	DESTDIR=$RPM_BUILD_ROOT \
-    docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \
+	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \
-    transform='s,x,x,' \
+	pkgconfigdir=%{_libdir}/pkgconfig \
 	install
-
+find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/*
+cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
+#-- changelog --------------------------------------------------
-%files
-%defattr(-,root,root)
-%doc AUTHORS COPYING MINTERMS.txt NEWS README
-%doc doc/*.html doc/*.pdf doc/*.ref
-%{_bindir}/*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/pkgIndex.tcl
-%{_libdir}/%{name}/*.so.*
-%{_mandir}/man1/*.1*
-%{_mandir}/mann/*.n*
-%{_datadir}/%{name}
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/%{name}
-%{_libdir}/%{name}/*.la
-%{_libdir}/%{name}/*.so
-%{_mandir}/man3/*.3*
-
 
 %changelog
-* Thu Jun  3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.12-0.fdr.2
+* Tue Nov 25 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.12-12
-- BuildRequire m4 to work around https://bugzilla.redhat.com/108655 on FC1.
+- Dropped format-string patch, not needed
 
-* Tue May 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.12-0.fdr.1
+* Tue Nov 25 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.12-11
-- Update to 1.12.
+- Fixed format string vulnerability
+  Resolves: rhbz#1167869
 
-* Tue Nov 11 2003 Dams <anvil[AT]livna.org> 0:1.10-0.fdr.3
+* Fri Jan 10 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.12-10
-- Applied patch to fix build on FC1
+- Prevent possible buffer overflow in yyerror()
+  Resolves: CVE-2014-1235
+- Fix possible buffer overflow problem in chkNum of scanner
+  Resolves: CVE-2014-1236
 
-* Sat Aug 23 2003 Dams <anvil[AT]livna.org> 0:1.10-0.fdr.2
+* Tue Jan  7 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.12-9
-- Hopefully fixed BuildRequires
+- Fixed overflow in yyerror
+  Resolves: CVE-2014-0978
+- Fixed malformed php5 patch due to distgit conversion
 
-* Sun Aug 17 2003 Dams <anvil[AT]livna.org> 0:1.10-0.fdr.2
+* Thu May 24 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-8
-- Added some BuildRequires to satisfy build conditions on severn.
+- Pulled spec from devel/
+- Adapted spec to build for EL-5 (thanks to Christopher Stone)
 
-* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 0:1.10-0.fdr.1
+* Sat May 05 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-7
-- Added _smp_mflags
+- Patch to fix BZ#237496
-- Removed "transform='s,x,x,'" configure arg
+- Disabling relocatability to work around BZ#237082
+- Disabling -ocaml and -sharp subpackages for ppc64 to remedy BZ#239078
 
-* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.10-0.fdr.1
+* Wed Feb 14 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-6
-- Update to 1.10.
+- Removed patch, as tcl/tk got rolled back to 8.4
-- BuildRequires expat-devel.
-- Include *.la (uses ltdl).
-- %%configure in %%build.
 
-* Thu Jul 10 2003 Dams <anvil[AT]livna.org> 0:1.9-0.fdr.1
+* Wed Feb 07 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-5
-- Updated to 1.9
+- Added patch for slightly broken tk 8.5
-- Split devel package
 
-* Tue Jul  8 2003 Dams <anvil[AT]livna.org> 0:1.7.14-0.fdr.1
+* Thu Feb 01 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-4
-- Applied fedora spec file look&feel
+- Bump-n-build due to tk upgrade
 
-* Tue Jan  1 2002 Jeff Johnson <jbj@redhat.com>
+* Wed Jan 24 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-3
-- update to 1.7.14.
+- Added running of /sbin/ldconfig in post/postun (and Reqs)
+- Minor edit to -gd summary
+- Removed explicit dependency on libgcj in -java
+- Added BR for ruby (not pulled in by ruby-devel!)
+- Cleanup of spaces/tabs to minimize rpmlint warnings
 
-* Wed Apr 25 2001 Jeff Johnson <jbj@redhat.com>
+* Wed Dec 13 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-2
-- repackage for powertools.
+- Use of RPM_INSTALL_PREFIX0 in %%post requires Prefix: to be set
-- simplify spec file.
+
-- add -ffast-math for all arch's, not just ix86.
+* Mon Dec 11 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-1
-- remove Requires: webfonts.
+- Fixed dist tag
+- Fixed minor typo in -lua description (BZ#218191)
+- Added upstream-supplied "php5" patch (due to newer swig)
+- Added BR: java-devel & R: java
+
+* Tue Sep 13 2005 John Ellson <ellson@research.att.com>
+- split out language bindings into their own rpms so that 
+  main rpm doesn't depend on (e.g.) ocaml
+
+* Sat Aug 13 2005 John Ellson <ellson@research.att.com>
+- imported various fixes from the Fedora-Extras .spec by Oliver Falk <oliver@linux-kernel.at>
+
+* Wed Jul 20 2005 John Ellson <ellson@research.att.com>
+- release 2.4

sources

@@ -1 +1 @@
-84910caae072c714d107ca9f3e54ace0  graphviz-1.12.tar.gz
+e5547bc0ec47943c72f5c3e2b5dff58f  graphviz-2.12.tar.gz