rpms/openoffice.org/devel openoffice.org.spec,1.1440,1.1441

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Sun Mar 9 18:09:51 UTC 2008


Author: caolanm

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

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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440
retrieving revision 1.1441
diff -u -r1.1440 -r1.1441
--- openoffice.org.spec	6 Mar 2008 09:52:37 -0000	1.1440
+++ openoffice.org.spec	9 Mar 2008 18:09:03 -0000	1.1441
@@ -1,5 +1,5 @@
 %define oootag OOH680
-%define ooomilestone 9
+%define ooomilestone 10
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -1565,17 +1565,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
@@ -1591,7 +1587,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
@@ -2878,6 +2873,10 @@
 
 
 %changelog
+* 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
 




More information about the fedora-extras-commits mailing list