rpms/openoffice.org/devel .cvsignore, 1.129, 1.130 openoffice.org.spec, 1.1188, 1.1189 sources, 1.240, 1.241

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24135

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- .cvsignore	22 May 2007 11:54:08 -0000	1.129
+++ .cvsignore	31 May 2007 11:05:10 -0000	1.130
@@ -206,3 +206,4 @@
 OOF680_m14.tar.bz2
 OOF680_m16.tar.bz2
 OOF680_m17.tar.bz2
+OOF680_m18.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1188
retrieving revision 1.1189
diff -u -r1.1188 -r1.1189
--- openoffice.org.spec	30 May 2007 17:13:28 -0000	1.1188
+++ openoffice.org.spec	31 May 2007 11:05:10 -0000	1.1189
@@ -1,6 +1,6 @@
 %define oootag OOF680
-%define ooomilestone 17
-%define rh_rpm_release 2
+%define ooomilestone 18
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -2660,8 +2660,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue May 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.3
-- add jan's stocmerge.all.patch
+* Thu May 31 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.1
+- next 2.2.1 release candidate
+- add Jan's stocmerge.all.patch
 
 * Wed May 23 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.2
 - remove LD_LIBRARY_PATH again, the third party extension requiring it 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- sources	22 May 2007 11:54:09 -0000	1.240
+++ sources	31 May 2007 11:05:10 -0000	1.241
@@ -4,4 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-9547202d9e2788b459d5b5e0d1a7c6f2  OOF680_m17.tar.bz2
+7c4c6d4719212b0181458aa55db9f976  OOF680_m18.tar.bz2