Subject: rpms/starlab/devel starlab.spec,1.4,1.5 - msg#09939

Previous Message by Date: click to view message preview

rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch, NONE, 1.1 openoffice.org.spec, 1.1904, 1.1905

Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22921/F-11 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch Log Message: don't screw over the secondary arch people if they get around to building OOo openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch: --- NEW FILE openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch --- Index: typesconfig/typesconfig.c =================================================================== --- sal.orig/typesconfig/typesconfig.c (revision 269860) +++ sal/typesconfig/typesconfig.c (working copy) @@ -163,20 +163,26 @@ |* Letzte Aenderung |* *************************************************************************/ -static int dummy(void* unused); +#if defined(IA64) || defined(ARM32) int GetAtAddress( Type eT, void* p ) { -#if defined(IA64) || defined(ARM32) switch ( eT ) { case t_char: return *((char*)p); - case t_short: if ((long)p % sizeof(short)) abort(); else return *((short*)p); - case t_int: if ((long)p % sizeof(int)) abort(); else return *((int*)p); - case t_long: if ((long)p % sizeof(long)) abort(); else return *((long*)p); - case t_double: if ((long)p % sizeof(double)) abort(); else return *((double*)p); + case t_short: if ((long)p % sizeof(short)) raise(SIGBUS); else return *((short*)p); + case t_int: if ((long)p % sizeof(int)) raise(SIGBUS); else return *((int*)p); + case t_long: if ((long)p % sizeof(long)) raise(SIGBUS); else return *((long*)p); + case t_double: if ((long)p % sizeof(double)) raise(SIGBUS); else return *((double*)p); } + abort(); +} + #else +static int dummy(void* unused); + +int GetAtAddress( Type eT, void* p ) +{ switch ( eT ) { case t_char: { char x = *(char*)p; return dummy(&x); } @@ -185,7 +191,6 @@ case t_long: { long x = *(long*)p; return dummy(&x); } case t_double: { double x = *(double*)p; return dummy(&x); } } -#endif abort(); } @@ -195,6 +200,7 @@ return 0; } +#endif /************************************************************************* |* |* SetAtAddress() Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v retrieving revision 1.1904 retrieving revision 1.1905 diff -u -p -r1.1904 -r1.1905 --- openoffice.org.spec 29 Apr 2009 20:32:44 -0000 1.1904 +++ openoffice.org.spec 30 Apr 2009 14:33:31 -0000 1.1905 @@ -1,6 +1,6 @@ %define oootag OOO310 %define ooomilestone 11 -%define rh_rpm_release 2 +%define rh_rpm_release 3 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -138,6 +138,7 @@ Patch62: openoffice.org-3.1.0.ooo101354. Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch +Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1634,6 +1635,7 @@ cat %{PATCH11} >> svtools/source/dialogs %patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch %patch65 -p0 -b .ooo101439.connectivity.evodupl.patch +%patch66 -p0 -b .ooo100469.sal.ia64_arm.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -4129,6 +4131,9 @@ fi unopkg list --shared > /dev/null 2>&1 || : %changelog +* Thu Apr 30 2009 Caolán McNamara <caolanm@xxxxxxxxxx> - 1:3.1.0-11.3 +- add in the ia64 and arm fixes for the secondary arch people + * Tue Apr 27 2009 Caolán McNamara <caolanm@xxxxxxxxxx> - 1:3.1.0-11.2 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch - add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch -- fedora-extras-commits mailing list fedora-extras-commits@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-extras-commits

Next Message by Date: click to view message preview

rpms/starlab/devel starlab-4.4.3-freeze.patch,NONE,1.1

