diff --git a/.gitignore b/.gitignore index f413088..fba5c80 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /clojure-1.7.0-RC2.zip /clojure-1.7.0.zip /clojure-1.8.0-beta1.zip +/clojure-1.8.0.zip diff --git a/clojure.spec b/clojure.spec index d37990c..494c643 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,15 +2,15 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} -%global full_version %{version}-beta1 +%global full_version %{version} Name: clojure Epoch: 1 Version: 1.8.0 -Release: 0.beta1%{?dist}.7 +Release: 1%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine -License: EPL +License: EPL-1.0 URL: http://clojure.org/ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{full_version}.zip @@ -23,6 +23,7 @@ BuildRequires: maven-local BuildRequires: ant >= 1.6 BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: sonatype-oss-parent %if 0%{?fedora} > 20 Requires: java-headless >= 1:1.6 @@ -66,12 +67,18 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %mvn_install %files -f .mfiles -%doc epl-v10.html changes.md readme.txt +%license epl-v10.html +%doc changes.md readme.txt %{_mavenpomdir}/* %{_javadir}/%{name}.jar %{_bindir}/%{name} %changelog +* Wed Sep 04 2019 Markku Korkeala - 1:1.8.0-1 +- Update to upstream release 1.8.0 +- Add sonatype-oss-parent as a build requirement +- Add license macro and fix license short name + * Wed Jul 24 2019 Fedora Release Engineering - 1:1.8.0-0.beta1.7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 4282f4e..f59d194 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clojure-1.8.0-beta1.zip) = 2997e1899df65e091966ab6e1fea889e3725e7ebbb1ef4bb2f63d355988dfc2a763a12b64098f7ae71e4dcfaadc6abf3a2ee264d3c94348c986e7b70ac1f8c30 +SHA512 (clojure-1.8.0.zip) = 36d95213f35ba182d8f3efb4753a50078a0f19a4ef9084c10c300ea075d11ba7d92dec51347afc5c23424800b9c75f9fcc363b23ead4f836ed193d8913ade0e4