update: graphviz, anjuta-extras

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2015 ec354946-7b23-47d6-9f5a-488ba84defc7

a/anjuta-extras/anjuta-extras-vl.spec

@@ -1,13 +1,13 @@
 Version:	2.30.1.0
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 
-Summary:	Several non-core plugins for anjuta
 Name:		anjuta-extras
+Summary:	Several non-core plugins for anjuta
+Summary(ja):	anjutaのいくつかの外部プラグイン
 Source0:	%{name}-%{version}.tar.bz2
-License:	GPL2
+License:	GPLv2
 Group:		Applications/Development
 URL: 		http://projects.gnome.org/anjuta/
-Summary(ja):	anjutaのいくつかの外部プラグイン
 
 Requires: 	anjuta
 Requires:	libgnomecanvas
@@ -85,6 +85,9 @@ fi
 
 
 %changelog
+* Sun Oct 09 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.30.1.0-2
+- rebuilt with graphviz-2.26.3
+
 * Sat May 01 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.1.0-1
 - new upstream release
 

g/graphviz/graphviz-vl.spec

@@ -1,104 +1,174 @@
 Name:           graphviz
-Version:        2.20.3
-Release:        2%{?_dist_release}
+Summary:        Graph Visualization Tools
+Version:        2.26.3
+Release:        1%{?_dist_release}
 Group:          Applications/Graphics
 License:        CPL
 URL:            http://www.graphviz.org/
-Summary:        Graph Visualization Tools
-Source:         http://www.graphviz.org/pub/%{name}/ARCHIVE/%{name}-%{version}.tar.gz
+
 Source:         http://www.graphviz.org/pub/%{name}/stable/SOURCES/%{name}-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires:  freetype2-devel libjpeg-devel libpng-devel zlib-devel
-BuildRequires:  expat-devel flex bison pkgconfig
-BuildRequires:  swig ruby-devel
-BuildRequires:  tcl >= 8.4, tk >= 8.4
+BuildRequires:  bison
+BuildRequires:  cairo-devel
+BuildRequires:  expat-devel
+BuildRequires:  flex
+BuildRequires:  fontconfig-devel
+BuildRequires:  freetype2-devel
+BuildRequires:  gd-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  guile-devel
+BuildRequires:  libjpeg-turbo-devel
+BuildRequires:  libpng-devel 
+BuildRequires:  libSM-devel
 BuildRequires:  libtool-ltdl-devel >= 2.2.6a
-Requires:       freetype2 libjpeg libpng zlib libexpat
+BuildRequires:	libXaw-devel
+BuildRequires:  libXext-devel
+BuildRequires:  m4
+BuildRequires:  perl
+BuildRequires:  python-devel
+BuildRequires:  ruby-devel
+BuildRequires:  swig
+BuildRequires:  tcl >= 8.4
+BuildRequires:  tk >= 8.4
+BuildRequires:  zlib-devel
+Requires:	urw-fonts
+
+# only for this release
+BuildConflicts: graphviz-devel
 
 %description
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in barcharts).
 
-%package tcl
-Group:          Applications/Graphics
-Summary:        Tcl extension tools for version %{version} of %{name}
-Requires:       tcl >= 8.4, tk >= 8.4
-Requires:       %{name} = %{version}
-Provides:       %{name}-tcl = %{version}
-
-%description tcl
-The %{name}-tcl package contains the various tcl packages (extensions)
-for version %{version} of the %{name} tools.
-
 %package devel
 Group:          Development/Libraries
 Summary:        Development tools for version %{version} of %{name}
 Requires:       %{name} = %{version}
-Provides:       %{name}-devel = %{version}
 
 %description devel
 The %{name}-devel package contains the header files
 and man3 pages necessary for developing programs
 using version %{version} of the %{name} libraries.
 
