Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package graphviz for openSUSE:Factory checked in at 2022-08-30 14:48:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/graphviz (Old) and /work/SRC/openSUSE:Factory/.graphviz.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "graphviz" Tue Aug 30 14:48:19 2022 rev:95 rq:999881 version:2.49.3 Changes: -------- --- /work/SRC/openSUSE:Factory/graphviz/graphviz.changes 2022-02-10 23:12:19.652246519 +0100 +++ /work/SRC/openSUSE:Factory/.graphviz.new.2083/graphviz.changes 2022-08-30 14:48:20.851946942 +0200 @@ -1,0 +2,5 @@ +Fri Aug 12 13:33:05 UTC 2022 - Stephan Kulow <coolo@suse.com> + +- Split the Qt5 dependencies from addons flavor - it's just gvedit + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ graphviz.spec ++++++ --- /var/tmp/diff_new_pack.yB2kwo/_old 2022-08-30 14:48:22.615951543 +0200 +++ /var/tmp/diff_new_pack.yB2kwo/_new 2022-08-30 14:48:22.619951552 +0200 @@ -18,7 +18,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%if "%{flavor}" == "addons" +%if "%{flavor}" != "" %define psuffix -%{flavor} %else %define psuffix %{nil} @@ -102,7 +102,6 @@ Recommends: graphviz-gd = %{version} %if "%{flavor}" == "addons" BuildRequires: freeglut-devel - BuildRequires: ghostscript BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -116,9 +115,6 @@ BuildRequires: swig %endif BuildRequires: ruby-devel -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) >= 2 @@ -147,11 +143,17 @@ %else BuildRequires: ghostscript_any %endif +%if "%{flavor}" == "qt5" +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) +%endif %description A collection of tools and tcl packages for the manipulation and layout of graphs (as in nodes and edges, not as in bar charts). +%if "%{flavor}" == "qt5" %package -n graphviz-gvedit Summary: Graph editor based on Qt Group: Productivity/Graphics/Visualization/Graph @@ -159,6 +161,7 @@ %description -n graphviz-gvedit The Qt5 graph editor included with graphviz. +%endif %package -n graphviz-smyrna Summary: Large graph viewer @@ -502,7 +505,9 @@ cp -a %{buildroot}%{_datadir}/%{mname}/doc %{buildroot}%{_defaultdocdir}/%{mname}-doc %fdupes %{buildroot}%{_defaultdocdir}/%{mname}-doc %fdupes %{buildroot}%{_datadir}/graphviz/demo +%endif +%if "%{flavor}" == "addons" || "%{flavor}" == "qt5" # Prune all the content of the base graphviz package rm -rf %{buildroot}%{_libdir}/pkgconfig rm -rf %{buildroot}%{_includedir} @@ -523,6 +528,8 @@ # libraries removal rm -f %{buildroot}%{_sysconfdir}/ld.so.conf.d/graphviz.conf rm -f %{buildroot}%{_libdir}/lib{cdt,cgraph,gvc,gvpr,pathplan,xdot,lab_gamut}.so* +%endif +%if "%{flavor}" == "addons" # Fix tcl locations for lib in libgdtclft* libgv_tcl.so libtcldot* libtclplan* ; do mv %{buildroot}%{_libdir}/%{mname}/tcl/${lib} %{buildroot}%{_libdir} @@ -540,12 +547,14 @@ rm -rf %{buildroot}%{_libdir}/graphviz/php rm -rf %{buildroot}%{_libdir}/graphviz/python* rm -rf %{buildroot}%{_libdir}/graphviz/ruby -%else +%endif +%if "%{flavor}" == "" || "%{flavor}" == "qt5" # These are part of gnome subpkg rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_pango* rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_xlib* # This is part of the gd subpkg only rm -f %{buildroot}%{_mandir}/man1/{diffimg.1*,dotty.1*,lefty.1*,lneato.1*} +rm -f %{buildroot}%{_bindir}/{dotty,lneato} # This is part of the x11 subpkg only rm -rf %{buildroot}%{_datadir}/graphviz/lefty %endif @@ -585,14 +594,16 @@ %postun -n liblab_gamut%{lab_gamut_soversion} -p /sbin/ldconfig -%if "%{flavor}" == "addons" +%if "%{flavor}" == "qt5" %files -n graphviz-gvedit %license epl-v10.txt %{_bindir}/gvedit %dir %{_datadir}/%{mname}/gvedit %{_datadir}/%{mname}/gvedit/attrs.txt %{_mandir}/man1/gvedit.1%{ext_man} +%endif +%if "%{flavor}" == "addons" %files -n graphviz-smyrna %license epl-v10.txt %{_bindir}/smyrna @@ -701,8 +712,9 @@ %{_defaultdocdir}/%{mname}-doc %{_datadir}/graphviz/demo -%else +%endif +%if "%{flavor}" == "" %files %doc doc/FAQ.html AUTHORS README NEWS ChangeLog %license epl-v10.txt ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.yB2kwo/_old 2022-08-30 14:48:22.659951655 +0200 +++ /var/tmp/diff_new_pack.yB2kwo/_new 2022-08-30 14:48:22.663951665 +0200 @@ -1,4 +1,5 @@ <multibuild> <package>addons</package> + <package>qt5</package> </multibuild>