From 2e18b5619f11ac9aad051deea55915aaec2dca44 Mon Sep 17 00:00:00 2001
From: fstrba <>
Date: Apr 27 2023 19:00:26 +0000
Subject: Update jansi to version 2.4.0 / rev 6 via SR 1083071
https://build.opensuse.org/request/show/1083071
by user fstrba + dimstar_suse
Appease lawyers
---
diff --git a/.files b/.files
index 798a423..d445f54 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index b59c131..3c2005e 100644
--- a/.rev
+++ b/.rev
@@ -45,4 +45,12 @@
<comment>maven 3.8.5 / jansi 2.4.0 and fixes for building with them</comment>
<requestid>977561</requestid>
</revision>
+ <revision rev="6" vrev="2">
+ <srcmd5>cd94c34d39e542ede7d2d4b01dae8e78</srcmd5>
+ <version>2.4.0</version>
+ <time>1682618442</time>
+ <user>dimstar_suse</user>
+ <comment>Appease lawyers</comment>
+ <requestid>1083071</requestid>
+ </revision>
</revisionlist>
diff --git a/_service b/_service
new file mode 100644
index 0000000..b6fb4fe
--- /dev/null
+++ b/_service
@@ -0,0 +1,19 @@
+<services>
+ <service name="tar_scm" mode="disabled">
+ <param name="scm">git</param>
+ <param name="url">https://github.com/fusesource/jansi.git</param>
+ <param name="revision">jansi-2.4.0</param>
+ <param name="match-tag">jansi-*</param>
+ <param name="versionformat">@PARENT_TAG@</param>
+ <param name="versionrewrite-pattern">jansi-(.*)</param>
+ <param name="exclude">src/main/native/inc_mac</param>
+ <param name="exclude">src/main/native/inc_win</param>
+ <param name="exclude">src/main/native/inc_linux/*</param>
+ <param name="exclude">src/main/resources/org/fusesource/jansi/internal</param>
+ </service>
+ <service name="recompress" mode="disabled">
+ <param name="file">*.tar</param>
+ <param name="compression">xz</param>
+ </service>
+ <service name="set_version" mode="disabled"/>
+</services>
diff --git a/jansi-2.4.0.tar.gz b/jansi-2.4.0.tar.gz
deleted file mode 120000
index d9c199f..0000000
--- a/jansi-2.4.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreif2ddcqo4hoxmfw6rzcksw2qyebhdtqarnfmtx2inrgucljdxhvkm
\ No newline at end of file
diff --git a/jansi-2.4.0.tar.xz b/jansi-2.4.0.tar.xz
new file mode 120000
index 0000000..1d22fb1
--- /dev/null
+++ b/jansi-2.4.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreifcaqhv5u57aazc2ao2frejudu6mz6d6dtckf5gdzys3h6m6oivo4
\ No newline at end of file
diff --git a/jansi.changes b/jansi.changes
index 69b02c1..d685ffe 100644
--- a/jansi.changes
+++ b/jansi.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Apr 26 15:53:32 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Fetch sources using source_service and don't distribute legally
+ spurious files (bsc#1210877)
+
+-------------------------------------------------------------------
Mon May 16 11:00:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Upgrade the latest upstream release 2.4.0
diff --git a/jansi.spec b/jansi.spec
index f5e534f..07affc2 100644
--- a/jansi.spec
+++ b/jansi.spec
@@ -1,7 +1,7 @@
#
# spec file for package jansi
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@ Summary: Java library for generating and interpreting ANSI escape sequenc
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://fusesource.github.io/jansi/
-Source0: https://github.com/fusesource/jansi/archive/jansi-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.xz
Source1: %{name}-build.xml
Patch0: %{name}-jni.patch
BuildRequires: ant
@@ -46,7 +46,7 @@ BuildArch: noarch
This package contains the API documentation for %{name}.
%prep
-%setup -q -n jansi-jansi-%{version}
+%setup -q
cp %{SOURCE1} build.xml
%pom_remove_parent
@@ -66,11 +66,7 @@ cp %{SOURCE1} build.xml
# Build for JDK 1.8 at a minimum
%pom_xpath_set "//pom:properties/pom:jdkTarget" 1.8
-# Remove prebuilt shared objects
-rm -fr src/main/resources/org/fusesource/jansi/internal
-
-# Unbundle the JNI headers
-rm src/main/native/inc_linux/*.h
+# Link the JNI headers
ln -s %{java_home}/include/jni.h src/main/native/inc_linux
ln -s %{java_home}/include/linux/jni_md.h src/main/native/inc_linux