rpms/graphviz/devel .cvsignore, 1.7, 1.8 graphviz.spec, 1.23, 1.24 sources, 1.7, 1.8
Oliver Falk (oliver)
fedora-extras-commits at redhat.com
Wed Feb 22 17:28:02 UTC 2006
Author: oliver
Update of /cvs/extras/rpms/graphviz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5986
Modified Files:
.cvsignore graphviz.spec sources
Log Message:
* Wed Feb 22 2006 Oliver Falk <oliver at linux-kernel.at> - 2.8-1
- Merge with specfile from Paul F. Johnson
- Update
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/graphviz/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 29 Aug 2005 08:13:23 -0000 1.7
+++ .cvsignore 22 Feb 2006 17:28:01 -0000 1.8
@@ -1 +1 @@
-graphviz-2.6.tar.gz
+graphviz-2.8.tar.gz
Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- graphviz.spec 13 Feb 2006 16:35:07 -0000 1.23
+++ graphviz.spec 22 Feb 2006 17:28:01 -0000 1.24
@@ -1,145 +1,347 @@
# $Id$ $Revision$
+# graphviz.spec. Generated from graphviz.spec.in by configure.
-Summary: Graph Visualization Tools
-Name: graphviz
+# Note: graphviz requires gd with gif support (and other fixes), hence use
+# internal one for now.
-Version: 2.6
-Release: 4%{?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 libtool-ltdl-devel
-BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel
-BuildRequires: libXt-devel libXmu-devel libXext-devel libX11-devel
-BuildRequires: ruby-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
+# Define a default set incase none of the conditionals apply
+%define SHARP 0
+%define GUILE 0
+%define _IO 0
+%define JAVA 0
+%define LUA 0
+%define OCAML 0
+%define PERL 0
+%define PHP 0
+%define PYTHON 0
+%define RUBY 0
+%define TCL 1
+
+# Select packages according to dist (set in .rpmmacros on each build host)
+
+# These are all single line conditional blocks because older versions
+# of rpm can't handle multiline blocks/
+
+%{?fc3: %{expand: %%define PERL 1}}
+%{?fc3: %{expand: %%define TCL 1}}
+
+%{?fc4: %{expand: %%define GUILE 1}}
+%{?fc4: %{expand: %%define PERL 1}}
+%{?fc4: %{expand: %%define PYTHON 1}}
+%{?fc4: %{expand: %%define RUBY 1}}
+%{?fc4: %{expand: %%define TCL 1}}
+
+%{?fc5: %{expand: %%define SHARP 1}}
+%{?fc5: %{expand: %%define GUILE 1}}
+%{?fc5: %{expand: %%define JAVA 1}}
+%{?fc5: %{expand: %%define LUA 1}}
+%{?fc5: %{expand: %%define OCAML 1}}
+%{?fc5: %{expand: %%define PERL 1}}
+%{?fc5: %{expand: %%define PHP 1}}
+%{?fc5: %{expand: %%define PYTHON 1}}
+%{?fc5: %{expand: %%define RUBY 1}}
+%{?fc5: %{expand: %%define TCL 1}}
+
+Summary: Graph Visualization Tools
+Name: graphviz
+Version: 2.8
+Release: 1%{?dist}
+Group: Applications/Multimedia
+License: CPL
+URL: http://www.graphviz.org/
+Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
+%{?fc5:Requires: urw-fonts}
+%{?fc4:Requires: urw-fonts}
+%{?fc3:Requires: urw-fonts}
+
+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 tk tcl >= 8.3 swig
+BuildRequires: tcl-devel tk-devel
+%{?fc5:BuildRequires: fontconfig-devel libtool-ltdl-devel}
+%{?fc5:BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel}
+%{?fc4:BuildRequires: fontconfig-devel xorg-x11-devel libtool-ltdl-devel}
+%{?fc3:BuildRequires: fontconfig-devel xorg-x11-devel}
%description
-A collection of tools and tcl packages for the manipulation and layout
+A collection of tools 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.
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_bindir}/*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.so.*
+%{_mandir}/man1/*.1*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/lefty
+%exclude %{_libdir}/%{name}/*/*
-%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}.
+#------------------------------------------------------------------
+%if %{SHARP}
+%package sharp
+Group: Applications/Multimedia
+Summary: C# extension for %{name}
+Requires: %{name} = %{version}-%{release}
-%description doc
-Provides some additional PDF and HTML documentation for %{name}.
+%description sharp
+C# extensions for %{name}.
-%description graphs
-Some demo graphs for %{name}.
+%files sharp
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}/sharp
+%{_libdir}/%{name}/sharp/*
+%endif
+
+#------------------------------------------------------------------
+%if %{GUILE}
+%package guile
+Group: Applications/Multimedia
+Summary: Guile extension for %{name}
+Requires: %{name} = %{version}-%{release}
-%prep
-%setup -q
+%description guile
+Guile extensions for %{name}.
-%build
-%configure --with-x \
- --with-mylibgd \
- --disable-dependency-tracking \
- --disable-static
+%files guile
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}/guile
+%{_libdir}/%{name}/guile/*
+%endif
+
+#------------------------------------------------------------------
+%if %{_IO}
+%package io
+Group: Applications/Multimedia
+Summary: Io extension for %{name}
+Requires: %{name} = %{version}-%{release}
-%{__make} %{?_smp_mflags}
+%description io
+Java extensions for %{name}.
-%install
-rm -rf $RPM_BUILD_ROOT
+%files io
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}/io
+%{_libdir}/%{name}/io/*
+%endif
+
+#------------------------------------------------------------------
+%if %{JAVA}
+%package java
+Group: Applications/Multimedia
+Summary: Java extension for %{name}
+Requires: %{name} = %{version}-%{release}
-%{__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
+%description java
+Java extensions for %{name}.
-%clean
-rm -rf $RPM_BUILD_ROOT
+%files java
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}/java
+%{_libdir}/%{name}/java/*
+%endif
+
+#------------------------------------------------------------------
+%if %{LUA}
+%package lua
+Group: Applications/Multimedia
+Summary: Lua extension for %{name}
+Requires: %{name} = %{version}-%{release}
-%files
+%description lua
+Java extensions for %{name}.
+
+%files lua
%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%{_bindir}/*
-%dir %{_libdir}/%{name}
-%{_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*
+%dir %{_libdir}/%{name}/lua
+%{_libdir}/%{name}/lua/*
+%endif
+
+#------------------------------------------------------------------
+%if %{OCAML}
+%package ocaml
+Group: Applications/Multimedia
+Summary: Ocaml extension for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description ocaml
+Ocaml extensions for %{name}.
+
+%files ocaml
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}/ocaml
+%{_libdir}/%{name}/ocaml/*
+%endif
+
+#------------------------------------------------------------------
+%if %{PERL}
+%package perl
+Group: Applications/Multimedia
+Summary: Perl extension for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description perl
+Perl extensions for %{name}.
+
+%files perl
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}/perl
+%{_libdir}/%{name}/perl/*
+%endif
+
+#------------------------------------------------------------------
+%if %{PHP}
+%package php
+Group: Applications/Multimedia
+Summary: PHP extension for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description php
+PHP extensions for %{name}.
+
+%files php
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}/php
+%{_libdir}/%{name}/php/*
+%endif
+
+#------------------------------------------------------------------
+%if %{PYTHON}
+%package python
+Group: Applications/Multimedia
+Summary: Python extension for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description python
+Python extensions for %{name}.
+
+%files python
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}/python
+%{_libdir}/%{name}/python/*
+%endif
+
+#------------------------------------------------------------------
+%if %{RUBY}
+%package ruby
+Group: Applications/Multimedia
+Summary: Ruby extension for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description ruby
+Ruby extensions for %{name}.
+
+%files ruby
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}/ruby
+%{_libdir}/%{name}/ruby/*
+%endif
+
+#------------------------------------------------------------------
+%if %{TCL}
+%package tcl
+Group: Applications/Multimedia
+Summary: Tcl extension & tools for %{name}
+Requires: %{name} = %{version}-%{release} tcl >= 8.3 tk
+
+%description tcl
+Various tcl packages (extensions) for the %{name} tools.
%files tcl
%defattr(-,root,root,-)
-%{_libdir}/%{name}/lib*tcl*.so.*.*
-%{_libdir}/%{name}/libtk*.so.*.*
+%dir %{_libdir}/%{name}/tcl
+%{_libdir}/%{name}/tcl/*
%{_libdir}/%{name}/pkgIndex.tcl
%{_datadir}/%{name}/demo
%{_mandir}/mann/*.n*
+%endif
+
+#------------------------------------------------------------------
+%package devel
+Group: Development/Libraries
+Summary: Development package for %{name}
+Requires: %{name} = %{version}-%{release} pkgconfig
+
+%description devel
+A collection of tools for the manipulation and layout
+of graphs (as in nodes and edges, not as in barcharts).
+This package contains development files for %{name}.
%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
-%{_libdir}/%{name}/*.la
+#%{_includedir}/ltdl.h
+#%{_libdir}/*.so*
%{_libdir}/%{name}/*.so
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/*.3*
-#%exclude %{_libdir}/%{name}/lib*tcl*.*
-#%exclude %{_libdir}/%{name}/libtk*.*
+%exclude %{_libdir}/%{name}/*/*
+#%exclude %{_libdir}/libltdl*
+
+#------------------------------------------------------------------
+%package graphs
+Group: Applications/Multimedia
+Summary: Demo graphs for %{name}
+
+%description graphs
+Some demo graphs for %{name}.
%files graphs
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/graphs
+#------------------------------------------------------------------
+%package doc
+Group: Documentation
+Summary: PDF and HTML documents for %{name}
+
+%description doc
+Provides some additional PDF and HTML documentation for %{name}.
+
%files doc
%defattr(-,root,root,-)
%doc __doc/*
+#------------------------------------------------------------------
+%prep
+%setup -q
+
+%build
+%configure
+%__make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT __doc
+%{__make} \
+ DESTDIR=$RPM_BUILD_ROOT \
+ docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \
+ pkgconfigdir=%{_libdir}/pkgconfig \
+ install
+find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
+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
+
# 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
+# if there is not dot after everything else is done, the remove config
+%postun
+if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
%changelog
+* Wed Feb 22 2006 Oliver Falk <oliver at linux-kernel.at> - 2.8-1
+- Merge with specfile from Paul F. Johnson
+- Update
+
* Mon Feb 13 2006 Oliver Falk <oliver at linux-kernel.at> - 2.6-4
- BR: ruby-devel
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/graphviz/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 29 Aug 2005 08:13:23 -0000 1.7
+++ sources 22 Feb 2006 17:28:01 -0000 1.8
@@ -1 +1 @@
-0d61fc4f8660be31503d4f9ab6f26bf0 graphviz-2.6.tar.gz
+ca921b4a9bcd86da4a1092bb17a57d83 graphviz-2.8.tar.gz
More information about the scm-commits
mailing list