diff --git a/backport-graphviz-2.48.0-gvpack-neato-static.patch b/backport-graphviz-4.0.0-gvpack-neato-static.patch similarity index 79% rename from backport-graphviz-2.48.0-gvpack-neato-static.patch rename to backport-graphviz-4.0.0-gvpack-neato-static.patch index 857a733..dcb6863 100644 --- a/backport-graphviz-2.48.0-gvpack-neato-static.patch +++ b/backport-graphviz-4.0.0-gvpack-neato-static.patch @@ -11,5 +11,5 @@ index 4978fea..9fbe2e2 100644 + $(top_builddir)/lib/pathplan/libpathplan_C.la \ + $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS) - # add a non-existent C++ source to force the C++ compiler to be used for - # linking, so the C++ standard library is included for our C++ dependencies + if ENABLE_STATIC + gvpack_static_SOURCES = gvpack.cpp diff --git a/graphviz-2.48.0.tar.gz b/graphviz-8.1.0.tar.gz similarity index 73% rename from graphviz-2.48.0.tar.gz rename to graphviz-8.1.0.tar.gz index 24605e1..6b11d3c 100644 Binary files a/graphviz-2.48.0.tar.gz and b/graphviz-8.1.0.tar.gz differ diff --git a/graphviz.spec b/graphviz.spec index 9ef9eaa..9041aae 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -17,14 +17,14 @@ Name: graphviz -Version: 2.48.0 -Release: 3 +Version: 8.1.0 +Release: 1 Summary: Graph Visualization Tools License: EPL-1.0 URL: http://www.graphviz.org/ Source0: https://gitlab.com/graphviz/graphviz/-/archive/%{version}/graphviz-%{version}.tar.gz -Patch6000: backport-graphviz-2.48.0-gvpack-neato-static.patch +Patch6000: backport-graphviz-4.0.0-gvpack-neato-static.patch BuildRequires: gcc-g++ BuildRequires: ksh bison m4 flex ruby automake perl-Carp autoconf libtool qpdf urw-base35-fonts, perl-ExtUtils-Embed, perl-generators, librsvg2-devel swig >= 1.3.33 @@ -181,12 +181,8 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-ove %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} \ - docdir=%{buildroot}%{_docdir}/%{name} \ - pkgconfigdir=%{_libdir}/pkgconfig \ - PYTHON_LIBS=`python3-config --libs` \ - PYTHON_INSTALL_DIR=%{python3_sitearch} \ - install +%make_install docdir=%{_docdir}/%{name} \ + pkgconfigdir=%{_libdir}/pkgconfig %delete_la @@ -200,8 +196,6 @@ __EOF__ find $RPM_BUILD_ROOT%{_datadir}/%{name}/demo -type f -exec chmod a-x {} ';' -chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/* - # python 3 pushd tclpkg/gv install -pD .libs/libgv_python3.so $RPM_BUILD_ROOT%{python3_sitearch}/_gv.so @@ -239,7 +233,7 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/ %files %defattr(-,root,root) -%doc README +%doc %{_docdir}/%{name} %{_bindir}/* %dir %{_libdir}/graphviz %{_libdir}/*.so.* @@ -261,18 +255,22 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/ %exclude %{_libdir}/graphviz/*/* %exclude %{_libdir}/graphviz/libgvplugin_gd.* + %files devel %{_includedir}/graphviz %{_libdir}/*.so %{_libdir}/graphviz/*.so %{_libdir}/pkgconfig/*.pc + %files docs %defattr(644,root,root) -%doc %{_datadir}/%{name}/doc +%doc %{_docdir}/%{name}/*.html +%doc %{_docdir}/%{name}/*.pdf %doc %{_datadir}/%{name}/demo %{_mandir}/man1/* %{_mandir}/man3/* %{_mandir}/man7/* + %files gd %{_libdir}/graphviz/libgvplugin_gd.so.* @@ -314,6 +312,9 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/ %endif %changelog +* Thu Sep 07 2023 yaoxin - 8.1.0-1 +- Update to 8.1.0 + * Mon Nov 21 2022 huajingyun - 2.48.0-3 - add loongarch support