dist-git conversion

#2781)

.cvsignore

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

.gitignore

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

Makefile

@@ -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)

graphviz.spec

@@ -1,38 +1,45 @@
-# Note: graphviz requires gd with gif support (and other fixes), hence use
-# internal one for now.
+# $Id: graphviz.spec,v 1.11 2007/09/10 13:17:08 jima Exp $ $Revision: 1.11 $
 
-Summary: 	Graph Visualization Tools
-Name: 		graphviz
-Version: 	2.2
-Release: 	3
-Epoch:		0
-Group: 		Applications/Multimedia
-License: 	CPL
-URL:  		http://www.graphviz.org/
-Source: 	http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.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 >= 0:8.3
-BuildRequires:	/usr/include/tcl.h /usr/include/tk.h
+Summary:			Graph Visualization Tools
+Name:				graphviz
 
-%package tcl
-Group:          Applications/Multimedia
-Summary:        Tcl extension tools for %{name}
-Requires:       %{name} = %{epoch}:%{version}-%{release} tcl >= 0:8.3 tk
+Version:			2.6
+Release:			4%{?dist}
 
-%package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release} pkgconfig
+Group:				Applications/Multimedia
+License:			CPL
 
-%package doc
-Group:          Documentation
-Summary:        PDF and HTML documents for %{name}
+URL:				http://www.graphviz.org/
+Source0:			http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
 
-%package graphs
-Group:          Applications/Multimedia
-Summary:        Demo graphs for %{name}
+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 tcl-devel >= 8.3 tk-devel swig
+BuildRequires:		/usr/include/tcl.h /usr/include/tk.h
+BuildRequires:		php-devel guile-devel
+BuildRequires:		fontconfig-devel xorg-x11-devel
+Requires(post):		%{_bindir}/dot
+Requires(postun):	%{_bindir}/dot
+Requires:			urw-fonts
+
+%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 +59,32 @@ 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 \
+			--disable-static
 
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT __doc
-make \
-    DESTDIR=$RPM_BUILD_ROOT \
-    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
+rm -rf $RPM_BUILD_ROOT
 
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
+#    docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \
+#    pkgconfigdir=%{_libdir}/pkgconfig \
+#    install
+
+#chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/*
+mv $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
@@ -101,10 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_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*
+#%exclude %{_libdir}/%{name}/lib*tcl*.so.*
+#%exclude %{_libdir}/%{name}/libtk*.so.*
+%exclude %{_includedir}/ltdl*
+%exclude %{_libdir}/libltdl*
 
 %files tcl
 %defattr(-,root,root,-)
@@ -113,20 +106,16 @@ 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*.*
+#%exclude %{_libdir}/%{name}/lib*tcl*.*
+#%exclude %{_libdir}/%{name}/libtk*.*
 
 %files graphs
 %defattr(-,root,root,-)
@@ -137,8 +126,46 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc __doc/*
 
+# run "dot -c" to generate plugin config in %{_libdir}/%{name}/config
+%post
+%{_bindir}/dot -c
+
+%post tcl
+%{_bindir}/dot -c
+
+%post devel
+%{_bindir}/dot -c
 
 %changelog
+* Mon Sep 10 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.6-4
+- Bump-n-build to fix libperl.so dependency
+
+* Thu Jul 19 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.6-3
+- Uncommenting %%excludes to exclude erroneously installed ltdl libs
+
+* Thu Jul 19 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.6-2
+- Hoping BR on libtool-ltdl-devel is non-fatal (not found in EL-4)
+
+* Mon Aug 29 2005 Oliver Falk <oliver@linux-kernel.at>		- 2.6-1
+- Update
+
+* Mon Aug 22 2005 Oliver Falk <oliver@linux-kernel.at>		- 2.4-2
+- Bug #163840
+
+* Thu Aug 11 2005 Oliver Falk <oliver@linux-kernel.at>		- 2.4-1
+- Update
+- Took over maintainership
+- Merge with spec provided within source tarball
+
+* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 2.2.1-2
+- rebuild on all arches
+
+* Fri Apr  7 2005 John Ellson <ellson@research.att.com> - 2.2.1-1
+- update to graphviz-2.2.1
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * 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
@@ -154,7 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 - Fix lefty/* permissions.
 
 * Sat Jan 22 2005 John Ellson <ellson@research.att.com> - 0:2.2-1
-- Updated to 2.2 
+- Updated to 2.2
 - split out:
     graphviz-docs    - optional and large
     graphviz-graphs  - optional demo graphs

sources

@@ -1 +1 @@
-9275d30695a5c22f360acbef7b85acd3  graphviz-2.2.tar.gz
+0d61fc4f8660be31503d4f9ab6f26bf0  graphviz-2.6.tar.gz