From bfb75a1ebaa7764ac8470f594e097c06d1a7a27b Mon Sep 17 00:00:00 2001
From: Markku Korkeala <markku.korkeala@iki.fi>
Date: Apr 13 2020 17:43:03 +0000
Subject: Update to upstream release 1.9.0-beta3

Switch to use maven building
Remove plugin org.sonatype.plugins:nexus-staging-maven-plugin
Remove jsr166 dependency from pom

---

diff --git a/.gitignore b/.gitignore
index aa398be..ba1be0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /clojure-1.8.0-beta1.zip
 /clojure-1.8.0.zip
 /clojure-1.9.0-alpha15.zip
+/clojure-1.9.0-beta3.zip
diff --git a/clojure.sh b/clojure.sh
index 4ef2bc6..74a7106 100644
--- a/clojure.sh
+++ b/clojure.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec java ${JAVA_OPTS} -jar /usr/share/java/clojure.jar "$@"
+CLOJUREJAR=/usr/share/java/clojure/clojure.jar
+CORESPECSJAR=/usr/share/java/clojure-core-specs-alpha/core.specs.alpha.jar
+SPECALPHAJAR=/usr/share/java/clojure-spec-alpha/spec.alpha.jar
+CLASSPATH=$CLASSPATH:$CLOJUREJAR:$SPECALPHAJAR:$CORESPECSALPHA
+exec java ${JAVA_OPTS} -cp $CLASSPATH clojure.main "$@"
diff --git a/clojure.spec b/clojure.spec
index a24c157..fc2efa0 100644
--- a/clojure.spec
+++ b/clojure.spec
@@ -2,12 +2,12 @@
 %global groupId     org.clojure
 %global artifactId  clojure
 %global archivename %{project}-%{artifactId}
-%global full_version %{version}-alpha15
+%global full_version %{version}-beta3
 
 Name:           clojure
 Epoch:          1
 Version:        1.9.0
-Release:        0.alpha15.1%{?dist}
+Release:        0.beta3.1%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 License:        EPL-1.0
@@ -24,10 +24,22 @@ BuildRequires:  ant >= 1.6
 BuildRequires:  objectweb-asm
 BuildRequires:  java-devel >= 1:1.8.0
 BuildRequires:  sonatype-oss-parent
+BuildRequires:  clojure-spec-alpha  >= 1:0.1.134-2
+BuildRequires:  clojure-core-specs-alpha  >= 1:0.1.24-2
+BuildRequires:  clojure-maven-plugin >= 1.8.1
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-release-plugin
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-assembly-plugin
+BuildRequires:  maven-source-plugin
+BuildRequires:  maven-plugin-build-helper
+BuildRequires:  maven-antrun-plugin
 
 Requires:       java-headless >= 1:1.8
-
 Requires:       objectweb-asm
+Requires:       clojure-spec-alpha  >= 1:0.1.134-2
+Requires:       clojure-core-specs-alpha  >= 1:0.1.24-2
 
 %description 
 Clojure is a dynamic programming language that targets the Java
@@ -43,19 +55,13 @@ can avoid reflection.
 
 %prep
 %setup -q -n %{archivename}-%{full_version}
+%pom_remove_dep org.codehaus.jsr166-mirror:jsr166y
+%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
 
 %build
-ant -Dmaven.test.skip=1
-
-%mvn_artifact pom.xml %{name}.jar
+%mvn_build -f -j
 
 %install
-# jar - link to prefix'd jar so that java stuff knows where to look
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
 # startup script
 install -d -m 755 %{buildroot}%{_bindir}
 install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
@@ -65,11 +71,15 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
 %files -f .mfiles
 %license epl-v10.html 
 %doc changes.md readme.txt 
-%{_mavenpomdir}/*
-%{_javadir}/%{name}.jar
 %{_bindir}/%{name}
 
 %changelog
+* Sat Apr 11 2020 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.9.0-0.beta3.1
+- Update to upstream release 1.9.0-beta3
+- Switch to use maven building
+- Remove plugin org.sonatype.plugins:nexus-staging-maven-plugin
+- Remove jsr166 dependency from pom 
+
 * Sat Apr 04 2020 Markku Korkeala <markku.korkeala@iki.fi> - 1:1.9.0-0.alpha15.1
 - Update to upstream release 1.9.0-alpha15
 - Update to require JDK 1.8
diff --git a/sources b/sources
index 9f7cd28..5ca6127 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clojure-1.9.0-alpha15.zip) = 88d0e0bc4dd85faa6b4d281927e659e0166cc9a9ecc2fb6e363c2f3e291f8506837d5b06143df6d7e0447128d9e7bd6004334775fad8597009cd39f37f3f77b7
+SHA512 (clojure-1.9.0-beta3.zip) = b118c3090d1dc195b32b42ae0f657b269850c2e5125de75e5da79f1587d3b6199ed3dbd9720df1506c67ef26c2a4758ded4792e3939a03346206a8a1078f077b