rpms/graphviz/FC-1 .cvsignore, 1.3, 1.4 graphviz.spec, 1.4, 1.5 sources, 1.3, 1.4

[Oliver Falk (oliver)]

Author: oliver

Update of /cvs/extras/rpms/graphviz/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32595/FC-1

Modified Files:
	.cvsignore graphviz.spec sources 
Log Message:
* Merge with devel, because of security bug: #170484 (CAN-2005-2961); Add missing dist-tag.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/graphviz/FC-1/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:31:13 -0000	1.3
+++ .cvsignore	17 Oct 2005 08:14:29 -0000	1.4
@@ -1 +1 @@
-graphviz-1.12.tar.gz
+graphviz-2.6.tar.gz


Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/FC-1/graphviz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- graphviz.spec	28 Sep 2005 16:44:05 -0000	1.4
+++ graphviz.spec	17 Oct 2005 08:14:29 -0000	1.5
@@ -1,80 +1,187 @@
-# Note: graphviz requires gd with gif support, hence use internal one for now.
+# $Id$ $Revision$
 
-Summary: 	Graph Visualization Tools
-Name: 		graphviz
-Version: 	1.12
-Release: 	0.fdr.2.1
-Epoch:		0
-Group: 		Applications/Multimedia
-License: 	AT&T open source (see COPYING)
-URL:  		http://www.graphviz.org/
-Source: 	http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-root
-BuildRequires:	zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel
-BuildRequires:	bison m4 flex tk tcl >= 0:8.3
-BuildRequires:	/usr/include/tcl.h /usr/include/tk.h
+Summary:			Graph Visualization Tools
+Name:				graphviz
+
+Version:			2.6
+Release:			1%{?dist}
+
+Group:				Applications/Multimedia
+License:			CPL
+
+URL:				http://www.graphviz.org/
+Source0:			http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
+
+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 libtool-ltdl-devel
+Requires(post):		%{_bindir}/dot
+Requires(postun):	%{_bindir}/dot
 Requires:			urw-fonts
 
-%package devel
-Summary: 	Development package for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{epoch}:%{version}-%{release}
+%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
 of graphs (as in nodes and edges, not as in barcharts).
 
+%description tcl
+Various tcl packages (extensions) for the %{name} tools.
+
 %description devel
 A collection of tools and tcl packages 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 %{name}.
 
+%description doc
+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 --with-x
-make docdir=%{_docdir}/%{name} %{?_smp_mflags}
+%configure	--with-x \
+			--with-mylibgd \
+			--disable-dependency-tracking \
+			--disable-static
 
+%{__make} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make \
-    DESTDIR=$RPM_BUILD_ROOT \
-    docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \
-    transform='s,x,x,' \
-	install
 
+%{__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 MINTERMS.txt NEWS README
-%doc doc/*.html doc/*.pdf doc/*.ref
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/*
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/pkgIndex.tcl
 %{_libdir}/%{name}/*.so.*
 %{_mandir}/man1/*.1*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/lefty
+#%exclude %{_libdir}/%{name}/lib*tcl*.so.*
+#%exclude %{_libdir}/%{name}/libtk*.so.*
+#%exclude %{_includedir}/ltdl*
+#%exclude %{_libdir}/libltdl*
+
+%files tcl
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/lib*tcl*.so.*.*
+%{_libdir}/%{name}/libtk*.so.*.*
+%{_libdir}/%{name}/pkgIndex.tcl
+%{_datadir}/%{name}/demo
 %{_mandir}/mann/*.n*
-%{_datadir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
 %{_libdir}/%{name}/*.la
 %{_libdir}/%{name}/*.so
+%{_libdir}/pkgconfig/*.pc
 %{_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/*
 
+# 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 Aug 29 2005 Oliver Falk <oliver at linux-kernel.at>		- 2.6-1
+- Update
+
+* Mon Aug 22 2005 Oliver Falk <oliver at linux-kernel.at>		- 2.4-2
+- Bug #163840
+
+* Thu Aug 11 2005 Oliver Falk <oliver at linux-kernel.at>		- 2.4-1
+- Update
+- Took over maintainership
+- Merge with spec provided within source tarball
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.2.1-2
+- rebuild on all arches
+
+* Fri Apr  7 2005 John Ellson <ellson at 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 at 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 at 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
 - BuildRequire m4 to work around https://bugzilla.redhat.com/108655 on FC1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/graphviz/FC-1/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:31:13 -0000	1.3
+++ sources	17 Oct 2005 08:14:29 -0000	1.4
@@ -1 +1 @@
-84910caae072c714d107ca9f3e54ace0  graphviz-1.12.tar.gz
+0d61fc4f8660be31503d4f9ab6f26bf0  graphviz-2.6.tar.gz