Author: lkundrak Update of /cvs/pkgs/rpms/starlab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28917 Added Files: starlab-4.4.3-freeze.patch Log Message: Add missing patch starlab-4.4.3-freeze.patch: --- NEW FILE starlab-4.4.3-freeze.patch --- Rename freeze: https://bugzilla.redhat.com/show_bug.cgi?id=472616 diff -urp starlab-4.4.3.freeze/doc/Primer.tex starlab-4.4.3/doc/Primer.tex --- starlab-4.4.3.freeze/doc/Primer.tex 1999-06-12 21:19:21.000000000 +0200 +++ starlab-4.4.3/doc/Primer.tex 2009-04-30 16:40:02.000000000 +0200 @@ -159,13 +159,13 @@ running small test simulations. For exa effects in a cold collapse could be done as follows: {\codes -\quad mkplummer -n 100 | freeze | leapfrog -t 2 -a 0.02 -e 0.05 | lagrad +\quad mkplummer -n 100 | sl-freeze | leapfrog -t 2 -a 0.02 -e 0.05 | lagrad } \medskip Here {\tt \ mkplummer\ } creates initial conditions for a 100-body system, according to a Plummer model distribution. The resulting data -are piped into the next module, {\tt \ freeze}, which simply sets all +are piped into the next module, {\tt \ sl-freeze}, which simply sets all velocities to zero, while preserving the positions. Following that, the data are read in by the leapfrog integrator, which is asked to evolve the system for a period of 2 time units, with a (constant) step diff -urp starlab-4.4.3.freeze/etc/papers/Preview.tex starlab-4.4.3/etc/papers/Preview.tex --- starlab-4.4.3.freeze/etc/papers/Preview.tex 1999-06-12 21:19:23.000000000 +0200 +++ starlab-4.4.3/etc/papers/Preview.tex 2009-04-30 16:40:29.000000000 +0200 @@ -826,13 +826,13 @@ of relaxation effects in a cold collapse } {\codes -mkplummer -n 100 | freeze | leapfrog -t 2 -d 0.02 -e 0.05 | lagrad +mkplummer -n 100 | sl-freeze | leapfrog -t 2 -d 0.02 -e 0.05 | lagrad } \medskip Here {\tt \ mkplummer\ } creates initial conditions for a 100-body system, according to a Plummer model distribution. The resulting data are -piped into the next module, {\tt \ freeze\ }, which simply sets all +piped into the next module, {\tt \ sl-freeze\ }, which simply sets all velocities to zero, while preserving the positions. Following that, the data are read in by the leapfrog integrator, which is asked to evolve the system for a period of 2 time units, with a stepsize of diff -urp starlab-4.4.3.freeze/src/node/dyn/hdyn/xutil/Demo.csh starlab-4.4.3/src/node/dyn/hdyn/xutil/Demo.csh --- starlab-4.4.3.freeze/src/node/dyn/hdyn/xutil/Demo.csh 2000-09-18 03:33:01.000000000 +0200 +++ starlab-4.4.3/src/node/dyn/hdyn/xutil/Demo.csh 2009-04-30 16:40:51.000000000 +0200 @@ -1,13 +1,13 @@ #!/bin/tcsh -f -# Usage: Demo.csh N [10] fb [0.1] freeze [no] dt [2^-5] +# Usage: Demo.csh N [10] fb [0.1] sl-freeze [no] dt [2^-5] set N = 10 if ($#argv > 0) set N = $1 set f = 0 if ($#argv > 1) set f = $2 alias FREEZE cat -if ($#argv > 2) alias FREEZE freeze +if ($#argv > 2) alias FREEZE sl-freeze set D = -5 if ($#argv > 3) set D = $4 diff -urp starlab-4.4.3.freeze/TOOLS starlab-4.4.3/TOOLS --- starlab-4.4.3.freeze/TOOLS 2009-04-30 16:27:18.000000000 +0200 +++ starlab-4.4.3/TOOLS 2009-04-30 16:39:43.000000000 +0200 @@ -81,7 +81,7 @@ Note: Most tools are just simple interf extract_snap find and print the last snapshot, or the first snapshot following a specified time flatten flatten a dyn tree to a single-level linked list - freeze set all velocities to zero, leaving positions + sl-freeze set all velocities to zero, leaving positions unchanged lagrad compute Lagrangian (mass) radii for an N-body system -- fedora-extras-commits mailing list fedora-extras-commits@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-extras-commits

