rpms/openoffice.org/devel .cvsignore, 1.124, 1.125 openoffice.org.spec, 1.1105, 1.1106 sources, 1.234, 1.235

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17047

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- .cvsignore	7 Mar 2007 22:50:48 -0000	1.124
+++ .cvsignore	14 Mar 2007 13:12:25 -0000	1.125
@@ -201,3 +201,4 @@
 unowinreg.dll
 OOF680_m10.tar.bz2
 OOF680_m11.tar.bz2
+OOF680_m12.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1105
retrieving revision 1.1106
diff -u -r1.1105 -r1.1106
--- openoffice.org.spec	13 Mar 2007 19:25:02 -0000	1.1105
+++ openoffice.org.spec	14 Mar 2007 13:12:25 -0000	1.1106
@@ -1,6 +1,6 @@
 %define oootag OOF680
-%define ooomilestone 11
-%define rh_rpm_release 3
+%define ooomilestone 12
+%define rh_rpm_release 1
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -1172,6 +1172,9 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH3}
 
+#add the debugging libsalalloc_malloc.so.3 library
+cp -f ../../solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
+
 #rh#158977# clear execstack requirement
 execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so
 
@@ -2550,6 +2553,7 @@
 %dir %{instdir}/program
 %{instdir}/program/hid.lst
 %{instdir}/program/libcommuni680*.so
+%{instdir}/program/libsalalloc_malloc.so.3
 %{instdir}/program/libsimplecm680*.so
 %{instdir}/program/testtoolrc
 %{instdir}/program/testtool.bin
@@ -2592,6 +2596,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Mar 14 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-12.1
+- next release candidate
+- add support for xdguserdir translated user dirs
+- add alloc debugging library to testtools
+
 * Mon Mar 12 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-11.2
 - Resolves: rhbz#231788 openoffice.org-2.2.0.ooo75301.svtools.eventmismatch.patch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- sources	7 Mar 2007 22:50:48 -0000	1.234
+++ sources	14 Mar 2007 13:12:25 -0000	1.235
@@ -4,4 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 26c72b57608d21c7cccf941f1df2aea9  redhat-templates.tar.gz
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
-360cebef43468aec2132907d8886a3cb  OOF680_m11.tar.bz2
+073ca4672cb8e9692fe290d9e32b9516  OOF680_m12.tar.bz2