diff options
| author | Michel Alexandre Salim <salimma@fedoraproject.org> | 2012-08-19 09:19:01 +0700 |
|---|---|---|
| committer | Michel Alexandre Salim <salimma@fedoraproject.org> | 2012-08-19 09:19:37 +0700 |
| commit | 11fcf2dbead917436595b20c24df460a8f25611b (patch) | |
| tree | 0ba749568a40351b829608b99ba9d33ccf935c7f /clojure | |
| parent | 8efc4965f5b9c1a497d1f59b16eba88b3ce07191 (diff) | |
Update leininge to use Debian-style build script
Diffstat (limited to 'clojure')
| -rw-r--r-- | clojure/leiningen.spec | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/clojure/leiningen.spec b/clojure/leiningen.spec index 35805c6..41c877b 100644 --- a/clojure/leiningen.spec +++ b/clojure/leiningen.spec @@ -5,7 +5,7 @@ Name: leiningen Version: 1.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Clojure project automation tool License: EPL @@ -30,10 +30,13 @@ BuildRequires: maven-ant-tasks # this should be a maven-ant-tasks dependency: # https://bugzilla.redhat.com/show_bug.cgi?id=830786 BuildRequires: maven-error-diagnostics +# needed by lein script +BuildRequires: rlwrap BuildRequires: robert-hooke BuildRequires: maven +BuildRequires: maven-artifact BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin @@ -79,21 +82,12 @@ plugins. %build -%if 0%{?rhel} -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL - -mvn-jpp \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -%else -mvn-rpmbuild \ -%endif - install +LEIN_ROOT=y sh bin/lein-pkg compile :all, jar %install install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -pm 644 target/%{name}-%{version}.jar \ +install -pm 644 %{name}-%{version}.jar \ $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} @@ -118,6 +112,12 @@ install -pm 644 zsh_completion.zsh \ $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/_lein +%check +# FIXME +# debug this; even though it fails, the resulting package is functional +# LEIN_ROOT=y sh bin/lein-pkg test + + %if 0%{?rhel} %post %update_maven_depmap @@ -141,6 +141,9 @@ install -pm 644 zsh_completion.zsh \ %changelog +* Sun Aug 19 2012 Michel Salim <salimma@fedoraproject.org> - 1.7.1-3 +- Use package's own launcher script to build the JAR (from Debian) + * Tue Jun 12 2012 Michel Salim <salimma@fedoraproject.org> - 1.7.1-2 - Package launcher script - Update dependencies |