rpms/openoffice.org/devel .cvsignore, 1.150.2.1, 1.150.2.2 openoffice.org.spec, 1.1440.2.5, 1.1440.2.6

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	.cvsignore openoffice.org.spec 
Log Message:
merge


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.150.2.1
retrieving revision 1.150.2.2
diff -u -r1.150.2.1 -r1.150.2.2
--- .cvsignore	7 Mar 2008 14:32:37 -0000	1.150.2.1
+++ .cvsignore	9 Mar 2008 18:12:22 -0000	1.150.2.2
@@ -4,5 +4,4 @@
 Tigert-templates.tar.gz
 unowinreg.dll
 bengali.sdf
-OOH680_m9.tar.bz2
 DEV300_m1.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.5
retrieving revision 1.1440.2.6
diff -u -r1.1440.2.5 -r1.1440.2.6
--- openoffice.org.spec	9 Mar 2008 14:43:40 -0000	1.1440.2.5
+++ openoffice.org.spec	9 Mar 2008 18:12:22 -0000	1.1440.2.6
@@ -1557,17 +1557,13 @@
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
 
-
 pushd $RPM_BUILD_ROOT/%{instdir}/share/xdg/
 chmod u+w *.desktop
-# rhbz#156677 use GenericNames
-for file in base.desktop calc.desktop impress.desktop writer.desktop; do
-    sed -i -e '/^Name/d' $file
-    sed -i -e 's/GenericName/Name/g' $file
-done
-# rhbz#156067 don't version the icons
 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
 done
 echo "StartupNotify=true" >> base.desktop
 echo "TryExec=oobase" >> base.desktop
@@ -1583,7 +1579,6 @@
 echo "TryExec=oodraw" >> draw.desktop
 # rh#156677# / rh#186515#
 echo "NoDisplay=true" >> math.desktop
-echo "NoDisplay=true" >> draw.desktop
 chmod u-w *.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
@@ -2868,8 +2863,7 @@
 %{python_py_sitearch}/uno.py*
 %{python_py_sitearch}/unohelper.py*
 
-
-%6changelog
+%changelog
 * Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.1.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch
@@ -2881,6 +2875,10 @@
 - add workspace.cmcfixes43.patch
 - add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 
+* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.1
+- next release candidate
+- rhbz#293791 Restore draw back to the menus and revert to upstream app names
+
 * Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
 - next release candidate