Hello community, here is the log from the commit of package graphviz checked in at Mon Apr 7 01:03:47 CEST 2008. -------- --- graphviz/graphviz-plugins.changes 2008-03-31 00:47:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/graphviz/graphviz-plugins.changes 2008-04-03 16:31:27.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 3 16:31:10 CEST 2008 - pth@suse.de + +- Fix package and filelist correctly. +- Install tcl specific libraries to %_libdir +- Properly package language specific demo code + +------------------------------------------------------------------- New: ---- graphviz-plugins-fix_install_dirs.patch graphviz-plugins-tcl_install_dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ graphviz-plugins.spec ++++++ --- /var/tmp/diff_new_pack.iu3008/_old 2008-04-07 01:03:08.000000000 +0200 +++ /var/tmp/diff_new_pack.iu3008/_new 2008-04-07 01:03:08.000000000 +0200 @@ -10,21 +10,21 @@ # nodebuginfo +%define mname graphviz Name: graphviz-plugins -%define mname graphviz BuildRequires: libexpat-devel libjpeg-devel libpng-devel zlib-devel BuildRequires: freetype2-devel >= 2 gcc-c++ ksh libstdc++-devel BuildRequires: bison flex glib2-devel m4 perl python-devel swig tk-devel >= 8.3 xorg-x11-devel BuildRequires: php5-devel ruby-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel BuildRequires: cairo-devel gcc-java gmp-devel guile-devel libgcj-devel lua-devel mono-core ocaml pango-devel -BuildRequires: graphviz libgnomeui-devel php5-devel +BuildRequires: graphviz libgnomeui-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif Version: 2.18 -Release: 2 +Release: 3 AutoReqProv: on Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph @@ -40,6 +40,9 @@ Patch8: graphviz-missing_includes.patch Patch9: graphviz-configure_grok_vars.patch Patch10: graphviz-2.18-duplicate_decls.patch +#Patches above 100 are graphviz-plugins specific. +Patch100: graphviz-plugins-fix_install_dirs.patch +Patch101: graphviz-plugins-tcl_install_dir.patch Url: http://www.graphviz.org/ License: IBM Public License Prefix: /usr @@ -70,9 +73,11 @@ Group: Productivity/Graphics/Visualization/Graph Summary: Graphviz plugin for renderers based on gd Requires: graphviz = %{version}-%{release} gd +PreReq: /bin/rm %description -n graphviz-gd -Graphviz plugin for renderers based on gd +The graphviz-gd package contains the gd extensions for the graphviz +tools. @@ -137,7 +142,8 @@ Requires: graphviz = %{version}-%{release} lua %description -n graphviz-lua -Lua extension for graphviz +The graphviz-lua package contains the lua extension for the graphviz +tools. @@ -158,7 +164,8 @@ Requires: graphviz = %{version}-%{release} ocaml %description -n graphviz-ocaml -OCAML extension for graphviz +The graphviz-ocaml package contains the Objective Caml extension for +the graphviz tools. @@ -179,7 +186,8 @@ Requires: graphviz = %{version}-%{release} perl %description -n graphviz-perl -Perl extension for Graphviz +The graphviz-perl package contains the Perl extension for the graphviz +tools. @@ -200,7 +208,8 @@ Requires: graphviz = %{version}-%{release} php5 %description -n graphviz-php -PHP Extension for Graphviz +The graphviz-php package contains the PHP extension for the graphviz +tools. @@ -221,7 +230,8 @@ Requires: graphviz = %{version}-%{release} python %description -n graphviz-python -Python Extension for Graphviz +The graphviz-python package contains the Python extension for the +graphviz tools. @@ -242,7 +252,8 @@ Requires: graphviz = %{version}-%{release} ruby %description -n graphviz-ruby -Ruby Extension for Graphviz +The graphviz-ruby package contains the ruby extension for the graphviz +tools. @@ -263,7 +274,8 @@ Requires: graphviz = %{version}-%{release} mono-core %description -n graphviz-sharp -C# extension for graphviz +The graphviz-sharp package contains the C# extension for the graphviz +tools. @@ -331,6 +343,8 @@ %patch8 %patch9 %patch10 +%patch100 +%patch101 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl # remove broken macros @@ -372,11 +386,9 @@ docdir=%{buildroot}%{_docdir}/%{mname} \ pkgconfigdir=%{_libdir}/pkgconfig find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -#rm -rf %{buildroot}/usr/%{_lib}/pkgconfig # ? mkdir -p %{buildroot}/%{_docdir} mkdir -p %{buildroot}%{_datadir}/%{mname} mkdir -p %{buildroot}%{_datadir}/tcl/%{mname} -mv %buildroot/%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/%{mname}/ chmod -x %{buildroot}%{_datadir}/%{mname}/lefty/* cp -a %{buildroot}%{_datadir}/%{mname}/doc __doc rm -rf %{buildroot}%{_datadir}/%{mname}/doc @@ -406,6 +418,9 @@ rm -f %{buildroot}%{_mandir}/man3/*.3 rm -f %{buildroot}%{_mandir}/man7/*.7 rm -f %{buildroot}%{_mandir}/man7/*.7.gz +for lib in libgdtclft* libgv_tcl.so libtcldot* libtclplan* libtkspline*; do + mv %{buildroot}%{_libdir}/%{mname}/tcl/${lib} %{buildroot}%{_libdir} +done %if 0%{?suse_version} > 1020 %fdupes -s %{buildroot}%{_docdir} %endif @@ -423,6 +438,10 @@ %postun -n graphviz-gd if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_lib}/graphviz/config; fi +%post -n graphviz-tcl -p /sbin/ldconfig + +%postun -n graphviz-tcl -p /sbin/ldconfig + %files -n graphviz-guile %defattr(-,root,root,-) %{_libdir}/graphviz/guile @@ -439,6 +458,7 @@ %files -n graphviz-lua %defattr(-,root,root,-) +%{_datadir}/%{mname}/demo/modgraph.lua %{_libdir}/graphviz/lua %doc %{_mandir}/mann/gv_lua.n.gz @@ -452,17 +472,20 @@ %{_libdir}/graphviz/perl %{perl_vendorarch}/gv.pm %{perl_vendorarch}/gv.so +%{_datadir}/%{mname}/demo/modgraph.pl %doc %{_mandir}/mann/gv_perl.n.gz %files -n graphviz-php %defattr(-,root,root,-) -%{_libdir}/graphviz/php -%dir %{_libdir}/php -%dir %{_libdir}/php/modules -%{_libdir}/php/modules/gv.so -%dir %{_datadir}/php -%{_datadir}/php/gv.php +%{_libdir}/php5/extensions/gv.so +%{_datadir}/php5/gv.php %doc %{_mandir}/mann/gv_php.n.gz +%{_libdir}/%{mname}-%{version} +%dir %{_libdir}/%{mname}/php +%{_libdir}/%{mname}/php/gv.php +%{_libdir}/%{mname}/php/gv.so +%{_libdir}/%{mname}/php/libgv_php.so +%{_datadir}/%{mname}/demo/modgraph.php %files -n graphviz-python %defattr(-,root,root,-) @@ -470,22 +493,39 @@ %{py_sitedir}/_gv.so %{py_sitedir}/gv.py %doc %{_mandir}/mann/gv_python.n.gz +%{_datadir}/%{mname}/demo/modgraph.py %files -n graphviz-ruby %defattr(-,root,root,-) %{_libdir}/graphviz/ruby %{rb_sitedir}/*-%{_os}/gv.so %doc %{_mandir}/mann/gv_ruby.n.gz +%{_datadir}/%{mname}/demo/modgraph.rb %files -n graphviz-tcl %defattr(-,root,root) %dir %{_datadir}/tcl/%{mname} -%dir %{_libdir}/tcl%{tcl_version} -%dir %{_libdir}/tcl%{tcl_version}/graphviz-%{version} -%{_libdir}/graphviz/tcl +%{_libdir}/libgdtclft* +%{_libdir}/libgv_tcl.so +%{_libdir}/libtcldot* +%{_libdir}/libtclplan* +%{_libdir}/libtkspline* %{_datadir}/tcl/%{mname}/pkgIndex.tcl %{_datadir}/graphviz/demo %doc %{_mandir}/mann/*.n* +%exclude %{_mandir}/mann/gv_lua.n.gz +%exclude %{_mandir}/mann/gv_perl.n.gz +%exclude %{_mandir}/mann/gv_ruby.n.gz +%exclude %{_mandir}/mann/gv_sharp.n.gz +%exclude %{_mandir}/mann/gv_guile.n.gz +%exclude %{_mandir}/mann/gv_python.n.gz +%exclude %{_mandir}/mann/gv_php.n.gz +%exclude %{_mandir}/mann/gv_ocaml.n.gz +%exclude %{_datadir}/%{mname}/demo/modgraph.rb +%exclude %{_datadir}/%{mname}/demo/modgraph.php +%exclude %{_datadir}/%{mname}/demo/modgraph.py +%exclude %{_datadir}/%{mname}/demo/modgraph.lua +%exclude %{_datadir}/%{mname}/demo/modgraph.pl %files -n graphviz-doc %docdir %{_defaultdocdir}/%{mname} @@ -493,6 +533,10 @@ %doc __doc/* %changelog +* Thu Apr 03 2008 pth@suse.de +- Fix package and filelist correctly. +- Install tcl specific libraries to %%_libdir +- Properly package language specific demo code * Mon Mar 31 2008 ro@suse.de - fix build (added directories to filelist) * Fri Mar 28 2008 pth@suse.de ++++++ graphviz.spec ++++++ --- /var/tmp/diff_new_pack.iu3008/_old 2008-04-07 01:03:08.000000000 +0200 +++ /var/tmp/diff_new_pack.iu3008/_new 2008-04-07 01:03:08.000000000 +0200 @@ -18,7 +18,7 @@ BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel PreReq: /bin/rm Version: 2.18 -Release: 3 +Release: 6 AutoReqProv: on Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph ++++++ graphviz-plugins-fix_install_dirs.patch ++++++ --- configure.ac +++ configure.ac @@ -272,7 +272,7 @@ fi dnl ----------------------------------- -dnl Check for various typedefs and provide substitutes if they don't exist. +dnl Check for various typedefs and provide substitutes if they do not exist. AC_C_CONST AC_TYPE_MODE_T @@ -821,11 +821,13 @@ AC_CHECK_PROG(PHP,php,php) if test -d /usr/include/php5; then PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM" +PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions" +PHP_INSTALL_DATADIR="/usr/share/php5" else PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM" -fi PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules" PHP_INSTALL_DATADIR="/usr/share/php" +fi PHP_LIBS= save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" @@ -1203,7 +1205,7 @@ AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built]) HAVE_TCL=0 fi - TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}" + TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}" fi if test "$HAVE_TCL" = "1"; then ++++++ graphviz-plugins-tcl_install_dir.patch ++++++ --- tclpkg/Makefile.am +++ tclpkg/Makefile.am @@ -15,9 +15,9 @@ pkgpython25dir = $(pkglibdir)/python25 pkgRdir = $(pkglibdir)/R pkgrubydir = $(pkglibdir)/ruby -pkgtcldir = $(pkglibdir)/tcl +pkgtcldir = $(libdir) -pkgindexdir = $(pkgtcldir) +pkgindexdir = $(datadir)/tcl/@PACKAGE@ if WITH_TCL pkgindex_DATA = pkgIndex.tcl endif ++++++ graphviz-rpmlintrc ++++++ --- graphviz/graphviz-rpmlintrc 2007-08-29 18:04:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/graphviz/graphviz-rpmlintrc 2008-04-07 00:27:12.597361000 +0200 @@ -1,8 +1,9 @@ # This line is mandatory to access the configuration functions from Config import * -addFilter("graphviz shlib-policy-missing-suffix") -addFilter("graphviz rpm-buildroot-usage") -addFilter("graphviz postun-without-ldconfig") -addFilter("graphviz non-devel-buildrequires") -addFilter("graphviz %install-no-mkdir-buildroot") +addFilter("graphviz.* shlib-policy-missing-suffix") +addFilter("graphviz.* rpm-buildroot-usage") +addFilter("graphviz.* postun-without-ldconfig") +addFilter("graphviz.* non-devel-buildrequires") +addFilter("graphviz.* %install-no-mkdir-buildroot") +addFilter("graphviz.* devel-file-in-non-devel-package") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de