rpms/openoffice.org/devel openoffice.org.spec,1.1664,1.1665

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#465427 wrong order of seds


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1664
retrieving revision 1.1665
diff -u -r1.1664 -r1.1665
--- openoffice.org.spec	1 Oct 2008 13:32:38 -0000	1.1664
+++ openoffice.org.spec	3 Oct 2008 09:32:05 -0000	1.1665
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 9
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1902,10 +1902,10 @@
 pushd $RPM_BUILD_ROOT/%{oooinstdir}/share/xdg/
 chmod u+w *.desktop
 for file in *.desktop; do
-    # rhbz#156067 don't version the icons
-    sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
     # rhbz#156677 remove the version from Name=
     sed -i -e "s/$PRODUCTVERSION //g" $file
+    # rhbz#156067 don't version the icons
+    sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -1967,10 +1967,10 @@
 pushd $RPM_BUILD_ROOT/%{brinstdir}/share/xdg/
 chmod u+w *.desktop
 for file in *.desktop; do
-    # rhbz#156067 don't version the icons
-    sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
     # rhbz#156677 remove the version from Name=
     sed -i -e "s/$PRODUCTVERSION //g" $file
+    # rhbz#156067 don't version the icons
+    sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
     # use broffice.org launcher
     sed -i -e "s/openoffice/broffice/g" $file
 done
@@ -3681,6 +3681,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Oct 03 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.2
+- Resolves: rhbz#465427 wrong order of seds
+
 * Wed Oct 01 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.1
 - next candidate