rpms/jython/devel jython-cachedir.patch, 1.1, 1.2 jython-nofullbuildpath.patch, 1.1, 1.2 jython.spec, 1.1, 1.2 sources, 1.2, 1.3
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Fri Mar 23 15:02:13 UTC 2007
- Previous message (by thread): rpms/ettercap/devel ettercap.spec,1.2,1.3
- Next message (by thread): rpms/jd/FC-5 .cvsignore, 1.18, 1.19 jd.spec, 1.23, 1.24 sources, 1.18, 1.19 jd-1.8.8-beta070317-aalist-disp.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: overholt
Update of /cvs/extras/rpms/jython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27757
Modified Files:
jython-cachedir.patch jython-nofullbuildpath.patch jython.spec
sources
Log Message:
* 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
- Remove unnecessary copy of python 2.2 library
jython-cachedir.patch:
Index: jython-cachedir.patch
===================================================================
RCS file: /cvs/extras/rpms/jython/devel/jython-cachedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jython-cachedir.patch 22 Jan 2007 21:54:23 -0000 1.1
+++ jython-cachedir.patch 23 Mar 2007 15:01:40 -0000 1.2
@@ -1,8 +1,9 @@
---- jython-20030113/org/python/core/PySystemState.java~ 2003-01-14 16:44:44.000000000 -0500
-+++ jython-20030113/org/python/core/PySystemState.java 2003-01-14 16:47:55.000000000 -0500
-@@ -459,7 +459,13 @@
+diff -ur jython-svn-Release_2_2beta1/src/org/python/core/PySystemState.java jython-svn-Release_2_2beta1.patched/src/org/python/core/PySystemState.java
+--- jython-svn-Release_2_2beta1/src/org/python/core/PySystemState.java 2007-02-07 02:19:53.000000000 -0500
++++ jython-svn-Release_2_2beta1/src/org/python/core/PySystemState.java 2007-03-23 09:41:27.000000000 -0400
+@@ -534,7 +534,13 @@
}
- cachedir = new File(props.getProperty("python.cachedir", "cachedir"));
+ cachedir = new File(props.getProperty(PYTHON_CACHEDIR, CACHEDIR_DEFAULT_NAME));
if (!cachedir.isAbsolute()) {
- cachedir = new File(PySystemState.prefix, cachedir.getPath());
+ File jythondir = new File(System.getProperty("user.home"), ".jython");
@@ -14,17 +15,4 @@
+ cachedir = new File(jythondir, cachedir.getPath());
}
}
-
---- jython/org/python/core/PySystemState.java~ 2004-02-16 17:27:22.000000000 -0500
-+++ jython/org/python/core/PySystemState.java 2004-02-16 17:29:05.000000000 -0500
-@@ -311,8 +311,8 @@
- }
- try {
- addRegistryFile(new File(prefix, "registry"));
-- File homeFile = new File(registry.getProperty("user.home"),
-- ".jython");
-+ File homeFile = new File(new File(registry.getProperty("user.home"),
-+ ".jython"), "registry");
- addRegistryFile(homeFile);
- } catch (Exception exc) {
- ;
+
jython-nofullbuildpath.patch:
Index: jython-nofullbuildpath.patch
===================================================================
RCS file: /cvs/extras/rpms/jython/devel/jython-nofullbuildpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jython-nofullbuildpath.patch 22 Jan 2007 21:54:23 -0000 1.1
+++ jython-nofullbuildpath.patch 23 Mar 2007 15:01:40 -0000 1.2
@@ -1,8 +1,7 @@
-Index: build.xml
-===================================================================
---- build.xml (revision 2972)
-+++ build.xml (working copy)
-@@ -460,7 +460,7 @@
+diff -ur jython-svn-Release_2_2beta1/build.xml jython-svn-Release_2_2beta1.patched/build.xml
+--- jython-svn-Release_2_2beta1/build.xml 2007-02-12 00:39:50.000000000 -0500
++++ jython-svn-Release_2_2beta1/build.xml 2007-03-23 09:44:10.000000000 -0400
+@@ -530,7 +530,7 @@
<!-- build the .html files using the ht2html tool -->
@@ -11,7 +10,7 @@
<fail unless="ht2html.dir" message="ht2html.dir is not set" />
<copy todir="${dist.dir}/Doc" preservelastmodified="true">
<fileset dir="Doc" includes="*.ht, **/*.gif" />
-@@ -481,7 +481,7 @@
+@@ -551,7 +551,7 @@
<!-- javadoc -->
@@ -20,21 +19,21 @@
<javadoc sourcepath="${source.dir}"
destdir="${apidoc.dir}"
source="${jdk.source.version}"
-@@ -497,7 +497,7 @@
+@@ -567,7 +567,7 @@
<!-- copy for full distribution -->
- <target name="copy-full" if="full-build">
+ <target name="copy-full">
<!-- Misc files -->
- <echo>copy misc files from ${source.dir}</echo>
+ <echo>copy misc files from ${jython.base.dir}</echo>
<copy todir="${dist.dir}" preservelastmodified="true">
-@@ -509,7 +509,7 @@
+@@ -578,7 +578,7 @@
+
<!-- copy the CPython license -->
- <echo>copy CPython LICENSE from ${python.home} to ${dist.dir}/LICENSE_CPython.txt</echo>
- <!-- +++ TODO: checkout the CPython LICENSE (not: .txt) and copy from there -->
-- <copy file="${python.home}/LICENSE.txt" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+ <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" />
<!-- sources: todir has to correspond with installer/**/JarInstaller.java -->
- <echo>copy sources from ${source.dir}</echo>
+ <echo>copy sources from ${jython.base.dir}</echo>
Index: jython.spec
===================================================================
RCS file: /cvs/extras/rpms/jython/devel/jython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jython.spec 22 Jan 2007 21:54:23 -0000 1.1
+++ jython.spec 23 Mar 2007 15:01:40 -0000 1.2
@@ -3,26 +3,25 @@
%define name jython
%define version 2.2
%define cpython_version %{pyver}
-%define cpythondir python%{cpython_version}
%define pyxml_version 0.8.3
-%define release 0.2.a1
-%define svn_tag Release_2_2alpha1
+%define svn_tag Release_2_2beta1
+%define release 0.3.%{svn_tag}.1jpp.1%{?dist}
%define gcj_support 1
Name: %{name}
Version: %{version}
-Release: %{release}%{?dist}
+Release: %{release}
Summary: A Java implementation of the Python language
License: Modified CNRI Open Source License
URL: http://www.jython.org/
#
-# Use the enclosed script (fetch-jython.sh) to generate the source drop for jython 2.2a1
+# Use the enclosed script (fetch-jython.sh) to generate the source drop
+# for jython 2.2beta1
#
-# sh fetch-jython.sh jython https://svn.sourceforge.net/svnroot Release_2_2alpha1
+# sh fetch-jython.sh jython https://svn.sourceforge.net/svnroot Release_2_2beta1
#
Source0: %{name}-fetched-src-%{svn_tag}.tar.bz2
-Source1: python-release22-maint-cvs.tar.bz2
Source2: fetch-%{name}.sh
Patch0: %{name}-cachedir.patch
# Make javadoc and copy-full tasks not depend upon "full-build"
@@ -95,22 +94,21 @@
%prep
%setup -q -n %{name}-svn-%{svn_tag}
-%setup -q -n %{name}-svn-%{svn_tag} -T -D -a 1
%patch0 -p1
-%patch1 -p0
+%patch1 -p1
%build
-export CLASSPATH=$(build-classpath libreadline-java mysql-connector-java oro servlet)
+export CLASSPATH=$(build-classpath libreadline-java \
+mysql-connector-java oro servlet)
rm -rf org/apache
perl -p -i -e 's|execon|apply|g' build.xml
-#ant -Dpython.lib=%{_libdir}/python%pyver -DPyXmlHome=%{_libdir}/python%pyver -Dtargetver=1.3 copy-dist
ant \
-Dpython.home=%{_bindir} \
-Dht2html.dir=%{_datadir}/ht2html \
- -Dpython.lib=./python/dist/src/Lib \
+ -Dpython.lib=./Lib \
-Dpython.exe=%{_bindir}/python \
-DPyXmlHome=%{_libdir}/python%pyver \
-Dtargetver=1.3 \
@@ -128,8 +126,14 @@
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
+install -m 644 dist/%{name}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && \
+ for jar in *-%{version}*; do \
+ ln -sf ${jar} ${jar/-%{version}/}; \
+ done \
+)
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr dist/Doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -169,7 +173,7 @@
# Configuration
MAIN_CLASS=org.python.util.%{name}
-BASE_FLAGS=-Dpython.home=%{_datadir}/%{name}
+BASE_FLAGS=-Dpython.home=%{_datadir}/%{name}/Lib
BASE_JARS="%{name} oro servlet"
if [ -f %{_libdir}/libJavaEditline.so* ]; then
@@ -275,6 +279,11 @@
%endif
%changelog
+* 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
+- Remove unnecessary copy of python 2.2 library
+
* Thu Jan 11 2007 Andrew Overholt <overholt at redhat.com> 2.2-0.2.a1
- Add doc target to nofullbuild patch to actually generate ht2html docs.
- Add doc sub-package.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jython/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Jan 2007 21:54:23 -0000 1.2
+++ sources 23 Mar 2007 15:01:40 -0000 1.3
@@ -1,2 +1 @@
-8440245391794d2be88c8183ba23eb84 jython-fetched-src-Release_2_2alpha1.tar.bz2
-2b81cfa5288d88349cdfc86da4ec33d5 python-release22-maint-cvs.tar.bz2
+221f0c08b8c544bfaadd2475566eaee6 jython-fetched-src-Release_2_2beta1.tar.bz2
- Previous message (by thread): rpms/ettercap/devel ettercap.spec,1.2,1.3
- Next message (by thread): rpms/jd/FC-5 .cvsignore, 1.18, 1.19 jd.spec, 1.23, 1.24 sources, 1.18, 1.19 jd-1.8.8-beta070317-aalist-disp.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list