Author: glen Date: Wed Jun 2 16:30:24 2010 GMT Module: packages Tag: HEAD ---- Log message: - fix manpage conflicts
---- Files affected: packages/graphviz: graphviz.spec (1.110 -> 1.111) ---- Diffs: ================================================================ Index: packages/graphviz/graphviz.spec diff -u packages/graphviz/graphviz.spec:1.110 packages/graphviz/graphviz.spec:1.111 --- packages/graphviz/graphviz.spec:1.110 Wed Jun 2 18:21:18 2010 +++ packages/graphviz/graphviz.spec Wed Jun 2 18:30:18 2010 @@ -6,9 +6,6 @@ # /usr/lib64/graphviz/libgvplugin_gs.so # /usr/lib64/graphviz/libgvplugin_gs.so.6 # /usr/lib64/graphviz/libgvplugin_gs.so.6.0.0 -# - manuals need rename? these both are "gv" in section 3 of man? -# /usr/share/man/man3/gv.3r.gz -# /usr/share/man/man3/gv.3ruby.gz # # Conditional build: %bcond_without dotnet # don't build C# bindings @@ -40,7 +37,7 @@ Summary(pl.UTF-8): Narzędzie do wizualizacji w postaci grafów Name: graphviz Version: 2.26.3 -Release: 0.3 +Release: 0.4 License: CPL v1.0 Group: X11/Applications/Graphics Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz @@ -382,6 +379,14 @@ mv -f $RPM_BUILD_ROOT{%{_datadir}/%{name}/demo,%{_examplesdir}/php-%{name}-%{version}}/modgraph.php %endif +# "man3/gv.3r.gz" and "man3/gv.3ruby.gz" are both manual for "gv" in "section 3" of man pages +# make manual pages unique. +for a in $RPM_BUILD_ROOT%{_mandir}/man3/gv.*; do + m=${a##*/} + l=${m#gv.3} + mv $a ${a%/*}/gv_$l.3 +done + # created by %{_bindir}/dot -c touch $RPM_BUILD_ROOT%{_libdir}/graphviz/config @@ -507,7 +512,7 @@ %defattr(644,root,root,755) %dir %{_libdir}/graphviz/guile %attr(755,root,root) %{_libdir}/graphviz/guile/libgv_guile.so -%{_mandir}/man3/gv.3guile* +%{_mandir}/man3/gv_guile.* %endif %if %{with java} @@ -516,7 +521,7 @@ %dir %{_libdir}/graphviz/java %attr(755,root,root) %{_libdir}/graphviz/java/libgv_java.so %{_libdir}/graphviz/java/*.java -%{_mandir}/man3/gv.3java* +%{_mandir}/man3/gv_java.* %endif %if %{with lua} @@ -527,7 +532,7 @@ %attr(755,root,root) %{_libdir}/graphviz/lua/gv.so %attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.lua %attr(755,root,root) %{_libdir}/lua/gv.so -%{_mandir}/man3/gv.3lua* +%{_mandir}/man3/gv_lua.* %endif %if %{with ocaml} @@ -539,7 +544,7 @@ %{_libdir}/graphviz/ocaml/gv.a %{_libdir}/graphviz/ocaml/gv.cm* %{_libdir}/graphviz/ocaml/gv.ml* -%{_mandir}/man3/gv.3ocaml* +%{_mandir}/man3/gv_ocaml.* %endif %if %{with perl} @@ -552,7 +557,7 @@ %attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.pl %attr(755,root,root) %{perl_vendorarch}/gv.so %{perl_vendorarch}/gv.pm -%{_mandir}/man3/gv.3perl* +%{_mandir}/man3/gv_perl.* %endif %if %{with php} @@ -561,7 +566,7 @@ %attr(755,root,root) %{php_extensiondir}/gv.so %config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{name}.ini %{php_data_dir}/gv.php -%{_mandir}/man3/gv.3php* +%{_mandir}/man3/gv_php.* %{_examplesdir}/php-%{name}-%{version} %endif @@ -575,7 +580,7 @@ %attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.py %attr(755,root,root) %{py_sitedir}/_gv.so %{py_sitedir}/gv.py -%{_mandir}/man3/gv.3python* +%{_mandir}/man3/gv_python.* %endif %if %{with ruby} @@ -586,7 +591,7 @@ %attr(755,root,root) %{_libdir}/graphviz/ruby/gv.so %attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.rb %{ruby_sitearchdir}/gv.so -%{_mandir}/man3/gv.3ruby* +%{_mandir}/man3/gv_ruby.* %endif %if %{with dotnet} @@ -595,7 +600,7 @@ %dir %{_libdir}/graphviz/sharp %attr(755,root,root) %{_libdir}/graphviz/sharp/libgv_sharp.so %{_libdir}/graphviz/sharp/*.cs -%{_mandir}/man3/gv.3sharp* +%{_mandir}/man3/gv_sharp.* %endif %if %{with tcl} @@ -610,11 +615,11 @@ %attr(755,root,root) %{_libdir}/graphviz/tcl/libtkspline.so* %{_libdir}/graphviz/tcl/pkgIndex.tcl %{_libdir}/tcl*/* +%{_mandir}/man3/gv_tcl.* %{_mandir}/man3/gdtclft.3tcl* -%{_mandir}/man3/gv.3tcl* +%{_mandir}/man3/pathplan.3* %{_mandir}/man3/tcldot.3tcl* %{_mandir}/man3/tkspline.3tk* -%{_mandir}/man3/pathplan.3* %{_datadir}/graphviz/demo/pathplan_data %{_datadir}/graphviz/demo/*.README %{_datadir}/graphviz/demo/*.html @@ -632,8 +637,7 @@ %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! -%{_mandir}/man3/gv.3r.* +%{_mandir}/man3/gv_r.* %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -642,6 +646,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.111 2010/06/02 16:30:18 glen +- fix manpage conflicts + Revision 1.110 2010/06/02 16:21:18 glen - rpm build macros >= 1.402 convert man symlinks automatically ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/graphviz/graphviz.spec?r1=1.110&r2=1.111&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
