rpms/openoffice.org/devel openoffice.org.spec,1.1987,1.1988

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28633

Modified Files:
	openoffice.org.spec 
Log Message:
seeing as the last build failed, merge these together


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1987
retrieving revision 1.1988
diff -u -p -r1.1987 -r1.1988
--- openoffice.org.spec	21 Aug 2009 05:18:30 -0000	1.1987
+++ openoffice.org.spec	21 Aug 2009 07:59:39 -0000	1.1988
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 2
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4208,12 +4208,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Aug 21 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
+* Fri Aug 21 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
+- latest milestone
 - Resolves: rbhz#501141 Images and Frames disappear in sequential
   printing
-
-* Thu Aug 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
-- latest milestone
 - Related: rhbz#517822 add hyphen-mr depend
 - Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch