summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Alexandre Salim <salimma@fedoraproject.org>2012-06-12 09:26:13 +0700
committerMichel Alexandre Salim <salimma@fedoraproject.org>2012-06-12 09:26:13 +0700
commitbf2b0fd06777aa9e43e01ec9288f3f2be031a7bc (patch)
treeea7a74f3ada53c008bab7c9e1e55c278e2e28018
parent0ae574430bf5f0250ce4c47871ada1e3264103f4 (diff)
downloadspecs-bf2b0fd06777aa9e43e01ec9288f3f2be031a7bc.tar.gz
specs-bf2b0fd06777aa9e43e01ec9288f3f2be031a7bc.tar.xz
specs-bf2b0fd06777aa9e43e01ec9288f3f2be031a7bc.zip
Update leiningen package to include launcher script and pull the
needed maven2 subpackages
-rw-r--r--clojure/leiningen.spec35
1 files changed, 26 insertions, 9 deletions
diff --git a/clojure/leiningen.spec b/clojure/leiningen.spec
index 1b0903c..35805c6 100644
--- a/clojure/leiningen.spec
+++ b/clojure/leiningen.spec
@@ -3,17 +3,18 @@
%global artifactId leiningen
%global commit_hash 713a4d9
-%global fullver %{version}%{?prerel:-%{prerel}}
-
Name: leiningen
Version: 1.7.1
-Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?dist}
Summary: Clojure project automation tool
License: EPL
URL: https://github.com/%{vendor}/%{name}
-# wget --content-disposition %{url}/tarball/%{version}%{?prerel:-%{prerel}}
-Source0: %{vendor}-%{name}-%{fullver}-0-g%{commit_hash}.tar.gz
+# wget --content-disposition %%{url}/tarball/%%{version}
+Source0: %{vendor}-%{name}-%{version}-0-g%{commit_hash}.tar.gz
+# Fedora/EPEL-specific patches
+# Patch the launcher script to set classpath to the proper JAR names
+Patch100: %{name}-1.7.1-jpp.patch
BuildArch: noarch
@@ -47,6 +48,8 @@ Requires(post): jpackage-utils
Requires(postun): jpackage-utils
%endif
+Requires: ant
+Requires: classworlds
Requires: clojure-compat
Requires: clojure-contrib
Requires: java-devel
@@ -54,7 +57,12 @@ Requires: clucy
Requires: jline
Requires: lancet
Requires: maven-ant-tasks
+Requires: maven-artifact
+# remove once maven-ant-tasks is fixed
Requires: maven-error-diagnostics
+# ---
+Requires: maven-settings
+Requires: rlwrap
Requires: robert-hooke
%description
@@ -67,6 +75,7 @@ plugins.
%prep
%setup -q -n %{vendor}-%{name}-%{commit_hash}
+%patch100 -p1 -b .jpp
%build
@@ -97,12 +106,15 @@ install -pm 644 pom.xml \
%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP %{name}.jar
%endif
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-cp -p bash_completion.bash \
+install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 bin/lein-pkg $RPM_BUILD_ROOT%{_bindir}/lein
+
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -pm 644 bash_completion.bash \
$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/lein
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
-cp -p zsh_completion.zsh \
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
+install -pm 644 zsh_completion.zsh \
$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/_lein
@@ -120,6 +132,7 @@ cp -p zsh_completion.zsh \
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
%{_javadir}/%{name}.jar
+%{_bindir}/lein
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/lein
%dir %{_datadir}/zsh
@@ -128,6 +141,10 @@ cp -p zsh_completion.zsh \
%changelog
+* Tue Jun 12 2012 Michel Salim <salimma@fedoraproject.org> - 1.7.1-2
+- Package launcher script
+- Update dependencies
+
* Mon Jun 11 2012 Michel Salim <salimma@fedoraproject.org> - 1.7.1-1
- Initial package