rpms/clojure/devel clojure.sh,1.1,1.2 clojure.spec,1.5,1.6

[Colin Walters]

Author: walters

Update of /cvs/pkgs/rpms/clojure/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26195

Modified Files:
	clojure.sh clojure.spec 
Log Message:
fix startup script, cd to right dir


Index: clojure.sh
===================================================================
RCS file: /cvs/pkgs/rpms/clojure/devel/clojure.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clojure.sh	23 Oct 2008 14:33:01 -0000	1.1
+++ clojure.sh	18 Dec 2008 15:24:59 -0000	1.2
@@ -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 "$@"


Index: clojure.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clojure/devel/clojure.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clojure.spec	18 Dec 2008 14:38:45 -0000	1.5
+++ clojure.spec	18 Dec 2008 15:24:59 -0000	1.6
@@ -33,17 +33,17 @@
 
 %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 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CPL.TXT readme.txt
+%doc clojure/readme.txt
 
 %attr(0755,root,root) %{_bindir}/clojure
 %{_javadir}/%{name}.jar