Update to 2.2, thanks to John Ellison (#143122).

This commit is contained in:
Ville Skyttä 2005-01-23 16:27:43 +00:00
parent d1fe578d9d
commit c020f9b5ac
3 changed files with 109 additions and 19 deletions

View File

@ -1 +1 @@
graphviz-1.12.tar.gz graphviz-2.2.tar.gz

View File

@ -1,32 +1,56 @@
# Note: graphviz requires gd with gif support, hence use internal one for now. # Note: graphviz requires gd with gif support (and other fixes), hence use
# internal one for now.
Summary: Graph Visualization Tools Summary: Graph Visualization Tools
Name: graphviz Name: graphviz
Version: 1.12 Version: 2.2
Release: 2 Release: 3
Epoch: 0 Epoch: 0
Group: Applications/Multimedia Group: Applications/Multimedia
License: AT&T open source (see COPYING) License: CPL
URL: http://www.graphviz.org/ URL: http://www.graphviz.org/
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel
BuildRequires: bison m4 flex tk tcl >= 0:8.3 BuildRequires: /bin/ksh bison m4 flex tk tcl >= 0:8.3
BuildRequires: /usr/include/tcl.h /usr/include/tk.h BuildRequires: /usr/include/tcl.h /usr/include/tk.h
%package tcl
Group: Applications/Multimedia
Summary: Tcl extension tools for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release} tcl >= 0:8.3 tk
%package devel %package devel
Summary: Development package for %{name} Summary: Development package for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} pkgconfig
%package doc
Group: Documentation
Summary: PDF and HTML documents for %{name}
%package graphs
Group: Applications/Multimedia
Summary: Demo graphs for %{name}
%description %description
A collection of tools and tcl packages for the manipulation and layout A collection of tools and tcl packages for the manipulation and layout
of graphs (as in nodes and edges, not as in barcharts). of graphs (as in nodes and edges, not as in barcharts).
%description tcl
Various tcl packages (extensions) for the %{name} tools.
%description devel %description devel
A collection of tools and tcl packages for the manipulation and layout A collection of tools and tcl packages for the manipulation and layout
of graphs (as in nodes and edges, not as in barcharts). of graphs (as in nodes and edges, not as in barcharts).
This package contains development files for %{name} This package contains development files for %{name}.
%description doc
Provides some additional PDF and HTML documentation for %{name}.
%description graphs
Some demo graphs for %{name}.
%prep %prep
@ -36,17 +60,32 @@ This package contains development files for %{name}
%build %build
# XXX ix86 only used to have -ffast-math, let's use everywhere # XXX ix86 only used to have -ffast-math, let's use everywhere
%{expand: %%define optflags %{optflags} -ffast-math} %{expand: %%define optflags %{optflags} -ffast-math}
%configure --with-x # %%configure is broken in RH7.3 rpmbuild
make docdir=%{_docdir}/%{name} %{?_smp_mflags} # need unreleased changes to gd, so use --with-mylibgd for now.
CFLAGS="$RPM_OPT_FLAGS" \
./configure \
--prefix=%{_prefix} \
--bindir=%{_bindir} \
--libdir=%{_libdir} \
--includedir=%{_includedir} \
--datadir=%{_datadir} \
--mandir=%{_mandir} \
--with-x \
--with-mylibgd \
--disable-dependency-tracking
make %{?_smp_mflags}
%install %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} \ pkgconfigdir=%{_libdir}/pkgconfig \
transform='s,x,x,' \ transform='s,x,x,' \
install install
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 %clean
@ -54,26 +93,77 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root,-)
%doc AUTHORS COPYING MINTERMS.txt NEWS README %doc AUTHORS COPYING ChangeLog NEWS README
%doc doc/*.html doc/*.pdf doc/*.ref
%{_bindir}/* %{_bindir}/*
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%{_libdir}/%{name}/pkgIndex.tcl
%{_libdir}/%{name}/*.so.* %{_libdir}/%{name}/*.so.*
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/lefty
%exclude %{_libdir}/%{name}/lib*tcl*.so.*
%exclude %{_libdir}/%{name}/libtk*.so.*
%exclude %{_bindir}/dotneato-config
%exclude %{_mandir}/man1/dotneato-config.1*
%files tcl
%defattr(-,root,root,-)
%{_libdir}/%{name}/lib*tcl*.so.*.*
%{_libdir}/%{name}/libtk*.so.*.*
%{_libdir}/%{name}/pkgIndex.tcl
%{_datadir}/%{name}/demo
%{_mandir}/mann/*.n* %{_mandir}/mann/*.n*
%{_datadir}/%{name} %exclude %{_libdir}/%{name}/lib*tcl*.so.?
%exclude %{_libdir}/%{name}/libtk*.so.?
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/dotneato-config
%{_includedir}/%{name} %{_includedir}/%{name}
%{_libdir}/%{name}/*.la %{_libdir}/%{name}/*.la
%{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.so
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man1/dotneato-config.1*
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%exclude %{_libdir}/%{name}/lib*tcl*.*
%exclude %{_libdir}/%{name}/libtk*.*
%files graphs
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/graphs
%files doc
%defattr(-,root,root,-)
%doc __doc/*
%changelog %changelog
* Sun Jan 23 2005 John Ellson <ellson@research.att.com> - 0:2.2-3
- change BuildRequires to /bin/ksh, since ksh doesn't provide a /usr/bin/ksh
- change devel exclude to also exclude libtcl*.la
* Sat Jan 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2-2
- Move -doc back to %%{__docdir}, remove unused docdir=... from build.
- Own %%{_datadir}/%%{name} in -graphs.
- Require tcl and tk in -tcl.
- Require pkgconfig in -devel, fix *.pc install location.
- Build without dependency tracking.
- Honor $RPM_OPT_FLAGS again.
- Move dotneato-config to -devel.
- Fix lefty/* permissions.
* Sat Jan 22 2005 John Ellson <ellson@research.att.com> - 0:2.2-1
- Updated to 2.2
- split out:
graphviz-docs - optional and large
graphviz-graphs - optional demo graphs
graphviz-tcl - optional, of interest only to tcl users, requires tcl
- avoid use of %%configure which breaks on RH73
- add some pkgconfigs - probably in wrong place they're a bit experimental
so OK for now
- add BuildRequires /usr/bin/ksh (either pdksh or the real one)
* Thu Jun 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.12-0.fdr.2 * Thu Jun 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.12-0.fdr.2
- BuildRequire m4 to work around https://bugzilla.redhat.com/108655 on FC1. - BuildRequire m4 to work around https://bugzilla.redhat.com/108655 on FC1.

View File

@ -1 +1 @@
84910caae072c714d107ca9f3e54ace0 graphviz-1.12.tar.gz 9275d30695a5c22f360acbef7b85acd3 graphviz-2.2.tar.gz