rpms/jython/devel jython-cachedir.patch, 1.2, 1.3 jython.spec, 1.3, 1.4

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

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

Modified Files:
	jython-cachedir.patch jython.spec 
Log Message:
* Mon Mar 26 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.2-0.3.Release_2_2beta1.1jpp.3
- Rename doc subpackage "manual".



jython-cachedir.patch:

Index: jython-cachedir.patch
===================================================================
RCS file: /cvs/extras/rpms/jython/devel/jython-cachedir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jython-cachedir.patch	23 Mar 2007 15:01:40 -0000	1.2
+++ jython-cachedir.patch	26 Mar 2007 19:47:12 -0000	1.3
@@ -6,7 +6,7 @@
          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");
++            File jythondir = new File(System.getProperty("user.home"), ".jython-cache");
 +
 +            if (!jythondir.isDirectory()) {
 +                jythondir.mkdirs();


Index: jython.spec
===================================================================
RCS file: /cvs/extras/rpms/jython/devel/jython.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jython.spec	24 Mar 2007 00:11:44 -0000	1.3
+++ jython.spec	26 Mar 2007 19:47:12 -0000	1.4
@@ -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.2%{?dist}
+%define release            0.3.%{svn_tag}.1jpp.3%{?dist}
 
 %define gcj_support        1
 
@@ -13,14 +13,13 @@
 Version:                   %{version}
 Release:                   %{release}
 Summary:                   A Java implementation of the Python language
-License:                   Modified CNRI Open Source License
+License:                   BSD
 URL:                       http://www.jython.org/
-#
-# Use the enclosed script (fetch-jython.sh) to generate the source drop
+# Use the included fetch-jython.sh script to generate the source drop
 # for jython 2.2beta1
-# 
-# sh fetch-jython.sh jython https://svn.sourceforge.net/svnroot Release_2_2beta1
 #
+# sh fetch-jython.sh \
+#   jython https://svn.sourceforge.net/svnroot Release_2_2beta1
 Source0:                   %{name}-fetched-src-%{svn_tag}.tar.bz2
 Source2:                   fetch-%{name}.sh
 Patch0:                    %{name}-cachedir.patch
@@ -78,14 +77,14 @@
 Group:             Documentation
 
 %description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
 
-%package doc
-Summary:           Usage docs for %{name}
+%package manual
+Summary:           Manual for %{name}
 Group:             Documentation
 
-%description doc
-Usage docs for %{name}.
+%description manual
+Usage documentation for %{name}.
 
 %package demo
 Summary:           Demo for %{name}
@@ -102,7 +101,7 @@
 
 %build
 export CLASSPATH=$(build-classpath libreadline-java \
-mysql-connector-java oro servlet)
+  mysql-connector-java oro servlet)
 
 rm -rf org/apache
 
@@ -119,9 +118,10 @@
 
 # remove #! from python files
 pushd dist
-for f in `find . -name '*.py'`; do
-sed --in-place  "s:#!\s*/usr.*::" $f
-done
+  for f in `find . -name '*.py'`
+  do
+    sed --in-place  "s:#!\s*/usr.*::" $f
+  done
 popd
 
 %install
@@ -131,11 +131,12 @@
 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 \
-)
+pushd $RPM_BUILD_ROOT%{_javadir}
+  for jar in *-%{version}*
+  do
+    ln -sf ${jar} ${jar/-%{version}/}
+  done
+popd
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -147,8 +148,11 @@
 
 cp -pr dist/Lib $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr dist/Tools $RPM_BUILD_ROOT%{_datadir}/%{name}
+# demo
 cp -pr dist/Demo $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr dist/Doc $RPM_BUILD_ROOT%{_datadir}/%{name}
+# manual
+rm -rf dist/Doc/javadoc
+mv dist/Doc %{name}-manual-%{version}
 
 # registry
 install -m 644 registry $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -213,7 +217,10 @@
 
 # Natively compile
 %if %{gcj_support}
-%{_bindir}/aot-compile-rpm --exclude %{_datadir}/%{name}/Demo/jreload
+# Exclude examples from native compilation
+%{_bindir}/aot-compile-rpm \
+  --exclude %{_datadir}/%{name}/Demo/jreload \
+  --exclude %{_datadir}/%{name}/Demo/jreload/example.jar
 %endif
 
 %post
@@ -270,18 +277,18 @@
 %defattr(-,root,root)
 %doc %{_javadocdir}/%{name}-%{version}
 
-%files doc
+%files manual
 %defattr(-,root,root)
-%{_datadir}/%{name}/Doc
+%doc %{name}-manual-%{version}
 
 %files demo
 %defattr(-,root,root)
 %doc %{_datadir}/%{name}/Demo
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/example.jar*
-%endif
 
 %changelog
+* Mon Mar 26 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.2-0.3.Release_2_2beta1.1jpp.3
+- Rename doc subpackage "manual".
+
 * 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.