Compare commits

...

8 Commits
rawhide ... f8

Author SHA1 Message Date
Fedora Release Engineering fff9da2729 dist-git conversion 2010-07-28 17:01:26 +00:00
Bill Nottingham ca19a666ba Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 02:03:00 +00:00
Tom Callaway 7e0bdd839d fix conditional comparison 2008-07-07 18:11:27 +00:00
Jesse Keating b2ded913a1 Initialize branch F-8 for graphviz 2007-10-20 16:49:45 +00:00
Patrick Laughton acbab6d307 - Patch to resurrect arith.h 2007-09-05 03:07:20 +00:00
Patrick Laughton 09a99bb6d0 - Added perl-devel to BR for F7+
New upstream release (2.14.1), and returning to using upstream's
    graphviz.spec (he gives it more love than I could ever hope to).
This time let's actually commit the new graphviz.spec. :-)
2007-08-23 16:40:18 +00:00
Patrick Laughton f7a4a4bb77 - Added perl-devel to BR for F7+
New upstream release (2.14.1), and returning to using upstream's
    graphviz.spec (he gives it more love than I could ever hope to).
2007-08-23 16:37:55 +00:00
Patrick Laughton 6c8ab90b85 - Patch to fix BZ#241790 (thanks John!) 2007-07-12 19:43:18 +00:00
7 changed files with 310 additions and 214 deletions

View File

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

1
.gitignore vendored Normal file
View File

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

View File

@ -1,21 +0,0 @@
# Makefile for source rpm: graphviz
# $Id: Makefile,v 1.1 2004/11/08 04:30:23 cvsextras Exp $
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/Root && { 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)

29
graphviz-arith.patch Normal file
View File

@ -0,0 +1,29 @@
Index: lib/common/Makefile.am
===================================================================
RCS file: /home/cvsroot/graphviz2/lib/common/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lib/common/Makefile.am 26 Jul 2007 13:53:25 -0000 1.46
+++ lib/common/Makefile.am 4 Sep 2007 23:39:07 -0000 1.47
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.46 2007/07/26 13:53:25 erg Exp $ $Revision: 1.46 $
+# $Id: Makefile.am,v 1.47 2007/09/04 23:39:07 ellson Exp $ $Revision: 1.47 $
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
@@ -14,11 +14,10 @@
AM_CFLAGS = -D_BLD_common=1
endif
-pkginclude_HEADERS = geom.h color.h types.h textpara.h usershape.h
+pkginclude_HEADERS = arith.h geom.h color.h types.h textpara.h usershape.h
noinst_HEADERS = render.h utils.h memory.h \
- geomprocs.h colorprocs.h colortbl.h entities.h \
- logic.h arith.h globals.h \
- const.h macros.h htmllex.h htmltable.h pointset.h
+ geomprocs.h colorprocs.h colortbl.h entities.h globals.h \
+ logic.h const.h macros.h htmllex.h htmltable.h pointset.h
noinst_LTLIBRARIES = libcommon_C.la
if WITH_CODEGENS

29
graphviz-black.patch Normal file
View File

