Author: glen Date: Sun May 21 18:01:41 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - missing defattr - use non-expanding heredoc - subshell less in wrappers
---- Files affected: SPECS: jython.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/jython.spec diff -u SPECS/jython.spec:1.16 SPECS/jython.spec:1.17 --- SPECS/jython.spec:1.16 Sun May 21 19:46:10 2006 +++ SPECS/jython.spec Sun May 21 20:01:35 2006 @@ -12,8 +12,8 @@ URL: http://www.jython.org/ BuildRequires: jdk BuildRequires: jpackage-utils -Requires: jre Requires: jpackage-utils +Requires: jre BuildArch: noarch ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -90,7 +90,7 @@ %build unset CLASSPATH || : unset JAVA_HOME || : -export JAVA_HOME="%{java_home}" +export JAVA_HOME="%{java_home}" java -classpath . jython-21 -o . demo lib source ln -s %{_javadocdir}/%{name}-%{version} javadoc @@ -110,21 +110,21 @@ ln -sf /var/cache/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}/cachedir unset CLASSPATH || : -export JAVA_HOME="%{java_home}" +export JAVA_HOME="%{java_home}" -cat >$RPM_BUILD_ROOT/%{_bindir}/%{name} <<EOF +cat >$RPM_BUILD_ROOT%{_bindir}/%{name} <<'EOF' #/bin/sh . %{_javadir}-utils/java-functions set_javacmd -\$JAVACMD -Dpython.home="%{_datadir}/%{name}" -classpath "%{_javadir}/%{name}-%{version}.jar:\$CLASSPATH" "org.python.util.jython" "\$@" +exec $JAVACMD -Dpython.home="%{_datadir}/%{name}" -classpath "%{_javadir}/%{name}-%{version}.jar:$CLASSPATH" "org.python.util.jython" "$@" EOF -cat >$RPM_BUILD_ROOT/%{_bindir}/jythonc <<EOF +cat >$RPM_BUILD_ROOT%{_bindir}/jythonc <<'EOF' #/bin/sh -%{_bindir}/%{name} "%{_datadir}/%{name}/Tools/jythonc/jythonc.py" "\$@" +exec %{_bindir}/%{name} "%{_datadir}/%{name}/Tools/jythonc/jythonc.py" "$@" EOF %post @@ -137,7 +137,7 @@ %preun if [ "$1" = "0" ]; then -rm -rf /var/cache/%{name}/* + rm -rf /var/cache/%{name}/* fi %clean @@ -154,20 +154,25 @@ %{_datadir}/%{name}/Lib/site.py %files modules +%defattr(644,root,root,755) %{_datadir}/%{name}/Lib %exclude %{_datadir}/%{name}/Lib/site.py %files tools +%defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/jythonc %{_datadir}/%{name}/Tools %files examples +%defattr(644,root,root,755) %{_examplesdir}/%{name}-%{version} %files doc +%defattr(644,root,root,755) %doc Doc/*.html Doc/images javadoc %files javadoc +%defattr(644,root,root,755) %{_javadocdir}/%{name}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -176,6 +181,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.17 2006/05/21 18:01:35 glen +- missing defattr +- use non-expanding heredoc +- subshell less in wrappers + Revision 1.16 2006/05/21 17:46:10 jajcus - use jpackage-utils also on runtime (to get right JVM) @@ -200,21 +210,21 @@ - working Source URL Revision 1.9 2002/11/27 21:10:39 juandon -- new %%doc +- new %doc Revision 1.8 2002/04/25 16:40:09 arturs -fixed a small typo +- fixed a small typo Revision 1.7 2002/04/23 15:52:14 arturs -License field change +- License field change Revision 1.6 2002/04/07 08:14:28 filon - changes in docs - release 3 Revision 1.5 2002/03/13 18:04:59 aflinta - - corrected JAVA_HOME to proper directory - - release 2 +- corrected JAVA_HOME to proper directory +- release 2 Revision 1.4 2002/02/23 02:59:09 kloczek - adapterized. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jython.spec?r1=1.16&r2=1.17&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
