rpms/openoffice.org/devel openoffice.org.spec,1.1640,1.1641

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
next candidate


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1640
retrieving revision 1.1641
diff -u -r1.1640 -r1.1641
--- openoffice.org.spec	5 Sep 2008 15:04:06 -0000	1.1640
+++ openoffice.org.spec	7 Sep 2008 19:26:57 -0000	1.1641
@@ -1397,8 +1397,7 @@
 rm -rf $RPM_BUILD_ROOT
 source Linux*Env.Set.sh
 #figure out the icon version
-export LONGICON`grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
-export ICONPRODUCTVERSION=${LONGICONPRODUCTVERSION/./}
+export `grep "^PRODUCTVERSIONSHORT =" desktop/productversion.mk | sed -e "s/ //g"`
 unset HAVE_LD_HASH_STYLE
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
@@ -1870,9 +1869,7 @@
 chmod u+w *.desktop
 for file in *.desktop; do
     # rhbz#156067 don't version the icons
-    sed -i -e "s/$ICONPRODUCTVERSION//g" $file
-    # rhbz#156677 remove the version from Name=
-    sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file
+    sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -1901,25 +1898,25 @@
 #get rid of the gnome icons and other unneeded files
 rm -rf icons/gnome applications mime application-registry
 # rhbz#156067 don't version the icons
-find . -name "*.desktop" -exec sed -i -e s/$ICONPRODUCTVERSION//g {} \;
-find . -name "*officeorg$ICONPRODUCTVERSION*" -exec bash -c \
-  "mv \$1 \`echo \$1 | sed s/officeorg$ICONPRODUCTVERSION/officeorg/\`" -- {} \;
-find . -name "*office.org$LONGICONPRODUCTVERSION*" -exec bash -c \
-  "mv \$1 \`echo \$1 | sed s/.org$LONGICONPRODUCTVERSION/.org/\`" -- {} \;
+find . -name "*.desktop" -exec sed -i -e s/$PRODUCTVERSIONSHORT//g {} \;
+find . -name "*officeorg$PRODUCTVERSIONSHORT*" -exec bash -c \
+  "mv \$1 \`echo \$1 | sed s/officeorg$PRODUCTVERSIONSHORT/officeorg/\`" -- {} \;
+find . -name "*office.org$PRODUCTVERSIONSHORT*" -exec bash -c \
+  "mv \$1 \`echo \$1 | sed s/.org$PRODUCTVERSIONSHORT/.org/\`" -- {} \;
 find . -type l -print -exec ls -lag '{}' \; | gawk '{q="'\''" ; file=$0 ; \
     getline; \
     split($0, ls, " -> "); \
     link=ls[2]; \
-    gsub(ENVIRON["ICONPRODUCTVERSION"], "", link) ; \
+    gsub(ENVIRON["PRODUCTVERSIONSHORT"], "", link) ; \
     if ( link != ls[2] ) system("rm " q file q"; ln -s "q link q" "q file q); \
  }'
-sed -i -e s/openofficeorg$ICONPRODUCTVERSION/openofficeorg/g \
+sed -i -e s/openofficeorg$PRODUCTVERSIONSHORT/openofficeorg/g \
   ./mime-info/openoffice.org.keys
-sed -i -e s/openoffice.org$LONGICONPRODUCTVERSION/openoffice.org/g \
+sed -i -e s/openoffice.org$PRODUCTVERSIONSHORT/openofficeorg/g/openoffice.org/g \
   ./mime-info/openoffice.org.keys
-sed -i -e s/brofficeorg$ICONPRODUCTVERSION/brofficeorg/g \
+sed -i -e s/brofficeorg$PRODUCTVERSIONSHORT/brofficeorg/g \
   ./mime-info/broffice.org.keys
-sed -i -e s/broffice.org$LONGICONPRODUCTVERSION/broffice.org/g \
+sed -i -e s/broffice.org$PRODUCTVERSIONSHORT/openofficeorg/g/broffice.org/g \
   ./mime-info/broffice.org.keys
 #relocate the rest of them
 cp -r icons $RPM_BUILD_ROOT/%{_datadir}
@@ -1935,9 +1932,7 @@
 chmod u+w *.desktop
 for file in *.desktop; do
     # rhbz#156067 don't version the icons
-    sed -i -e "s/$ICONPRODUCTVERSION//g" $file
-    # rhbz#156677 remove the version from Name=
-    sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file
+    sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
     # use broffice.org launcher
     sed -i -e "s/openoffice/broffice/g" $file
 done
@@ -3648,7 +3643,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Sep 05 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
+* Sun Sep 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
 - next candidate
 
 * Thu Sep 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-4.2