From cf619ee4212dc34e66108dfec17303636ad1d786 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Thu, 11 Aug 2005 09:24:26 +0000 Subject: [PATCH] - Update - Took over maintainership - Merge with spec provided within source tarball --- .cvsignore | 2 +- graphviz.spec | 109 ++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 58 insertions(+), 55 deletions(-) diff --git a/.cvsignore b/.cvsignore index a424523..dd0982c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -graphviz-2.2.1.tar.gz +graphviz-2.4.tar.gz diff --git a/graphviz.spec b/graphviz.spec index bced61c..c4f4775 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,38 +1,41 @@ -# Note: graphviz requires gd with gif support (and other fixes), hence use -# internal one for now. +Summary: Graph Visualization Tools +Name: graphviz -Summary: Graph Visualization Tools -Name: graphviz -Version: 2.2.1 -Release: 2 +Version: 2.4 +Release: 1 -Group: Applications/Multimedia -License: CPL -URL: http://www.graphviz.org/ -Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.1.tar.gz -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel -BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 -BuildRequires: /usr/include/tcl.h /usr/include/tk.h +Group: Applications/Multimedia +License: CPL -%package tcl -Group: Applications/Multimedia -Summary: Tcl extension tools for %{name} -Requires: %{name} = %{version}-%{release} tcl >= 8.3 tk +URL: http://www.graphviz.org/ +Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz -%package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} pkgconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%package doc -Summary: PDF and HTML documents for %{name} -Group: Documentation +BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2 +BuildRequires: /bin/ksh bison m4 flex +BuildRequires: tcl-devel >= 8.3 +BuildRequires: tk-devel +BuildRequires: fontconfig-devel xorg-x11-devel +BuildRequires: php-devel guile-devel -%package graphs -Summary: Demo graphs for %{name} -Group: Applications/Multimedia +%package tcl +Summary: Tcl extension tools for %{name} +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} tcl >= 8.3 tk +%package devel +Summary: Development package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} pkgconfig + +%package doc +Summary: PDF and HTML documents for %{name} +Group: Documentation + +%package graphs +Summary: Demo graphs for %{name} +Group: Applications/Multimedia %description A collection of tools and tcl packages for the manipulation and layout @@ -52,46 +55,36 @@ Provides some additional PDF and HTML documentation for %{name}. %description graphs Some demo graphs for %{name}. - %prep %setup -q - %build # 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 -# 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} +%configure --with-x \ + --with-mylibgd \ + --disable-dependency-tracking + +%{__make} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT __doc -make \ + +%{__make} \ DESTDIR=$RPM_BUILD_ROOT \ + docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \ pkgconfigdir=%{_libdir}/pkgconfig \ transform='s,x,x,' \ 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 rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README @@ -103,8 +96,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/lefty %exclude %{_libdir}/%{name}/lib*tcl*.so.* %exclude %{_libdir}/%{name}/libtk*.so.* -%exclude %{_bindir}/dotneato-config -%exclude %{_mandir}/man1/dotneato-config.1* +%exclude %{_includedir}/ltdl* +%exclude %{_libdir}/libltdl* %files tcl %defattr(-,root,root,-) @@ -113,17 +106,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/pkgIndex.tcl %{_datadir}/%{name}/demo %{_mandir}/mann/*.n* -%exclude %{_libdir}/%{name}/lib*tcl*.so.? -%exclude %{_libdir}/%{name}/libtk*.so.? %files devel %defattr(-,root,root,-) -%{_bindir}/dotneato-config %{_includedir}/%{name} %{_libdir}/%{name}/*.la %{_libdir}/%{name}/*.so %{_libdir}/pkgconfig/*.pc -%{_mandir}/man1/dotneato-config.1* %{_mandir}/man3/*.3* %exclude %{_libdir}/%{name}/lib*tcl*.* %exclude %{_libdir}/%{name}/libtk*.* @@ -137,8 +126,22 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc __doc/* +# run "dot -V" to generate plugin config in %{_libdir}/%{name}/config +%post +%{_bindir}/dot -V 2>/dev/null + +%post tcl +%{_bindir}/dot -V 2>/dev/null + +%post devel +%{_bindir}/dot -V 2>/dev/null %changelog +* Thu Aug 11 2005 Oliver Falk - 2.4-1 +- Update +- Took over maintainership +- Merge with spec provided within source tarball + * Sun May 22 2005 Jeremy Katz - 2.2.1-2 - rebuild on all arches diff --git a/sources b/sources index a9bf153..b30033c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb46d8ada39436cb672922f0c8b1339c graphviz-2.2.1.tar.gz +f1074d38a7eeb5e5b2ebfdb643aebf8a graphviz-2.4.tar.gz