rpms/jython/devel jython.spec,1.6,1.7

[John Matthews (jmatthews)]

Author: jmatthews

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

Modified Files:
	jython.spec 
Log Message:
bugzilla: 426373
Updated to Jython 2.2.1, resolved bz 426373.




Index: jython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jython/devel/jython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jython.spec	19 Feb 2008 17:32:51 -0000	1.6
+++ jython.spec	24 Mar 2008 20:37:49 -0000	1.7
@@ -1,11 +1,11 @@
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 
 %define name               jython
-%define version            2.2
+%define version            2.2.1
 %define cpython_version    %{pyver}
 %define pyxml_version      0.8.3
-%define svn_tag            Release_2_2beta1
-%define release            0.4.%{svn_tag}.1jpp.3%{?dist}
+%define svn_tag            Release_2_2_1
+%define release            0.1.%{svn_tag}.1jpp.1%{?dist}
 
 %define gcj_support        1
 
@@ -16,10 +16,10 @@
 License:                   BSD
 URL:                       http://www.jython.org/
 # Use the included fetch-jython.sh script to generate the source drop
-# for jython 2.2beta1
-#
+# for jython 2.2.1
 # sh fetch-jython.sh \
-#   jython https://svn.sourceforge.net/svnroot Release_2_2beta1
+# 	jython https://jython.svn.sourceforge.net/svnroot Release_2_2_1
+#
 Source0:                   %{name}-fetched-src-%{svn_tag}.tar.bz2
 Source2:                   fetch-%{name}.sh
 Patch0:                    %{name}-cachedir.patch
@@ -109,12 +109,13 @@
 ant \
   -Dpython.home=%{_bindir} \
   -Dht2html.dir=%{_datadir}/ht2html \
-  -Dpython.lib=./Lib \
+  -Dpython.lib=./CPythonLib \
   -Dpython.exe=%{_bindir}/python \
   -DPyXmlHome=%{_libdir}/python%pyver \
   -Dtargetver=1.3 \
   copy-dist
 
+
 # remove #! from python files
 pushd dist
   for f in `find . -name '*.py'`
@@ -153,6 +154,7 @@
 rm -rf dist/Doc/javadoc
 mv dist/Doc %{name}-manual-%{version}
 
+
 # registry
 install -m 644 registry $RPM_BUILD_ROOT%{_datadir}/%{name}
 # scripts
@@ -206,7 +208,6 @@
 %{_bindir}/%{name} %{_datadir}/%{name}/Tools/%{name}c/%{name}c.py "\$@"
 EOF
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/Lib/UserDict.py
 
 # Natively compile
 %if %{gcj_support}
@@ -261,6 +262,7 @@
 %{_datadir}/%{name}/Lib
 %{_datadir}/%{name}/Tools
 %{_datadir}/%{name}/registry
+
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/jython-%{version}.jar*
@@ -279,6 +281,10 @@
 %doc %{_datadir}/%{name}/Demo
 
 %changelog
+* Tue Mar 18 2008 John Matthews <jmatthew at redhat.com> - 2.2.1-0.1.Release_2_2_1.1jpp.1
+- Update to 2.2.1
+- Resolves: rhbz#426373
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2-0.4.Release_2_2beta1.1jpp.3
 - Autorebuild for GCC 4.3