Author: qboosh                       Date: Sat Feb 12 06:37:35 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.5.1
- -tools (including jythonc) are gone
- -doc package is no more, only -javadoc left

---- Files affected:
packages/jython:
   jython.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: packages/jython/jython.spec
diff -u packages/jython/jython.spec:1.32 packages/jython/jython.spec:1.33
--- packages/jython/jython.spec:1.32    Fri Apr 23 02:14:36 2010
+++ packages/jython/jython.spec Sat Feb 12 07:37:30 2011
@@ -2,18 +2,19 @@
 Summary:       Python implementation in Java
 Summary(pl.UTF-8):     Implementacja języka Python w Javie
 Name:          jython
-Version:       2.2.1
-Release:       2
+Version:       2.5.1
+Release:       1
 License:       BSD
 Group:         Development/Languages/Java
-Source0:       
http://dl.sourceforge.net/jython/%{name}_installer-%{version}.jar
-# Source0-md5: 774543534bef2d68247953882237d448
+Source0:       
http://downloads.sourceforge.net/jython/%{name}_installer-%{version}.jar
+# Source0-md5: 2ee978eff4306b23753b3fe9d7af5b37
 URL:           http://www.jython.org/
-BuildRequires: jdk
+BuildRequires: jdk >= 1.5
 BuildRequires: jpackage-utils
 BuildRequires: rpmbuild(macros) >= 1.300
 Requires:      jpackage-utils
-Requires:      jre
+Requires:      jre >= 1.5
+Obsoletes:     jython-tools
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -23,28 +24,12 @@
 %description -l pl.UTF-8
 Implementacja języka Python w Javie.
 
-%package doc
-Summary:       Manual for %{name}
-Summary(pl.UTF-8):     Podręcznik dla pakietu %{name}
-Group:         Development/Languages/Java
-
-%description doc
-Documentation for %{name}.
-
-%description doc -l it.UTF-8
-Documentazione di %{name}.
-
-%description doc -l fr.UTF-8
-Documentation pour %{name}.
-
-%description doc -l pl.UTF-8
-Dokumentacja dla pakietu %{name}.
-
 %package javadoc
 Summary:       API documentation for Jython
 Summary(pl.UTF-8):     Dokumentacja API Jythona
 Group:         Documentation
 Requires:      jpackage-utils
+Obsoletes:     jython-doc
 
 %description javadoc
 JavaDoc-generated API documentation for Jython.
@@ -56,7 +41,7 @@
 Summary:       Python modules for Jython
 Summary(pl.UTF-8):     Moduły Pythona dla Jythona
 Group:         Development/Languages/Java
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description modules
 Python modules for Jython.
@@ -68,7 +53,7 @@
 Summary:       Jython tools
 Summary(pl.UTF-8):     Narzędzia Jythona
 Group:         Development/Languages/Java
-Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
+Requires:      %{name}-modules = %{version}-%{release}
 
 %description tools
 Jython tools.
@@ -111,7 +96,7 @@
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 cp -a Doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a Lib Tools $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a Lib $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a Demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 ln -sf /var/cache/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}/cachedir
 
@@ -129,12 +114,6 @@
 exec $JAVACMD -Dpython.home="%{_datadir}/%{name}" -classpath 
"%{_javadir}/%{name}-%{version}.jar:$CLASSPATH" "org.python.util.jython" "$@"
 EOF
 
-cat >$RPM_BUILD_ROOT%{_bindir}/jythonc <<'EOF'
-#/bin/sh
-
-exec %{_bindir}/%{name} "%{_datadir}/%{name}/Tools/jythonc/jythonc.py" "$@"
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -155,55 +134,85 @@
 
 %files
 %defattr(644,root,root,755)
-%doc installed/{ACKNOWLEDGMENTS,README.txt,NEWS,LICENSE.txt}
+%doc installed/{ACKNOWLEDGMENTS,LICENSE.txt,README.txt,NEWS}
 %attr(755,root,root) %{_bindir}/%{name}
