rpms/jython/devel jython.spec,1.4,1.5

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/extras/rpms/jython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32613

Modified Files:
	jython.spec 
Log Message:
- Require libreadline-java.
- Correct python.home property value.
- Resolves: rhbz#233949




Index: jython.spec
===================================================================
RCS file: /cvs/extras/rpms/jython/devel/jython.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jython.spec	26 Mar 2007 19:47:12 -0000	1.4
+++ jython.spec	27 Mar 2007 15:06:00 -0000	1.5
@@ -31,13 +31,11 @@
 Requires:                  oro
 Requires:                  servlet
 Requires:                  python >= %{cpython_version}
-# FIXME: merge libreadline-java-devel into libreadline-java and change
-# this back to libreadline-java.
-Requires:                  libreadline-java-devel
+Requires:                  libreadline-java >= 0.8.0-16
 Requires:                  mysql-connector-java
 BuildRequires:             ant
 BuildRequires:             ht2html
-BuildRequires:             libreadline-java
+BuildRequires:             libreadline-java >= 0.8.0-16
 BuildRequires:             mysql-connector-java
 BuildRequires:             oro
 BuildRequires:             python >= %{cpython_version}
@@ -100,8 +98,9 @@
 %patch1 -p1
 
 %build
-export CLASSPATH=$(build-classpath libreadline-java \
-  mysql-connector-java oro servlet)
+export CLASSPATH=$(build-classpath mysql-connector-java oro servlet)
+# FIXME: fix jpackage-utils to handle multilib correctly
+export CLASSPATH=$CLASSPATH:%{_libdir}/libreadline-java/libreadline-java.jar
 
 rm -rf org/apache
 
@@ -180,22 +179,16 @@
 
 # Configuration
 MAIN_CLASS=org.python.util.%{name}
-BASE_FLAGS=-Dpython.home=%{_datadir}/%{name}/Lib
-BASE_JARS="%{name} oro servlet"
+BASE_FLAGS=-Dpython.home=%{_datadir}/%{name}
+BASE_JARS="%{name} oro servlet mysql-connector-java"
 
-if [ -f %{_libdir}/libJavaEditline.so ]; then
-  BASE_FLAGS="\$BASE_FLAGS -Dpython.console=org.python.util.ReadlineConsole"
-  BASE_FLAGS="\$BASE_FLAGS -Djava.library.path=%{_libdir}"
-  BASE_FLAGS="\$BASE_FLAGS -Dpython.console.readlinelib=Editline"
-  BASE_JARS="\$BASE_JARS libreadline-java"
-fi
-
-if [ -f %{_javadir}/mysql-connector-java.jar ]; then
-  BASE_JARS="\$BASE_JARS mysql-connector-java"
-fi
+BASE_FLAGS="\$BASE_FLAGS -Dpython.console=org.python.util.ReadlineConsole"
+BASE_FLAGS="\$BASE_FLAGS -Djava.library.path=%{_libdir}/libreadline-java"
+BASE_FLAGS="\$BASE_FLAGS -Dpython.console.readlinelib=Editline"
 
 # Set parameters
 set_jvm
+CLASSPATH=$CLASSPATH:%{_libdir}/libreadline-java/libreadline-java.jar
 set_classpath \$BASE_JARS
 set_flags \$BASE_FLAGS
 set_options \$BASE_OPTIONS
@@ -288,6 +281,9 @@
 %changelog
 * Mon Mar 26 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.2-0.3.Release_2_2beta1.1jpp.3
 - Rename doc subpackage "manual".
+- Require libreadline-java.
+- Correct python.home property value.
+- Resolves: rhbz#233949
 
 * Fri Mar 23 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.2-0.3.Release_2_2beta1.1jpp.2
 - Fix -Dpython.console.readlinelib=Editline typo.