rpms/openoffice.org/devel openoffice.org.spec,1.1321,1.1322

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
koji ran out of space, so merge ids


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1321
retrieving revision 1.1322
diff -u -r1.1321 -r1.1322
--- openoffice.org.spec	12 Oct 2007 10:14:10 -0000	1.1321
+++ openoffice.org.spec	12 Oct 2007 11:39:01 -0000	1.1322
@@ -2782,13 +2782,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Fri Oct 12 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.4
-- add openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
-
-* Mon Oct 08 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.3
+* Fri Oct 12 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.3
 - reenable prelink-optimized launchers
 - rhbz#326161 make code compiled with icedtea compatible with 1.5.0 so libgcj
   can still be selected as a jvm
+- add openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
 
 * Sun Oct 07 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.2
 - reenable visibility again now that guard visibility is sane again