From c2399e2b77202c5057965b033fe56c75bd633732 Mon Sep 17 00:00:00 2001
From: yangchenguang <yangchenguang@kylinsec.com.cn>
Date: Mon, 26 Feb 2024 17:10:01 +0800
Subject: [PATCH] Modify loongarch64 and sw_64 support tcl subpackage

Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
(cherry picked from commit a5c61b04b48fee90f510c44c9d483ae03621d496)
---
 add-loongarch64-support-graphviz.patch | 26 ++++++++++++++++++++++++++
 graphviz.spec                          | 18 +++++++-----------
 2 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 add-loongarch64-support-graphviz.patch

diff --git a/add-loongarch64-support-graphviz.patch b/add-loongarch64-support-graphviz.patch
new file mode 100644
index 0000000..4fec9aa
--- /dev/null
+++ b/add-loongarch64-support-graphviz.patch
@@ -0,0 +1,26 @@
+From 4d020e8f8926661d0487690b98d5aac5a24fec8e Mon Sep 17 00:00:00 2001
+From: yangchenguang <yangchenguang@kylinsec.com.cn>
+Date: Mon, 26 Feb 2024 16:35:25 +0800
+Subject: [PATCH] add loongarch64 support graphviz
+
+Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8f8bedc..99ce969 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,7 +123,7 @@ if test -z "$LIBPOSTFIX"; then
+   case "${host_os}" in
+     *linux* )
+       case "${host_cpu}" in
+-        aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k )
++        aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k | loongarch64 )
+           LIBPOSTFIX="64"
+           INTGOSIZE=64
+           ;;
+-- 
+2.39.1
+
diff --git a/graphviz.spec b/graphviz.spec
index 909f058..85fd72b 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -18,12 +18,14 @@
 
 Name:               graphviz
 Version:            2.48.0
-Release:            5
+Release:            6
 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
 
+Patch1000:          add-loongarch64-support-graphviz.patch
+
 Patch6000:          backport-graphviz-2.48.0-gvpack-neato-static.patch
 # https://gitlab.com/graphviz/graphviz/-/commit/5d09f70d7f6b81eb891749895c2e6b81365ac234
 Patch6001:          CVE-2023-46045.patch
@@ -124,14 +126,12 @@ Summary:             Ruby extension for graphviz
 Requires:            %{name} = %{version}-%{release} ruby
 %description ruby
 Ruby extension for graphviz.
-%ifnarch loongarch64 sw_64
+
 %package tcl
 Summary:             Tcl extension & tools for graphviz
 Requires:            %{name} = %{version}-%{release} tcl >= 8.3 tk
 %description tcl
 Various tcl packages (extensions) for the graphviz tools.
-%endif
-
 
 %if %{with php}
 %package php
@@ -217,11 +217,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 echo "%{_libdir}/graphviz" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 touch $RPM_BUILD_ROOT%{_libdir}/graphviz/config%{pluginsver}
 
-%ifarch loongarch64 sw_64
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/lua/5.4/
-mv $RPM_BUILD_ROOT/usr/lib/lua/5.4/gv.so $RPM_BUILD_ROOT/usr/lib64/lua/5.4/gv.so
-%endif
-
 %check
 %if %{with php}
 LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} \
@@ -309,13 +304,14 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/
 %{_libdir}/graphviz/ruby/
 %{_libdir}/*ruby*/*
 
-%ifnarch loongarch64 sw_64
 %files tcl
 %{_libdir}/graphviz/tcl/
 %{_libdir}/tcl*/*
-%endif
 
 %changelog
+* Mon Feb 26 2024 yangchenguang <yangchenguang@kylinsec.com.cn> - 2.48.0-6
+- Modify loongarch64 and sw_64 support tcl subpackage
+
 * Fri Feb 02 2024 yaoxin <yao_xin001@hoperun.com> - 2.48.0-5
 - Fix CVE-2023-46045
 
-- 
Gitee