From ab9ccf263b1f1fd3a3b796a71668b6991314342b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Dec 18 2008 15:24:59 +0000 Subject: fix startup script, cd to right dir --- diff --git a/clojure.sh b/clojure.sh index fce9f65..4ef2bc6 100644 --- a/clojure.sh +++ b/clojure.sh @@ -1,7 +1,2 @@ #!/bin/bash -clojure="java ${JAVA_OPTS} -cp /usr/share/java/clojure.jar:${CLASSPATH}" -if test -z "$1"; then - exec ${clojure} clojure.lang.Repl /usr/share/clojure/boot.clj -else - exec ${clojure} clojure.lang.Script /usr/share/clojure/boot.clj "$@" -fi \ No newline at end of file +exec java ${JAVA_OPTS} -jar /usr/share/java/clojure.jar "$@" diff --git a/clojure.spec b/clojure.spec index ab5bd62..142eb03 100644 --- a/clojure.spec +++ b/clojure.spec @@ -33,17 +33,17 @@ can avoid reflection. %prep %setup -q -c -n clojure-%{version} - +cd clojure rm -f *.jar %build +cd clojure ant jar %install +cd clojure rm -rf %{buildroot} -chmod 644 CPL.TXT - # prefix install install -p -d -m 755 %{buildroot}%{_datadir}/%{name} cp -ar src/clj/clojure/* %{buildroot}%{_datadir}/%{name}/ @@ -63,7 +63,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc CPL.TXT readme.txt +%doc clojure/readme.txt %attr(0755,root,root) %{_bindir}/clojure %{_javadir}/%{name}.jar