rpms/openoffice.org/devel openoffice.org.spec, 1.1252, 1.1253 openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch, 1.2, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch 
Log Message:
glibc is fixed


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1252
retrieving revision 1.1253
diff -u -r1.1252 -r1.1253
--- openoffice.org.spec	17 Aug 2007 17:57:33 -0000	1.1252
+++ openoffice.org.spec	17 Aug 2007 18:35:28 -0000	1.1253
@@ -128,8 +128,7 @@
 Patch63: workspace.npower7.patch
 Patch64: openoffice.org-2.3.0.ooo80722.sw.stlportism.patch
 Patch65: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch66: openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch
-Patch67: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch66: openoffice.org-2.3.0.ooo80735.cppu.map.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1051,8 +1050,7 @@
 %patch63 -p1 -b .workspace.npower7.patch
 %patch64 -p1 -b .ooo80722.sw.stlportism.patch
 %patch65 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch66 -p1 -b .glibcXXXXX.sal.gettimeofday.patch
-%patch67 -p1 -b .ooo80735.cppu.map.patch
+%patch66 -p1 -b .ooo80735.cppu.map.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -1423,8 +1421,9 @@
 pushd $RPM_BUILD_ROOT/%{instdir}/share/xdg/
 chmod u+w *.desktop
 # rhbz#156677 use GenericNames
-for file in *.desktop; do
-    desktop-file-install --copy-generic-name-to-name --remove-key=GenericName $file --dir `pwd`
+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
 echo "StartupNotify=true" >> base.desktop
 echo "TryExec=oobase" >> base.desktop
@@ -2664,8 +2663,6 @@
 
 %changelog
 * Tue Aug 18 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-1.1
-- add openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch to kludge
-  around glibc gettimeofday bustage
 - Resolves: rhbz#251896 count from start of ctl sequence, not start of
   string when doing range test
 - first 2.3.0 prerelease candidate


--- openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch DELETED ---