mirror of
https://abf.rosa.ru/djam/graphviz.git
synced 2025-02-23 15:52:55 +00:00
Update version to 10.0.1
This commit is contained in:
Aleksandr Proklov
parent
47554f533a
commit
e8b371ddcf
3 changed files with 12 additions and 67 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
graphviz-7.0.3.tar.gz: 15bcdb577da7c25e94b1e6b490bd116e5c78cc66
|
||||
graphviz-10.0.1.tar.gz: a6d8e9a3f98867b250d3f20c4bbc19cd1cd42ec2
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
--- a/plugin/gtk/Makefile.am~ 2013-02-14 21:27:39.000000000 +0800
|
||||
+++ b/plugin/gtk/Makefile.am 2013-05-27 11:22:45.127287033 +0800
|
||||
@@ -30,7 +30,7 @@ libgvplugin_gtk_C_la_SOURCES = \
|
||||
|
||||
libgvplugin_gtk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
|
||||
libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
|
||||
-libgvplugin_gtk_la_LIBADD = $(GTK_LIBS)
|
||||
+libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11
|
||||
|
||||
if WITH_WIN32
|
||||
libgvplugin_gtk_la_LDFLAGS += -no-undefined
|
||||
diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
|
||||
index 58c88f4..e636cdc 100644
|
||||
--- a/tclpkg/tcldot/Makefile.am
|
||||
+++ b/tclpkg/tcldot/Makefile.am
|
||||
@@ -96,7 +96,7 @@ endif
|
||||
|
||||
if WITH_LIBGD
|
||||
libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
|
||||
-libtcldot_builtin_la_LIBADD += $(GDLIB_LIBS)
|
||||
+libtcldot_builtin_la_LIBADD += $(GDTCLFT_LIBS) $(GDLIB_LIBS)
|
||||
endif
|
||||
|
||||
libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
|
||||
|
|
@ -10,20 +10,18 @@
|
|||
# temorary section ro e2k
|
||||
%ifarch %{x86_64} %{ix86} aarch64
|
||||
%bcond_without ruby
|
||||
%bcond_without php
|
||||
%bcond_without ocaml
|
||||
# rosa2023.1 enable php option if php8 in repo, also rebuild swig with php8 support
|
||||
%bcond_with php
|
||||
%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
|
||||
|
|
@ -31,7 +29,6 @@
|
|||
|
||||
%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}
|
||||
|
|
@ -45,13 +42,12 @@
|
|||
|
||||
Summary: Graph visualization tools
|
||||
Name: graphviz
|
||||
Version: 7.0.3
|
||||
Release: 4
|
||||
Version: 10.0.1
|
||||
Release: 1
|
||||
License: Common Public License
|
||||
Group: Graphics
|
||||
Url: http://www.graphviz.org
|
||||
Source0: https://www2.graphviz.org/Packages/stable/portable_source/%{name}-%{version}.tar.gz
|
||||
Patch0: graphviz-link.patch
|
||||
Source0: https://gitlab.com/graphviz/graphviz/-/archive/%{version}/graphviz-%{version}.tar.gz
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: libtool
|
||||
|
|
@ -142,18 +138,6 @@ 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
|
||||
|
|
@ -334,20 +318,6 @@ 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}
|
||||
|
|
@ -404,12 +374,11 @@ 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
|
||||
|
|
@ -427,7 +396,6 @@ LUA_INSTALL_DIR=%{_libdir}/lua
|
|||
%else
|
||||
--disable-r \
|
||||
%endif
|
||||
--enable-ocaml \
|
||||
--enable-perl \
|
||||
%if %{with php}
|
||||
--enable-php \
|
||||
|
|
@ -439,6 +407,7 @@ LUA_INSTALL_DIR=%{_libdir}/lua
|
|||
--disable-python \
|
||||
--disable-python2 \
|
||||
--enable-python3 \
|
||||
--disable-man-pdfs \
|
||||
--disable-sharp \
|
||||
--with-pangocairo \
|
||||
--with-gtk \
|
||||
|
|
@ -463,9 +432,9 @@ popd
|
|||
%install
|
||||
%makeinstall_std
|
||||
|
||||
%ifarch %e2k
|
||||
[ -d %{buildroot}%{_prefix}/lib/lua ] && mv %{buildroot}%{_prefix}/lib/lua %{buildroot}%{_libdir}/
|
||||
%endif
|
||||
[ -d %{buildroot}/lua ] && mkdir -p %{buildroot}%{_libdir}/lua/%{lua_version} \
|
||||
&& mv %{buildroot}/lua/gv.so %{buildroot}%{_libdir}/lua/%{lua_version}/
|
||||
rm -rf %{buildroot}/lua
|
||||
|
||||
# fix documentation
|
||||
install -d -m 755 %{buildroot}%{_docdir}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue