Rebert 7.0.3

graphviz.spec

@@ -10,18 +10,20 @@
 # temorary section ro e2k
 %ifarch %{x86_64} %{ix86} aarch64
 %bcond_without ruby
-# rosa2023.1 enable php option if php8 in repo, also rebuild swig with php8 support
-%bcond_with php
+%bcond_without php
+%bcond_without ocaml
 %bcond_without tcl
 %endif
 %ifarch %{e2k} %{riscv}
 %bcond_with ruby
 %bcond_with php
 %bcond_without tcl
+%bcond_with ocaml
 %endif
 
 %define cdt_major 5
 %define cgraph_major 6
+%define gamut_major 1
 %define gvc_major 6
 %define gvpr_major 2
 %define pathplan_major 4
@@ -29,6 +31,7 @@
 
 %define lib_cdt %mklibname cdt %{cdt_major}
 %define lib_cgraph %mklibname cgraph %{cgraph_major}
+%define lib_gamut %mklibname lab_gamut %{gamut_major}
 %define lib_gvc %mklibname gvc %{gvc_major}
 %define lib_gvpr %mklibname gvpr %{gvpr_major}
 %define lib_pathplan %mklibname pathplan %{pathplan_major}
@@ -42,12 +45,13 @@
 
 Summary:	Graph visualization tools
 Name:		graphviz
-Version:	10.0.1
-Release:	2
+Version:	7.0.3
+Release:	4
 License:	Common Public License
 Group:		Graphics
 Url:		http://www.graphviz.org
-Source0:	https://gitlab.com/graphviz/graphviz/-/archive/%{version}/graphviz-%{version}.tar.gz
+Source0:	https://www2.graphviz.org/Packages/stable/portable_source/%{name}-%{version}.tar.gz
+Patch0:		graphviz-link.patch
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	libtool
@@ -80,7 +84,6 @@ BuildRequires:	pkgconfig(librsvg-2.0)
 BuildRequires:	pkgconfig(glut)
 %endif
 Conflicts: %{mklibname graphviz 4} < 2.20.3-3
-Obsoletes: ocaml-graphviz < 10.0.1
 
 %description
 A collection of tools for the manipulation and layout
@@ -139,6 +142,18 @@ This package provides the cgraph shared library for %{name}.
 
 #-------------------------------------------------------------------------
 
+%package -n     %{lib_gamut}
+Group:          System/Libraries
+Summary:        Shared library for %{name}
+
+%description -n %{lib_gamut}
+This package provides the lib_gamut shared library for %{name}.
+
+%files -n %{lib_gamut}
+%{_libdir}/liblab_gamut.so.%{gamut_major}*
+
+#-------------------------------------------------------------------------
+
 %package -n %{lib_gvc}
 Summary:	Shared library for %{name}
 Group:		System/Libraries
@@ -319,6 +334,20 @@ This package provides the R extension for %{name}.
 %{_libdir}/graphviz/R
 %endif
 
+#-------------------------------------------------------------------------
+%if %{with ocaml}
+%package -n ocaml-graphviz
+Summary:	Graphviz bindings for OCaml
+Group:		Development/OCaml
+BuildRequires:	ocaml
+Obsoletes:	%{mklibname graphvizocaml 0} < 2.28.0-4
+
+%description -n ocaml-graphviz
+This package provides the OCaml extension for %{name}.
+
+%files -n ocaml-graphviz
+%{_libdir}/graphviz/ocaml
+%endif
 #-------------------------------------------------------------------------
 
 %package -n %{devname}
@@ -375,11 +404,12 @@ rm -rf libltdl
 # fix e2k detection
 sed -i 's!e2k!e2k*!g' configure.ac
 
-touch debian/libgvphp7.install.in
-
 %build
 ./autogen.sh
 #autoreconf -fi
+%if %{with php}
+sed -i -e "s,-php5,php$(rpm -q --qf '%{Version}' php-cli | cut -d'.' -f1),g" configure
+%endif
 
 %ifarch %{e2k}
 LUA_INSTALL_DIR=%{_libdir}/lua
@@ -397,6 +427,7 @@ LUA_INSTALL_DIR=%{_libdir}/lua
 %else
 	--disable-r \
 %endif
+	--enable-ocaml \
 	--enable-perl \
 %if %{with php}
 	--enable-php \
@@ -408,7 +439,6 @@ LUA_INSTALL_DIR=%{_libdir}/lua
 	--disable-python \
 	--disable-python2 \
 	--enable-python3 \
-	--disable-man-pdfs \
 	--disable-sharp \
 	--with-pangocairo \
 	--with-gtk \
@@ -433,9 +463,9 @@ popd
 %install
 %makeinstall_std
 
-[ -d %{buildroot}/lua ] && mkdir -p %{buildroot}%{_libdir}/lua/%{lua_version} \
-	&& mv %{buildroot}/lua/gv.so %{buildroot}%{_libdir}/lua/%{lua_version}/
-rm -rf %{buildroot}/lua
+%ifarch %e2k
+[ -d %{buildroot}%{_prefix}/lib/lua ] && mv %{buildroot}%{_prefix}/lib/lua %{buildroot}%{_libdir}/
+%endif
 
 # fix documentation
 install -d -m 755 %{buildroot}%{_docdir}