Previous Message by Thread: click to view message preview

rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch, NONE, 1.1 openoffice.org.spec, 1.1904, 1.1905

Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22921/F-11 Modified Files: openoffice.org.spec Added Files: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch Log Message: don't screw over the secondary arch people if they get around to building OOo openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch: --- NEW FILE openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch --- Index: typesconfig/typesconfig.c =================================================================== --- sal.orig/typesconfig/typesconfig.c (revision 269860) +++ sal/typesconfig/typesconfig.c (working copy) @@ -163,20 +163,26 @@ |* Letzte Aenderung |* *************************************************************************/ -static int dummy(void* unused); +#if defined(IA64) || defined(ARM32) int GetAtAddress( Type eT, void* p ) { -#if defined(IA64) || defined(ARM32) switch ( eT ) { case t_char: return *((char*)p); - case t_short: if ((long)p % sizeof(short)) abort(); else return *((short*)p); - case t_int: if ((long)p % sizeof(int)) abort(); else return *((int*)p); - case t_long: if ((long)p % sizeof(long)) abort(); else return *((long*)p); - case t_double: if ((long)p % sizeof(double)) abort(); else return *((double*)p); + case t_short: if ((long)p % sizeof(short)) raise(SIGBUS); else return *((short*)p); + case t_int: if ((long)p % sizeof(int)) raise(SIGBUS); else return *((int*)p); + case t_long: if ((long)p % sizeof(long)) raise(SIGBUS); else return *((long*)p); + case t_double: if ((long)p % sizeof(double)) raise(SIGBUS); else return *((double*)p); } + abort(); +} + #else +static int dummy(void* unused); + +int GetAtAddress( Type eT, void* p ) +{ switch ( eT ) { case t_char: { char x = *(char*)p; return dummy(&x); } @@ -185,7 +191,6 @@ case t_long: { long x = *(long*)p; return dummy(&x); } case t_double: { double x = *(double*)p; return dummy(&x); } } -#endif abort(); } @@ -195,6 +200,7 @@ return 0; } +#endif /************************************************************************* |* |* SetAtAddress() Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v retrieving revision 1.1904 retrieving revision 1.1905 diff -u -p -r1.1904 -r1.1905 --- openoffice.org.spec 29 Apr 2009 20:32:44 -0000 1.1904 +++ openoffice.org.spec 30 Apr 2009 14:33:31 -0000 1.1905 @@ -1,6 +1,6 @@ %define oootag OOO310 %define ooomilestone 11 -%define rh_rpm_release 2 +%define rh_rpm_release 3 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} @@ -138,6 +138,7 @@ Patch62: openoffice.org-3.1.0.ooo101354. Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch +Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") %define instdir %{_libdir} @@ -1634,6 +1635,7 @@ cat %{PATCH11} >> svtools/source/dialogs %patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch %patch65 -p0 -b .ooo101439.connectivity.evodupl.patch +%patch66 -p0 -b .ooo100469.sal.ia64_arm.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -4129,6 +4131,9 @@ fi unopkg list --shared > /dev/null 2>&1 || : %changelog +* Thu Apr 30 2009 Caolán McNamara <caolanm@xxxxxxxxxx> - 1:3.1.0-11.3 +- add in the ia64 and arm fixes for the secondary arch people + * Tue Apr 27 2009 Caolán McNamara <caolanm@xxxxxxxxxx> - 1:3.1.0-11.2 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch - add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch -- fedora-extras-commits mailing list fedora-extras-commits@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-extras-commits

Next Message by Thread: click to view message preview

rpms/starlab/devel starlab-4.4.3-freeze.patch,NONE,1.1

