rpms/jython/devel jython-nofullbuildpath.patch, 1.2, 1.3 jython.spec, 1.2, 1.3

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

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

Modified Files:
	jython-nofullbuildpath.patch jython.spec 
Log Message:
* 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.
- Fix LICENSE.txt location in jython-nofullbuildpath.patch.
- Require libreadline-java-devel.
- Check for libJavaEditline.so explicitly in wrapper script.



jython-nofullbuildpath.patch:

Index: jython-nofullbuildpath.patch
===================================================================
RCS file: /cvs/extras/rpms/jython/devel/jython-nofullbuildpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jython-nofullbuildpath.patch	23 Mar 2007 15:01:40 -0000	1.2
+++ jython-nofullbuildpath.patch	24 Mar 2007 00:11:44 -0000	1.3
@@ -33,7 +33,7 @@
          <!-- copy the CPython license -->
          <echo>copy CPython LICENSE from ${svn.checkout.dir}/python</echo>
 -        <copy file="${svn.checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
-+        <copy file="${PyXmlHome}/LICENSE.txt" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
++        <copy file="LICENSE.txt" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
  
          <!-- sources: todir has to correspond with installer/**/JarInstaller.java -->
          <echo>copy sources from ${jython.base.dir}</echo>


Index: jython.spec
===================================================================
RCS file: /cvs/extras/rpms/jython/devel/jython.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jython.spec	23 Mar 2007 15:01:40 -0000	1.2
+++ jython.spec	24 Mar 2007 00:11:44 -0000	1.3
@@ -5,7 +5,7 @@
 %define cpython_version    %{pyver}
 %define pyxml_version      0.8.3
 %define svn_tag            Release_2_2beta1
-%define release            0.3.%{svn_tag}.1jpp.1%{?dist}
+%define release            0.3.%{svn_tag}.1jpp.2%{?dist}
 
 %define gcj_support        1
 
@@ -25,13 +25,16 @@
 Source2:                   fetch-%{name}.sh
 Patch0:                    %{name}-cachedir.patch
 # Make javadoc and copy-full tasks not depend upon "full-build"
-# Also, copy python's license from ${PyXmlHome} and not ${python.home}
+# Also, copy python's license from source directory and not
+# ${python.home}
 Patch1:                    %{name}-nofullbuildpath.patch
 Requires:                  jpackage-utils >= 0:1.5
 Requires:                  oro
 Requires:                  servlet
 Requires:                  python >= %{cpython_version}
-Requires:                  libreadline-java
+# FIXME: merge libreadline-java-devel into libreadline-java and change
+# this back to libreadline-java.
+Requires:                  libreadline-java-devel
 Requires:                  mysql-connector-java
 BuildRequires:             ant
 BuildRequires:             ht2html
@@ -176,10 +179,10 @@
 BASE_FLAGS=-Dpython.home=%{_datadir}/%{name}/Lib
 BASE_JARS="%{name} oro servlet"
 
-if [ -f %{_libdir}/libJavaEditline.so* ]; then
+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_FLAGS="\$BASE_FLAGS -Dpython.console.readlinelib=Editline"
   BASE_JARS="\$BASE_JARS libreadline-java"
 fi
 
@@ -279,6 +282,12 @@
 %endif
 
 %changelog
+* 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.
+- Fix LICENSE.txt location in jython-nofullbuildpath.patch.
+- Require libreadline-java-devel.
+- Check for libJavaEditline.so explicitly in wrapper script.
+
 * Wed Feb 28 2007 Andrew Overholt <overholt at redhat.com> 2.2-0.3.Release_2_2beta1.1jpp.1
 - 2.2beta1
 - Use 0.z.tag.Xjpp.Y release format