diff --git a/.gitignore b/.gitignore index f871958..9c7c810 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /clojure-clojure-1.5.0-RC1.zip /clojure-1.5.0.zip /clojure-1.5.1.zip +/clojure-1.6.0-beta2.zip diff --git a/clojure.spec b/clojure.spec index 68d0844..d47c030 100644 --- a/clojure.spec +++ b/clojure.spec @@ -2,17 +2,18 @@ %global groupId org.clojure %global artifactId clojure %global archivename %{project}-%{artifactId} +%global full_version %{version}-beta2 Name: clojure Epoch: 1 -Version: 1.5.1 -Release: 2%{?dist} +Version: 1.6.0 +Release: 0.2%{?dist} Summary: A dynamic programming language that targets the Java Virtual Machine Group: Development/Languages License: EPL URL: http://clojure.org/ -Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.zip +Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{full_version}.zip Source1: clojure.sh @@ -25,7 +26,12 @@ BuildRequires: objectweb-asm BuildRequires: java-devel >= 1:1.6.0 Requires: jpackage-utils +%if 0%{?fedora} > 20 +Requires: java-headless >= 1:1.6 +%else Requires: java >= 1:1.6 +%endif + Requires: objectweb-asm %description @@ -41,7 +47,7 @@ optional type hints and type inference, to ensure that calls to Java can avoid reflection. %prep -%setup -q -n %{archivename}-%{version} +%setup -q -n %{archivename}-%{full_version} %build ant -Dmaven.test.skip=1 @@ -84,6 +90,10 @@ rm -rf %{buildroot} %{_bindir}/%{name} %changelog +* Wed Mar 5 2014 Jochen Schmitt - 1:1.6.0-0.2 +- New upstream pre-release +- Add support for headless java (#1068005) + * Sat Aug 03 2013 Fedora Release Engineering - 1:1.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index a0c9c95..30d5cc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f46d49e5d26f776e2971473d70cf416f clojure-1.5.1.zip +199480ea8449e545f058523f798897d0 clojure-1.6.0-beta2.zip