[jython/f15: 2/2] Fix jython script to properly handle classpath.

[Alexander Kurtakov]

commit 0d60199db865c6867de26e60767f346419bac727
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Jun 6 14:20:17 2011 +0300

    Fix jython script to properly handle classpath.

 jython.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/jython.spec b/jython.spec
index 254bc97..c0f6d08 100644
--- a/jython.spec
+++ b/jython.spec
@@ -7,7 +7,7 @@
 
 Name:                      jython
 Version:                   2.2.1
-Release:                   6%{?dist}
+Release:                   7%{?dist}
 Summary:                   A Java implementation of the Python language
 License:                   ASL 1.1 and BSD and CNRI and JPython and Python
 URL:                       http://www.jython.org/
@@ -122,8 +122,8 @@ install -m 644 dist/%{name}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/Doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr dist/Doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 # these are not supposed to be distributed
@@ -181,7 +181,7 @@ BASE_FLAGS="\$BASE_FLAGS -Dpython.console.readlinelib=Editline"
 
 # Set parameters
 set_jvm
-CLASSPATH=$CLASSPATH:\$JYTHONLIBDIR/libreadline-java/libreadline-java.jar
+CLASSPATH=\$CLASSPATH:\$JYTHONLIBDIR/libreadline-java/libreadline-java.jar
 set_classpath \$BASE_JARS
 set_flags \$BASE_FLAGS
 set_options \$BASE_OPTIONS
@@ -213,7 +213,7 @@ EOF
 %files javadoc
 %defattr(-,root,root)
 %doc LICENSE.txt
-%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 %files manual
 %defattr(-,root,root)
@@ -226,6 +226,9 @@ EOF
 %doc %{_datadir}/%{name}/Demo
 
 %changelog
+* Mon Jun 6 2011 Alexander Kurtakov <akurtako at redhat.com> 2.2.1-7
+- Fix jython script to properly handle classpath.
+
 * Fri Feb 25 2011 Alexander Kurtakov <akurtako at redhat.com> 2.2.1-6
 - Fix oro BR/R.
 - Remove parts not needed.