+%package doc
+Summary: PDF and HTML documents for graphviz
+Group:	 Applications/Documentation
+
+%description doc
+Provides some additional PDF and HTML documentation for graphviz.
+
+%package guile
+Group:          Applications/Graphics
+Summary:	Guile extension for graphviz
+Requires:	%{name} = %{version}-%{release}, guile
+
+%description guile
+Guile extension for graphviz.
+
+%package perl
+Group:    Applications/Graphics
+Summary:  Perl extension for graphviz
+Requires: %{name} = %{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%description perl
+Perl extension for graphviz.
+
+%package python
+Group:    Applications/Graphics
+Summary:  Python extension for graphviz
+Requires: %{name} = %{version}-%{release}
+Requires: python
+
+%description python
+Python extension for graphviz.
+
+%package ruby
+Group:	  Applications/Multimedia
+Summary:  Ruby extension for graphviz
+Requires: %{name} = %{version}-%{release}
+Requires: ruby
+
+%description ruby
+Ruby extension for graphviz.
+
+%package tcl
+Group:    Applications/Graphics
+Summary:  Tcl extension & tools for graphviz
+Requires: tcl >= 8.4, tk >= 8.4
+Requires: %{name} = %{version}
+
+%description tcl
+Various tcl packages (extensions) for the graphviz tools.
+
+
 %prep
 %setup -q
 
+# using archdir instead of sitearchdir for Vine
+sed -i -e "s|sitearchdir|archdir|g" config/config_ruby.rb
+
 %build
-CFLAGS=${CFLAGS-"$RPM_OPT_FLAGS"}
-CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
-export CFLAGS CXXFLAGS
-./configure \
-      --prefix=%{_prefix} \
-      --bindir=%{_bindir} \
-      --libdir=%{_libdir} \
-      --includedir=%{_includedir} \
-      --datadir=%{_datadir} \
-      --mandir=%{_mandir} \
-      --disable-rpath \
-      --disable-static \
-      --without-ipsepcola \
-      --with-mylibgd \
-      --without-ming \
-      --disable-sharp \
-      --disable-guile \
-      --disable-io \
-      --disable-java \
-      --disable-lua \
-      --disable-ocaml \
-      --disable-perl \
-      --disable-php \
-      --disable-python \
-      --disable-ruby
-
-make %{?_smp_mflags}
+# XXX ix86 only used to have -ffast-math, let's use everywhere
+%{expand: %%define optflags %{optflags} -ffast-math}
+
+%configure \
+    --with-x \
+    --disable-static \
+    --with-mylibgd \
+    --with-ipsepcola \
+    --with-pangocairo \
+    --with-gdk-pixbuf \
+    --without-mylibgd \
+    --without-ming \
+    --disable-sharp \
+    --enable-guile \
+    --enable-io \
+    --disable-java \
+    --disable-lua \
+    --disable-ocaml \
+    --enable-perl \
+    --disable-php \
+    --enable-python \
+    --disable-r \
+    --enable-ruby \
+    --enable-tcl
+
+make %{?_smp_mflags} 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT 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 {} ';'
 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
+/sbin/ldconfig
 %{_bindir}/dot -c
 
-%post tcl
-%{_bindir}/dot -c
-
-%post devel
-%{_bindir}/dot -c
+# if there is no dot after everything else is done, then remove config
+%postun
+if [ $1 -eq 0 ]; then
+    rm -f %{_libdir}/graphviz/config || :
+fi
+/sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README __doc/*
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/lefty
@@ -109,14 +179,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/*.so.*
 %exclude %{_libdir}/graphviz/*/*
 
-%files tcl
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README
-%{_libdir}/%{name}/tcl/*
-%{_libdir}/tcl8.4/graphviz
-%{_datadir}/%{name}/demo
-%{_mandir}/mann/*
-
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}
@@ -124,9 +186,52 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/%{name}/graphs
-%{_mandir}/man3/*
+%{_mandir}/man3/*.3.gz
+
+%files doc
+%defattr(-,root,root,-)
+%doc __doc/*
+
+%files guile
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/guile/
+%{_mandir}/man3/gv.3guile*
+
+%files perl
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/perl/
+%{perl_vendorarch}/*
+%{_mandir}/man3/gv.3perl*
+
+%files python
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/python/
+%{_libdir}/python*/*
+%{_mandir}/man3/gv.3python*
+
+%files ruby
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/ruby/
+%{rarchdir}/*
+%{_mandir}/man3/gv.3ruby*
+
+%files tcl
+%defattr(-,root,root)
+%{_libdir}/%{name}/tcl/*
+%{_libdir}/tcl*/*
+%{_datadir}/%{name}/demo
+# hack to include gv.3tcl only if available
+#  always includes tcldot.3tcl, gdtclft.3tcl
+%{_mandir}/man3/*.3tcl*
+%{_mandir}/man3/tkspline.3tk*
+
 
 %changelog
+* Sat Oct  9 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.26.3-1
+- new upstream release
+- built with rpm-4.8.1
+- split doc, guile, perl, python, ruby subpackage
+
 * Thu Apr 16 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.20.3-3
 - rebuild with libtool-2.2.6a