Author: lkundrak Update of /cvs/pkgs/rpms/starlab/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28917 Added Files: starlab-4.4.3-freeze.patch Log Message: Add missing patch starlab-4.4.3-freeze.patch: --- NEW FILE starlab-4.4.3-freeze.patch --- Rename freeze: https://bugzilla.redhat.com/show_bug.cgi?id=472616 diff -urp starlab-4.4.3.freeze/doc/Primer.tex starlab-4.4.3/doc/Primer.tex --- starlab-4.4.3.freeze/doc/Primer.tex 1999-06-12 21:19:21.000000000 +0200 +++ starlab-4.4.3/doc/Primer.tex 2009-04-30 16:40:02.000000000 +0200 @@ -159,13 +159,13 @@ running small test simulations. For exa effects in a cold collapse could be done as follows: {\codes -\quad mkplummer -n 100 | freeze | leapfrog -t 2 -a 0.02 -e 0.05 | lagrad +\quad mkplummer -n 100 | sl-freeze | leapfrog -t 2 -a 0.02 -e 0.05 | lagrad } \medskip Here {\tt \ mkplummer\ } creates initial conditions for a 100-body system, according to a Plummer model distribution. The resulting data -are piped into the next module, {\tt \ freeze}, which simply sets all +are piped into the next module, {\tt \ sl-freeze}, which simply sets all velocities to zero, while preserving the positions. Following that, the data are read in by the leapfrog integrator, which is asked to evolve the system for a period of 2 time units, with a (constant) step diff -urp starlab-4.4.3.freeze/etc/papers/Preview.tex starlab-4.4.3/etc/papers/Preview.tex --- starlab-4.4.3.freeze/etc/papers/Preview.tex 1999-06-12 21:19:23.000000000 +0200 +++ starlab-4.4.3/etc/papers/Preview.tex 2009-04-30 16:40:29.000000000 +0200 @@ -826,13 +826,13 @@ of relaxation effects in a cold collapse } {\codes -mkplummer -n 100 | freeze | leapfrog -t 2 -d 0.02 -e 0.05 | lagrad +mkplummer -n 100 | sl-freeze | leapfrog -t 2 -d 0.02 -e 0.05 | lagrad } \medskip Here {\tt \ mkplummer\ } creates initial conditions for a 100-body system, according to a Plummer model distribution. The resulting data are -piped into the next module, {\tt \ freeze\ }, which simply sets all +piped into the next module, {\tt \ sl-freeze\ }, which simply sets all velocities to zero, while preserving the positions. Following that, the data are read in by the leapfrog integrator, which is asked to evolve the system for a period of 2 time units, with a stepsize of diff -urp starlab-4.4.3.freeze/src/node/dyn/hdyn/xutil/Demo.csh starlab-4.4.3/src/node/dyn/hdyn/xutil/Demo.csh --- starlab-4.4.3.freeze/src/node/dyn/hdyn/xutil/Demo.csh 2000-09-18 03:33:01.000000000 +0200 +++ starlab-4.4.3/src/node/dyn/hdyn/xutil/Demo.csh 2009-04-30 16:40:51.000000000 +0200 @@ -1,13 +1,13 @@ #!/bin/tcsh -f -# Usage: Demo.csh N [10] fb [0.1] freeze [no] dt [2^-5] +# Usage: Demo.csh N [10] fb [0.1] sl-freeze [no] dt [2^-5] set N = 10 if ($#argv > 0) set N = $1 set f = 0 if ($#argv > 1) set f = $2 alias FREEZE cat -if ($#argv > 2) alias FREEZE freeze +if ($#argv > 2) alias FREEZE sl-freeze set D = -5 if ($#argv > 3) set D = $4 diff -urp starlab-4.4.3.freeze/TOOLS starlab-4.4.3/TOOLS --- starlab-4.4.3.freeze/TOOLS 2009-04-30 16:27:18.000000000 +0200 +++ starlab-4.4.3/TOOLS 2009-04-30 16:39:43.000000000 +0200 @@ -81,7 +81,7 @@ Note: Most tools are just simple interf extract_snap find and print the last snapshot, or the first snapshot following a specified time flatten flatten a dyn tree to a single-level linked list - freeze set all velocities to zero, leaving positions + sl-freeze set all velocities to zero, leaving positions unchanged lagrad compute Lagrangian (mass) radii for an N-body system -- fedora-extras-commits mailing list fedora-extras-commits@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-extras-commits