rpms/jython/F-13 jython.spec,1.18,1.19
Andrew Overholt
overholt at fedoraproject.org
Tue Jun 8 18:44:09 UTC 2010
Author: overholt
Update of /cvs/pkgs/rpms/jython/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24108
Modified Files:
jython.spec
Log Message:
* Tue Jun 08 2010 Andrew Overholt <overholt at redhat.com> 2.2.1-4.5
- Fix wrapper script to not reference %{_libdir} of build machine.
- Resolves bug #601766.
Index: jython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jython/F-13/jython.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- jython.spec 16 Feb 2010 15:55:20 -0000 1.18
+++ jython.spec 8 Jun 2010 18:44:09 -0000 1.19
@@ -7,7 +7,7 @@
Name: jython
Version: 2.2.1
-Release: 4.4%{?dist}
+Release: 4.5%{?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/
@@ -171,18 +171,26 @@ if [ -f \$HOME/.%{name}rc ] ; then
. \$HOME/.%{name}rc
fi
+# Arch-specific location of dependency
+case \$(uname -m) in
+ x86_64 | ia64 | s390x | ppc64 | sparc64 )
+ JYTHONLIBDIR="/usr/lib64" ;;
+ * )
+ JYTHONLIBDIR="/usr/lib" ;;
+esac
+
# Configuration
MAIN_CLASS=org.python.util.%{name}
BASE_FLAGS=-Dpython.home=%{_datadir}/%{name}
BASE_JARS="%{name} oro servlet mysql-connector-java"
BASE_FLAGS="\$BASE_FLAGS -Dpython.console=org.python.util.ReadlineConsole"
-BASE_FLAGS="\$BASE_FLAGS -Djava.library.path=%{_libdir}/libreadline-java"
+BASE_FLAGS="\$BASE_FLAGS -Djava.library.path=\$JYTHONLIBDIR/libreadline-java"
BASE_FLAGS="\$BASE_FLAGS -Dpython.console.readlinelib=Editline"
# Set parameters
set_jvm
-CLASSPATH=$CLASSPATH:%{_libdir}/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
@@ -227,6 +235,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/%{name}/Demo
%changelog
+* Tue Jun 08 2010 Andrew Overholt <overholt at redhat.com> 2.2.1-4.5
+- Fix wrapper script to not reference %%{_libdir} of build machine.
+- Resolves bug #601766.
+
* Tue Feb 16 2010 Andrew Overholt <overholt at redhat.com> 2.2.1-4.4
- Disable _python_bytecompile_errors_terminate_build.
- Disable gcj support.
More information about the scm-commits
mailing list