-%{_javadir}/*.jar
+%{_javadir}/jython-%{version}.jar
+%{_javadir}/jython.jar
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/cachedir
 /var/cache/%{name}
 %dir %{_datadir}/%{name}/Lib
+%{_datadir}/%{name}/Lib/encodings
 %{_datadir}/%{name}/Lib/UserDict.py
 %{_datadir}/%{name}/Lib/UserDict$py.class
-%{_datadir}/%{name}/Lib/javaos.py
-%{_datadir}/%{name}/Lib/javaos$py.class
+%{_datadir}/%{name}/Lib/codecs.py
+%{_datadir}/%{name}/Lib/codecs$py.class
+%{_datadir}/%{name}/Lib/copy_reg.py
+%{_datadir}/%{name}/Lib/copy_reg$py.class
 %{_datadir}/%{name}/Lib/javapath.py
 %{_datadir}/%{name}/Lib/javapath$py.class
+%{_datadir}/%{name}/Lib/linecache.py
+%{_datadir}/%{name}/Lib/linecache$py.class
+%{_datadir}/%{name}/Lib/locale.py
+%{_datadir}/%{name}/Lib/locale$py.class
+%{_datadir}/%{name}/Lib/os.py
+%{_datadir}/%{name}/Lib/os$py.class
+%{_datadir}/%{name}/Lib/posixpath.py
+%{_datadir}/%{name}/Lib/posixpath$py.class
+%{_datadir}/%{name}/Lib/re.py
+%{_datadir}/%{name}/Lib/re$py.class
 %{_datadir}/%{name}/Lib/site.py
 %{_datadir}/%{name}/Lib/site$py.class
+%{_datadir}/%{name}/Lib/sre*.py
+%{_datadir}/%{name}/Lib/sre*$py.class
 %{_datadir}/%{name}/Lib/stat.py
 %{_datadir}/%{name}/Lib/stat$py.class
 %{_datadir}/%{name}/Lib/string.py
 %{_datadir}/%{name}/Lib/string$py.class
+%{_datadir}/%{name}/Lib/types.py
+%{_datadir}/%{name}/Lib/types$py.class
+%{_datadir}/%{name}/Lib/warnings.py
+%{_datadir}/%{name}/Lib/warnings$py.class
 
 %files modules
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/Lib/*
+%exclude %{_datadir}/%{name}/Lib/encodings
 %exclude %{_datadir}/%{name}/Lib/UserDict.py
 %exclude %{_datadir}/%{name}/Lib/UserDict$py.class
-%exclude %{_datadir}/%{name}/Lib/javaos.py
-%exclude %{_datadir}/%{name}/Lib/javaos$py.class
+%exclude %{_datadir}/%{name}/Lib/codecs.py
+%exclude %{_datadir}/%{name}/Lib/codecs$py.class
+%exclude %{_datadir}/%{name}/Lib/copy_reg.py
+%exclude %{_datadir}/%{name}/Lib/copy_reg$py.class
 %exclude %{_datadir}/%{name}/Lib/javapath.py
 %exclude %{_datadir}/%{name}/Lib/javapath$py.class
+%exclude %{_datadir}/%{name}/Lib/linecache.py
+%exclude %{_datadir}/%{name}/Lib/linecache$py.class
+%exclude %{_datadir}/%{name}/Lib/locale.py
+%exclude %{_datadir}/%{name}/Lib/locale$py.class
+%exclude %{_datadir}/%{name}/Lib/os.py
+%exclude %{_datadir}/%{name}/Lib/os$py.class
+%exclude %{_datadir}/%{name}/Lib/posixpath.py
+%exclude %{_datadir}/%{name}/Lib/posixpath$py.class
+%exclude %{_datadir}/%{name}/Lib/re.py
+%exclude %{_datadir}/%{name}/Lib/re$py.class
 %exclude %{_datadir}/%{name}/Lib/site.py
 %exclude %{_datadir}/%{name}/Lib/site$py.class
+%exclude %{_datadir}/%{name}/Lib/sre*.py
+%exclude %{_datadir}/%{name}/Lib/sre*$py.class
 %exclude %{_datadir}/%{name}/Lib/stat.py
 %exclude %{_datadir}/%{name}/Lib/stat$py.class
 %exclude %{_datadir}/%{name}/Lib/string.py
 %exclude %{_datadir}/%{name}/Lib/string$py.class
-
-%files tools
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/jythonc
-%{_datadir}/%{name}/Tools
+%exclude %{_datadir}/%{name}/Lib/types.py
+%exclude %{_datadir}/%{name}/Lib/types$py.class
+%exclude %{_datadir}/%{name}/Lib/warnings.py
+%exclude %{_datadir}/%{name}/Lib/warnings$py.class
 
 %files examples
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}
 
-%files doc
-%defattr(644,root,root,755)
-%doc installed/Doc/*.html installed/Doc/images javadoc
-
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
@@ -214,6 +223,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2011/02/12 06:37:30  qboosh
+- updated to 2.5.1
+- -tools (including jythonc) are gone
+- -doc package is no more, only -javadoc left
+
 Revision 1.32  2010/04/23 00:14:36  pawelz
 - Dropped EA, we have icedtea6 jdk on all archs
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jython/jython.spec?r1=1.32&r2=1.33&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to