From 2b9fba48afbb5828603eb356d353859014fde7b2e3461c7f65a3b72ce8969606 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 9 Jul 2021 05:05:04 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jnr-x86asm?expand=0&rev=5

---
 1.0.2.tar.gz       |  3 ---
 _service           |  3 ---
 jnr-x86asm.changes |  8 --------
 jnr-x86asm.spec    | 28 ++++++++++++++++++----------
 4 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 1.0.2.tar.gz
 delete mode 100644 _service

diff --git a/1.0.2.tar.gz b/1.0.2.tar.gz
deleted file mode 100644
index 0b68c5e..0000000
--- a/1.0.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5f2b543695241c9549bf84151cb37b0c09335f442a36dbdae494e9a35a68f73
-size 114138
diff --git a/_service b/_service
deleted file mode 100644
index b3ae8b4..0000000
--- a/_service
+++ /dev/null
@@ -1,3 +0,0 @@
-<services>
-	<service name="download_files" mode="manual"/>
-</services>
diff --git a/jnr-x86asm.changes b/jnr-x86asm.changes
index 523d1d2..408ed69 100644
--- a/jnr-x86asm.changes
+++ b/jnr-x86asm.changes
@@ -1,11 +1,3 @@
--------------------------------------------------------------------
-Thu Jul  8 18:06:02 UTC 2021 - Anton Shvetz <shvetz.anton@gmail.com>
-
-- Change the source link
-- Spec file cleanup
-- Install artifact into %{_javadir}/jnr
-- Add the _service file
-
 -------------------------------------------------------------------
 Fri Jul 24 08:47:52 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jnr-x86asm.spec b/jnr-x86asm.spec
index fbe7f88..856cd40 100644
--- a/jnr-x86asm.spec
+++ b/jnr-x86asm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jnr-x86asm
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,16 @@
 #
 
 
-%global cluster jnr
-Name:           %{cluster}-x86asm
+%global commit_hash 1dead92
+%global tag_hash 2a7fb9b
+Name:           jnr-x86asm
 Version:        1.0.2
 Release:        0
-Summary:        Pure java x86 and x86_64 assembler
+Summary:        Pure-java port of asmjit
 License:        MIT
 Group:          Development/Libraries/Java
-URL:            https://github.com/%{cluster}/%{name}/
-Source0:        %{url}/archive/refs/tags/%{version}.tar.gz
+URL:            https://github.com/jnr/%{name}/
+Source0:        https://github.com/jnr/%{name}/tarball/%{version}/jnr-%{name}-%{version}-0-g%{commit_hash}.tar.gz
 Source1:        MANIFEST.MF
 Patch0:         add-manifest.patch
 BuildRequires:  fdupes
@@ -33,7 +34,7 @@ BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 BuildArch:      noarch
 
 %description
-This is a pure-java port of asmjit (http://code.google.com/p/asmjit/).
+Pure-java port of asmjit (http://code.google.com/p/asmjit/)
 
 %package        javadoc
 Summary:        Javadoc for %{name}
@@ -43,13 +44,20 @@ Group:          Documentation/HTML
 Javadoc for %{name}.
 
 %prep
-%setup -q
+%setup -q -n jnr-%{name}-%{tag_hash}
 %patch0
 cp %{SOURCE1} .
-%{mvn_file} : %{cluster}/%{name}
+find ./ -name '*.jar' -delete
+find ./ -name '*.class' -delete
+
+%pom_xpath_set "pom:project/pom:properties/pom:maven.compiler.source" "1.6"
+%pom_xpath_set "pom:project/pom:properties/pom:maven.compiler.target" "1.6"
 
 %build
-%{mvn_build} -f -- -Dmaven.compiler.{source,target}=8
+%{mvn_build} -f \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+	-- -Dmaven.compiler.release=6
+%endif
 
 %install
 %mvn_install