packages: graphviz/graphviz.spec - rpm build macros >= 1.402 convert man sy...

[glen]

Author: glen                         Date: Wed Jun  2 16:21:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rpm build macros >= 1.402 convert man symlinks automatically

---- Files affected:
packages/graphviz:
   graphviz.spec (1.109 -> 1.110) 

---- Diffs:

================================================================
Index: packages/graphviz/graphviz.spec
diff -u packages/graphviz/graphviz.spec:1.109 packages/graphviz/graphviz.spec:1.110
--- packages/graphviz/graphviz.spec:1.109	Wed Jun  2 11:11:38 2010
+++ packages/graphviz/graphviz.spec	Wed Jun  2 18:21:18 2010
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 # TODO
+# - %{_libdir}/graphviz/config is not FHS friendly path as config
 # - io language bindings: io-graphviz
 # - ghostscript subpackage?
 #   /usr/lib64/graphviz/libgvplugin_gs.so
@@ -34,12 +35,12 @@
 %ifarch i386 i486
 %undefine with_java
 %endif
-%include	/usr/lib/rpm/macros.perl
+%{?with_perl:%include	/usr/lib/rpm/macros.perl}
 Summary:	Graph Visualization Tools
 Summary(pl.UTF-8):	Narzędzie do wizualizacji w postaci grafów
 Name:		graphviz
 Version:	2.26.3
-Release:	0.1
+Release:	0.3
 License:	CPL v1.0
 Group:		X11/Applications/Graphics
 Source0:	http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
@@ -92,8 +93,8 @@
 %endif
 BuildRequires:	pkgconfig
 %{?with_python:BuildRequires:	python-devel}
-%{?with_python:BuildRequires:	rpm-pythonprov}
 %{?with_perl:BuildRequires:	rpm-perlprov}
+%{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	rpmbuild(macros) >= 1.519
 %{?with_ruby:BuildRequires:	ruby-devel}
 # swig-csharp,swig-java,swig-lua,swig-ocaml in main swig
@@ -171,7 +172,7 @@
 Summary(pl.UTF-8):	Wiązania Guile dla graphviza
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-guile
+Obsoletes:	graphviz-guile
 
 %description -n guile-%{name}
 Guile binding for graphviz.
@@ -184,7 +185,7 @@
 Summary(pl.UTF-8):	Wiązania Javy dla graphviza
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-java
+Obsoletes:	graphviz-java
 
 %description -n java-%{name}
 Java binding for graphviz.
@@ -197,7 +198,7 @@
 Summary(pl.UTF-8):	Wiązania LUA dla graphviza
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-lua
+Obsoletes:	graphviz-lua
 
 %description -n lua-%{name}
 LUA binding for graphviz.
@@ -210,7 +211,7 @@
 Summary(pl.UTF-8):	Wiązania OCamla dla graphviza
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-ocaml
+Obsoletes:	graphviz-ocaml
 
 %description -n ocaml-%{name}
 OCaml binding for graphviz.
@@ -249,7 +250,7 @@
 Summary(pl.UTF-8):	Wiązania Pythona dla graphviza
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-python
+Obsoletes:	graphviz-python
 
 %description -n python-%{name}
 Python binding for graphviz.
@@ -262,7 +263,7 @@
 Summary(pl.UTF-8):	Wiązania Ruby'ego dla graphviza
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-ruby
+Obsoletes:	graphviz-ruby
 
 %description -n ruby-%{name}
 Ruby binding for graphviz.
@@ -275,7 +276,7 @@
 Summary(pl.UTF-8):	Wiązania C# dla graphviza
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-sharp
+Obsoletes:	graphviz-sharp
 
 %description -n sharp-%{name}
 C# binding for graphviz.
@@ -288,7 +289,7 @@
 Summary(pl.UTF-8):	Rozszerzenia Tcl dla graphviza
 Group:		X11/Applications/Graphics
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-tcl
+Obsoletes:	graphviz-tcl
 
 %description -n tcl-%{name}
 This package contains the various Tcl packages (extensions) using
@@ -381,14 +382,6 @@
 mv -f $RPM_BUILD_ROOT{%{_datadir}/%{name}/demo,%{_examplesdir}/php-%{name}-%{version}}/modgraph.php
 %endif
 
-# replace dead (after compression) softlinks by groff redirections
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{circo,fdp,neato,twopi,dot2gxl}.1
-echo ".so dot.1" >$RPM_BUILD_ROOT%{_mandir}/man1/circo.1
-echo ".so dot.1" >$RPM_BUILD_ROOT%{_mandir}/man1/fdp.1
-echo ".so dot.1" >$RPM_BUILD_ROOT%{_mandir}/man1/neato.1
-echo ".so dot.1" >$RPM_BUILD_ROOT%{_mandir}/man1/twopi.1
-echo ".so gxl2dot.1" >$RPM_BUILD_ROOT%{_mandir}/man1/dot2gxl.1
-
 # created by %{_bindir}/dot -c
 touch $RPM_BUILD_ROOT%{_libdir}/graphviz/config
 
@@ -636,6 +629,7 @@
 %if %{with r}
 %files -n R-%{name}
 %defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/R
 %attr(755,root,root) %{_libdir}/%{name}/R/gv.so
 %attr(755,root,root) %{_libdir}/%{name}/R/libgv_R.so
 # XXX: keep the dot, or it will match ruby manual!
@@ -648,6 +642,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.110  2010/06/02 16:21:18  glen
+- rpm build macros >= 1.402 convert man symlinks automatically
+
 Revision 1.109  2010/06/02 09:11:38  glen
 - rename language bindings to LANG-graphviz
 - python and io bconds
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/graphviz/graphviz.spec?r1=1.109&r2=1.110&f=u