Author: qboosh Date: Thu Nov 1 18:50:58 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.2.1 - moved modules required by site.py to main package - package precompiled modules to avoid writing to /usr/share at runtime - set umask before rebuilding cache
---- Files affected: SPECS: jython.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/jython.spec diff -u SPECS/jython.spec:1.29 SPECS/jython.spec:1.30 --- SPECS/jython.spec:1.29 Wed Sep 19 17:20:48 2007 +++ SPECS/jython.spec Thu Nov 1 19:50:53 2007 @@ -2,12 +2,12 @@ Summary: Python implementation in Java Summary(pl.UTF-8): Implementacja języka Python w Javie Name: jython -Version: 2.2 +Version: 2.2.1 Release: 1 License: BSD Group: Development/Languages/Java Source0: http://dl.sourceforge.net/jython/%{name}_installer-%{version}.jar -# Source0-md5: aba8e11ed071be7f7c2687624b5e7918 +# Source0-md5: 774543534bef2d68247953882237d448 URL: http://www.jython.org/ BuildRequires: jdk BuildRequires: jpackage-utils @@ -97,7 +97,7 @@ unset JAVA_HOME || : export JAVA_HOME="%{java_home}" -%java -jar jython_installer-2.2.jar --silent --directory installed/ --type all +%java -jar jython_installer-%{version}.jar --silent --directory installed/ --type all ln -s %{_javadocdir}/%{name}-%{version} javadoc @@ -119,6 +119,8 @@ unset CLASSPATH || : export JAVA_HOME="%{java_home}" +%java -Dpython.home=. -classpath jython.jar "org.python.util.jython" -c "import compileall; compileall.compile_dir(\"$RPM_BUILD_ROOT%{_datadir}/%{name}/Lib\", ddir=\"$RPM_BUILD_ROOT\")" + cat >$RPM_BUILD_ROOT%{_bindir}/%{name} <<'EOF' #/bin/sh @@ -134,12 +136,17 @@ exec %{_bindir}/%{name} "%{_datadir}/%{name}/Tools/jythonc/jythonc.py" "$@" EOF +%clean +rm -rf $RPM_BUILD_ROOT + %post # rebuild cache +umask 022 %{_bindir}/%{name} -c "import site" %post modules # rebuild cache +umask 022 %{_bindir}/%{name} -c "import site" %preun @@ -147,9 +154,6 @@ rm -rf /var/cache/%{name}/* fi -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %doc installed/{ACKNOWLEDGMENTS,README.txt,NEWS,LICENSE.txt} @@ -159,12 +163,34 @@ %{_datadir}/%{name}/cachedir /var/cache/%{name} %dir %{_datadir}/%{name}/Lib +%{_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/javapath.py +%{_datadir}/%{name}/Lib/javapath$py.class %{_datadir}/%{name}/Lib/site.py +%{_datadir}/%{name}/Lib/site$py.class +%{_datadir}/%{name}/Lib/stat.py +%{_datadir}/%{name}/Lib/stat$py.class +%{_datadir}/%{name}/Lib/string.py +%{_datadir}/%{name}/Lib/string$py.class %files modules %defattr(644,root,root,755) %{_datadir}/%{name}/Lib/* +%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/javapath.py +%exclude %{_datadir}/%{name}/Lib/javapath$py.class %exclude %{_datadir}/%{name}/Lib/site.py +%exclude %{_datadir}/%{name}/Lib/site$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) @@ -189,6 +215,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2007/11/01 18:50:53 qboosh +- updated to 2.2.1 +- moved modules required by site.py to main package +- package precompiled modules to avoid writing to /usr/share at runtime +- set umask before rebuilding cache + Revision 1.29 2007/09/19 15:20:48 baggins - really up to 2.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jython.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
