rpms/openoffice.org/devel openoffice.org.spec, 1.1830, 1.1831 sources, 1.341, 1.342

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec sources 
Log Message:
add X-GIO-NoFuse entries


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1830
retrieving revision 1.1831
diff -u -r1.1830 -r1.1831
--- openoffice.org.spec	26 Feb 2009 14:01:38 -0000	1.1830
+++ openoffice.org.spec	26 Feb 2009 15:03:30 -0000	1.1831
@@ -2179,6 +2179,8 @@
     sed -i -e "s/$PRODUCTVERSION //g" $file
     # rhbz#156067 don't version the icons
     sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
+    # add X-GIO-NoFuse so we get url:// instead of file://~.gvfs/
+    echo X-GIO-NoFuse=true >> $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -2203,15 +2205,6 @@
 cp -p math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-math.desktop
 cp -p draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-draw.desktop
 popd
-## rhbz#486460, do we need to hold onto the legacy names just in case?, don't think so
-#pushd $RPM_BUILD_ROOT/%{_datadir}/applications
-#ln -s openoffice.org-base.desktop openoffice.org-1.9-base.desktop
-#ln -s openoffice.org-calc.desktop openoffice.org-1.9.calc.desktop
-#ln -s openoffice.org-impress.desktop openoffice.org-1.9-impress.desktop
-#ln -s openoffice.org-writer.desktop openoffice.org-1.9-writer.desktop
-#ln -s openoffice.org-math.desktop openoffice.org-1.9-math.desktop
-#ln -s openoffice.org-draw.desktop openoffice.org-1.9-draw.desktop
-#popd
 # rhbz#486062 create a .desktop file that registers OOo as a handler for the javafilter formats
 # iff it is installed
 cp -p %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-javafilter.desktop


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- sources	26 Feb 2009 14:01:38 -0000	1.341
+++ sources	26 Feb 2009 15:03:30 -0000	1.342
@@ -4,8 +4,8 @@
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 d2392ab1e9049bc3e1d096c483f7a10c  redhat-registry.tar.gz
-d4cd987dca2f091c888d95d5aef19f46  GSI_fi.sdf.gz
-4223939ea412f97ccde9fadbcc0430b6  openoffice.org-javafilter.desktop
 eaf47e2e3d3586f6156c61379cc34df9  redhat-langpacks.tar.gz
-f4d811bf2c10fadf34b68805697e2b72  OOO310_m3.tar.bz2
+6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
+d4cd987dca2f091c888d95d5aef19f46  GSI_fi.sdf.gz
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
+f4d811bf2c10fadf34b68805697e2b72  OOO310_m3.tar.bz2