@ -0,0 +1,29 @@
--- graphviz-2.12/lib/common/colxlate.c.orig 2006-07-26 22:44:05.000000000 -0500
+++ graphviz-2.12/lib/common/colxlate.c 2007-07-12 14:07:13.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Id: graphviz-black.patch,v 1.1 2007/07/12 19:43:18 jima Exp $ $Revision: 1.1 $ */
+/* $Id: graphviz-black.patch,v 1.1 2007/07/12 19:43:18 jima Exp $ $Revision: 1.1 $ */
/* vim:set shiftwidth=4 ts=8: */
/**********************************************************
@@ -180,6 +180,10 @@
/* resolveColor:
* Resolve input color str allowing color scheme namespaces.
+ * 0) "black" => "black"
+ * NB: This is something of a hack due to the remaining codegen.
+ * Once these are gone, this case could be removed and all references
+ * to "black" could be replaced by "/X11/black".
* 1) No initial / =>
* if colorscheme is defined and no "X11", return /colorscheme/str
* else return str
@@ -214,7 +218,8 @@
char* ss; /* second slash */
char* c2; /* second char */
- if (*str == '/') { /* if begins with '/' */
+ if ((*str == 'b') || !strncmp(str+1,"lack",4)) return str;
+ else if (*str == '/') { /* if begins with '/' */
c2 = str+1;
if ((ss = strchr(c2, '/'))) { /* if has second '/' */
if (*c2 == '/') { /* if second '/' is second character */

View File

@ -1,23 +1,24 @@
# $Id: graphviz.spec.in,v 1.96 2006/10/24 13:46:11 ellson Exp $ $Revision: 1.96 $
# $Id: graphviz.spec.in,v 1.117 2007/08/16 01:53:22 ellson Exp $ $Revision: 1.117 $
# graphviz.spec. Generated from graphviz.spec.in by configure.
# Note: graphviz requires gd with gif support (and other fixes), hence use
# internal one for now.
# Note: pre gd-2.0.34 graphviz uses its own gd tree with gif support and other fixes
#-- graphviz src.rpm --------------------------------------------------------
#-- Global graphviz rpm and src.rpm tags-------------------------------------
Name: graphviz
Version: 2.12
Release: 7%{?dist}
Summary: Graph Visualization Tools
Version: 2.14.1
%define truerelease 4
%{?distroagnostic: %define release %{truerelease}}
%{!?distroagnostic: %define release %{truerelease}%{?dist}}
Release: %{?release}
Group: Applications/Multimedia
License: CPL
URL: http://www.graphviz.org/
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz
Patch0: %{name}-php5.patch
Patch1: %{name}-libcdt.patch
# graphviz is relocatable
#Prefix: /usr
# not until we can figure out why relocatabilty is broken
Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.14.1.tar.gz
Patch0: %{name}-arith.patch
#-- feature and package selection -------------------------------------------
# depends on %dist and %fedora (or %rhl or %rhel) which are set
@ -38,6 +39,7 @@ Patch1: %{name}-libcdt.patch
%define IPSEPCOLA --without-ipsepcola
%define MYLIBGD --with-mylibgd
%define MING --without-ming
%define PANGOCAIRO --without-pangocairo
# SuSE uses a different mechanism to generate BuildRequires
# norootforbuild
@ -53,74 +55,87 @@ BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig
# base packages which are always BR'd anyway (above).
BuildRequires: /usr/include/tcl.h /usr/include/tk.h
#-- Red Hat Linux specific Build Requirements -------------------------------
%if 0%{?rhl}
%define PERL 1
%define TCL 1
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"
#-- Red Hat Enterprise Linux specific Build Requirements --------------------
%if 0%{?rhel}
%define TCL 1
%if 0%{?rhel} < 4
BuildRequires: XFree86-devel
%endif
%if 0%{?rhel} >= 3
%define IPSEPCOLA --with-ipsepcola
BuildRequires: fontconfig-devel tcl-devel tk-devel
%endif
%if "%rhel" >= "4"
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
%if 0%{?rhel} >= 4
# PERL is available earlier, but a suitable SWIG isn't
%define PERL 1
%define PHP 1
%define RUBY 1
BuildRequires: xorg-x11-devel php-devel ruby ruby-devel
%define GUILE 1
%define PYTHON 1
BuildRequires: perl php-devel ruby ruby-devel guile-devel python-devel
%endif
%if "%rhel" >= "5"
BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel
%if 0%{?rhel} >= 5
%define JAVA 1
%define PANGOCAIRO --with-pangocairo
BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel
BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel
%endif
%endif
#-- Fedora specific Build Requirements --------------------------------------
%if 0%{?fedora}
%define PERL 1
%define TCL 1
BuildRequires: fontconfig-devel tcl-devel tk-devel
%if "%fedora" < "3"
%if 0%{?fedora} < 3
BuildRequires: XFree86-devel
%endif
%if "%fedora" == "3"
%if 0%{?fedora} == 3
BuildRequires: xorg-x11-devel
%endif
%if "%fedora" == "4"
%if 0%{?fedora} == 4
BuildRequires: xorg-x11-devel
%endif
%if "%fedora" >= "3"
%if 0%{?fedora} >= 3
%define IPSEPCOLA --with-ipsepcola
%endif
%if "%fedora" >= "4"
%if 0%{?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
BuildRequires: libtool-ltdl libtool-ltdl-devel php-devel ruby ruby-devel guile-devel python-devel
%endif
%if 0%{?fedora} >= 5
%define JAVA 1
BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel
%ifnarch ppc64
%define SHARP 1
%define OCAML 1
BuildRequires: mono-core ocaml
%endif
%endif
%if "%fedora" >= "6"
%if 0%{?fedora} >= 6
%define LUA 1
BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel
%define PANGOCAIRO --with-pangocairo
BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel
%endif
%if 0%{fedora} >= 7
BuildRequires: gd gd-devel perl-devel
%define MYLIBGD --without-mylibgd
%endif
%endif
#-- graphviz rpm --------------------------------------------------
Group: Applications/Multimedia
Summary: Graph Visualization Tools
#-- main graphviz rpm ------------------------------------------------
Requires: urw-fonts
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@ -129,6 +144,18 @@ Requires(postun): /sbin/ldconfig
A collection of tools for the manipulation and layout
of graphs (as in nodes and edges, not as in barcharts).
# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
%post
/sbin/ldconfig
%{_bindir}/dot -c
# if there is no dot after everything else is done, then remove config
%postun
if [ $1 -eq 0 ]; then
rm -f %{_libdir}/graphviz/config || :
fi
/sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
@ -137,40 +164,37 @@ of graphs (as in nodes and edges, not as in barcharts).
%{_libdir}/*.so.*
%{_libdir}/graphviz/*.so.*
%{_mandir}/man1/*.1*
%{_mandir}/man7/*.7*
%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}
Requires(post): %{_bindir}/dot /sbin/ldconfig
Requires(postun): %{_bindir}/dot /sbin/ldconfig
%description gd
graphviz plugin for renderers based on gd
%files gd
%{_libdir}/graphviz/libgvplugin_gd.so.*
Graphviz plugin for renderers based on gd. (Unless you absolutely have
to use GIF, you are recommended to use the PNG format instead because
of the better quality anti-aliased lines provided by the cairo+pango
based renderer.)
# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
%post gd
/sbin/ldconfig
%{_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
/sbin/ldconfig
[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || :
%files gd
%{_libdir}/graphviz/libgvplugin_gd.so.*
#-- graphviz-sharp rpm --------------------------------------------
%if %{SHARP}
@ -186,6 +210,7 @@ C# extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/sharp
%{_libdir}/graphviz/sharp/*
%{_mandir}/mann/gv_sharp.n*
%endif
#-- graphviz-guile rpm --------------------------------------------
@ -202,6 +227,7 @@ Guile extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/guile
%{_libdir}/graphviz/guile/*
%{_mandir}/mann/gv_guile.n*
%endif
#-- graphviz-io rpm -----------------------------------------------
@ -218,6 +244,7 @@ Io extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/io
%{_libdir}/graphviz/io/*
%{_mandir}/mann/gv_io.n*
%endif
#-- graphviz-java rpm ---------------------------------------------
@ -234,6 +261,7 @@ Java extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/java
%{_libdir}/graphviz/java/*
%{_mandir}/mann/gv_java.n*
%endif
#-- graphviz-lua rpm ----------------------------------------------
@ -250,6 +278,7 @@ Lua extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/lua
%{_libdir}/graphviz/lua/*
%{_mandir}/mann/gv_lua.n*
%endif
#-- graphviz-ocaml rpm --------------------------------------------
@ -266,6 +295,7 @@ Ocaml extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/ocaml
%{_libdir}/graphviz/ocaml/*
%{_mandir}/mann/gv_ocaml.n*
%endif
#-- graphviz-perl rpm ---------------------------------------------
@ -282,6 +312,7 @@ Perl extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/perl
%{_libdir}/graphviz/perl/*
%{_mandir}/mann/gv_perl.n*
%endif
#-- graphviz-php rpm ----------------------------------------------
@ -298,6 +329,7 @@ PHP extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/php
%{_libdir}/graphviz/php/*
%{_mandir}/mann/gv_php.n*
%endif
#-- graphviz-python rpm -------------------------------------------
@ -314,6 +346,7 @@ Python extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/python
%{_libdir}/graphviz/python/*
%{_mandir}/mann/gv_python.n*
%endif
#-- graphviz-ruby rpm ---------------------------------------------
@ -330,6 +363,7 @@ Ruby extension for graphviz.
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz/ruby
%{_libdir}/graphviz/ruby/*
%{_mandir}/mann/gv_ruby.n*
%endif
#-- graphviz-tcl rpm ----------------------------------------------
@ -348,7 +382,10 @@ Various tcl packages (extensions) for the graphviz tools.
%{_libdir}/graphviz/tcl/*
%{_libdir}/graphviz/pkgIndex.tcl
%{_datadir}/graphviz/demo
%{_mandir}/mann/*.n*
# hack to include gv_tcl.n only if available
# always includes tcldot.n, gdtclft.n
%{_mandir}/mann/*tcl*.n*
%{_mandir}/mann/tkspline.n*
%endif
#-- graphviz-devel rpm --------------------------------------------
@ -401,12 +438,46 @@ Provides some additional PDF and HTML documentation for graphviz.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch0 -p0
%build
%if ! %{SHARP}
%define NO_SHARP --disable-sharp
%endif
%if ! %{GUILE}
%define NO_GUILE --disable-guile
%endif
%if ! %{_IO}
%define NO_IO --disable-io
%endif
%if ! %{JAVA}
%define NO_JAVA --disable-java
%endif
%if ! %{LUA}
%define NO_LUA --disable-lua
%endif
%if ! %{OCAML}
%define NO_OCAML --disable-ocaml
%endif
%if ! %{PERL}
%define NO_PERL --disable-perl
%endif
%if ! %{PHP}
%define NO_PHP --disable-php
%endif
%if ! %{PYTHON}
%define NO_PYTHON --disable-python
%endif
%if ! %{RUBY}
%define NO_RUBY --disable-ruby
%endif
%if ! %{TCL}
%define NO_TCL --disable-tcl
%endif
# XXX ix86 only used to have -ffast-math, let's use everywhere
%{expand: %%define optflags %{optflags} -ffast-math}
# %%configure is broken in RH7.3 rpmbuild
CFLAGS="$RPM_OPT_FLAGS" \
./configure \
@ -418,57 +489,45 @@ CFLAGS="$RPM_OPT_FLAGS" \
--mandir=%{_mandir} \
--with-x \
--disable-static \
--disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING}
%__make %{?_smp_mflags}
--disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING} %{PANGOCAIRO} \
%{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} \
%{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_RUBY} %{?NO_TCL}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT __doc
%{__make} \
DESTDIR=$RPM_BUILD_ROOT \
docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \
rm -rf %{buildroot} __doc
make DESTDIR=%{buildroot} \
docdir=%{buildroot}%{_docdir}/%{name} \
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
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
chmod -x %{buildroot}%{_datadir}/%{name}/lefty/*
cp -a %{buildroot}%{_datadir}/%{name}/doc __doc
rm -rf %{buildroot}%{_datadir}/%{name}/doc
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{buildroot}
#-- changelog --------------------------------------------------
%changelog
* Sat May 05 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-7
- Patch to fix BZ#237496
- Disabling relocatability to work around BZ#237082
- Disabling -ocaml and -sharp subpackages for ppc64 to remedy BZ#239078
* Mon Jul 07 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.14.1-4
- fix conditional comparison
* Wed Feb 14 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-6
- Removed patch, as tcl/tk got rolled back to 8.4
* Tue Sep 04 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.14.1-3
- Patch to resurrect arith.h
* Wed Feb 07 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-5
- Added patch for slightly broken tk 8.5
* Thu Feb 01 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-4
- Bump-n-build due to tk upgrade
* Wed Jan 24 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-3
- 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 Dec 13 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-2
- Use of RPM_INSTALL_PREFIX0 in %%post requires Prefix: to be set
* Mon Dec 11 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-1
- 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
* Thu Aug 23 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.14.1-2
- Added perl-devel to BR for F7+
* Wed Aug 15 2007 John Ellson <ellson@research.att.com>
- release 2.14.1 - see ChangeLog for details
* Wed Aug 2 2007 John Ellson <ellson@research.att.com>
- release 2.14 - see ChangeLog for details
* Fri Mar 16 2007 Stephen North <north@research.att.com>
- remove xorg-X11-devel from rhel >= 5
* Mon Dec 11 2006 John Ellson <john.ellson@comcast.net>
- fix graphviz-lua description (Fedora BZ#218191)
* 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

View File

@ -1 +1 @@
e5547bc0ec47943c72f5c3e2b5dff58f graphviz-2.12.tar.gz
0c56ba28d4e24f3ddd5e8fdb58deba70 graphviz-2.14.1.tar.gz