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
This commit is contained in:
parent
65992a0c28
commit
bfb75a1eba
4 changed files with 31 additions and 16 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 "$@"
|
||||
|
|
|
|||
38
clojure.spec
38
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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (clojure-1.9.0-alpha15.zip) = 88d0e0bc4dd85faa6b4d281927e659e0166cc9a9ecc2fb6e363c2f3e291f8506837d5b06143df6d7e0447128d9e7bd6004334775fad8597009cd39f37f3f77b7
|
||||
SHA512 (clojure-1.9.0-beta3.zip) = b118c3090d1dc195b32b42ae0f657b269850c2e5125de75e5da79f1587d3b6199ed3dbd9720df1506c67ef26c2a4758ded4792e3939a03346206a8a1078f077b
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue