diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..05a0e946187b8160d0c54c23a9f8100f44e0f43b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..2b3bc839bc710eda06537e4a74a65e1f4799d15c --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/graphviz diff --git a/graphviz-12.1.2.tar.xz b/graphviz-12.1.2.tar.xz deleted file mode 100644 index 0b75a920d9177a41b7cfb95e51c0ced40621e5ce..0000000000000000000000000000000000000000 Binary files a/graphviz-12.1.2.tar.xz and /dev/null differ diff --git a/graphviz-12.2.1-detect-guile-2.2.patch b/graphviz-12.2.1-detect-guile-2.2.patch new file mode 100644 index 0000000000000000000000000000000000000000..12aba6826ecbd38dfc9221302d03a4980e09c39d --- /dev/null +++ b/graphviz-12.2.1-detect-guile-2.2.patch @@ -0,0 +1,11 @@ +--- graphviz-12.2.1/configure.ac.orig 2024-12-10 12:03:14.777969130 +0800 ++++ graphviz-12.2.1/configure.ac 2024-12-10 12:03:28.532162762 +0800 +@@ -576,7 +576,7 @@ + AC_SUBST([GUILE_CFLAGS]) + AC_SUBST([GUILE_LIBS]) + ], [ +- PKG_CHECK_MODULES([GUILE], [guile-2.0], [ ++ PKG_CHECK_MODULES([GUILE], [guile-2.2], [ + use_guile="Yes" + AC_SUBST([GUILE_CFLAGS]) + AC_SUBST([GUILE_LIBS]) diff --git a/graphviz-12.2.1.tar.xz b/graphviz-12.2.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..1b1520cd24c7dfd2277b02a7df8e56363f0d1b16 --- /dev/null +++ b/graphviz-12.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85e34b5c982777c30f01dfab9ea7c713b4335a2f584e62c0abb9868413eb915b +size 20945996 diff --git a/graphviz.spec b/graphviz.spec index d8dac57d5a431ba4b2650c61b6cbf7e49354ba02..3dd77101f83f7a19e30373efc7661f83a9d2e0d0 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -11,7 +11,7 @@ Name: graphviz -Version: 12.1.2 +Version: 12.2.1 Release: 1 Summary: Graph Visualization Tools License: EPL-1.0 @@ -19,6 +19,7 @@ URL: http://www.graphviz.org/ Source0: https://gitlab.com/graphviz/graphviz/-/archive/%{version}/graphviz-%{version}.tar.xz Patch0: add-loongarch64-support-graphviz.patch Patch1: graphviz-12.0.0-gvpack-neato-static.patch +Patch2: graphviz-12.2.1-detect-guile-2.2.patch BuildRequires: gcc-g++ make BuildRequires: autoconf automake libtool libtool-devel @@ -28,6 +29,7 @@ BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gdlib) >= 2.0.33 BuildRequires: pkgconfig(gtk+-2.0) >= 2.7.0 +BuildRequires: (pkgconfig(guile-3.0) or pkgconfig(guile-2.2) or pkgconfig(guile-1.8)) BuildRequires: pkgconfig(libglade-2.0) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libwebp) @@ -36,7 +38,6 @@ BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(xrender) BuildRequires: freeglut-devel BuildRequires: ghostscript-devel -BuildRequires: guile-devel BuildRequires: urw-base35-fonts BuildRequires: java-devel rpm_macro(java_home) BuildRequires: lua-devel @@ -66,6 +67,7 @@ Header files for using the graphviz libraries. The libdhcpctl and libomapi static libraries are also included in this package. %package docs +Buildarch: noarch Summary: Documentation files for graphviz %description docs @@ -281,6 +283,9 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/ %{_libdir}/tcl*/* %changelog +* Tue Dec 10 2024 Funda Wang - 12.2.1-1 +- update to 12.2.1 + * Tue Oct 01 2024 Funda Wang - 12.1.2-1 - update to 12.1.2