rpms/graphviz/FC-4 .cvsignore, 1.5, 1.6 graphviz.spec, 1.11, 1.12 sources, 1.5, 1.6
Oliver Falk (oliver)
fedora-extras-commits at redhat.com
Mon Oct 17 08:08:58 UTC 2005
Author: oliver
Update of /cvs/extras/rpms/graphviz/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32239
Modified Files:
.cvsignore graphviz.spec sources
Log Message:
* Merge with devel, because of security bug: #170484 (CAN-2005-2961)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/graphviz/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 16 Apr 2005 19:16:43 -0000 1.5
+++ .cvsignore 17 Oct 2005 08:08:38 -0000 1.6
@@ -1 +1 @@
-graphviz-2.2.1.tar.gz
+graphviz-2.6.tar.gz
Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/FC-4/graphviz.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- graphviz.spec 28 Sep 2005 16:44:11 -0000 1.11
+++ graphviz.spec 17 Oct 2005 08:08:38 -0000 1.12
@@ -1,39 +1,45 @@
-# Note: graphviz requires gd with gif support (and other fixes), hence use
-# internal one for now.
+# $Id$ $Revision$
-Summary: Graph Visualization Tools
-Name: graphviz
-Version: 2.2.1
-Release: 2
-
-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
-Requires: urw-fonts
+Summary: Graph Visualization Tools
+Name: graphviz
+
+Version: 2.6
+Release: 1
+
+Group: Applications/Multimedia
+License: CPL
+
+URL: http://www.graphviz.org/
+Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
-%package tcl
-Group: Applications/Multimedia
-Summary: Tcl extension tools for %{name}
-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
+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 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
@@ -53,46 +59,32 @@
%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
@@ -102,10 +94,10 @@
%{_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,-)
@@ -114,20 +106,16 @@
%{_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,-)
@@ -138,8 +126,28 @@
%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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/graphviz/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 16 Apr 2005 19:16:43 -0000 1.5
+++ sources 17 Oct 2005 08:08:38 -0000 1.6
@@ -1 +1 @@
-bb46d8ada39436cb672922f0c8b1339c graphviz-2.2.1.tar.gz
+0d61fc4f8660be31503d4f9ab6f26bf0 graphviz-2.6.tar.gz
More information about the fedora-extras-commits
mailing list