rpms/openoffice.org/devel openoffice.org.spec,1.1322,1.1323

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Tue Oct 16 07:26:22 UTC 2007


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#333201 dangling symlinks


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1322
retrieving revision 1.1323
diff -u -r1.1322 -r1.1323
--- openoffice.org.spec	12 Oct 2007 11:39:01 -0000	1.1322
+++ openoffice.org.spec	16 Oct 2007 07:25:49 -0000	1.1323
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1517,6 +1517,13 @@
   "mv \$1 \`echo \$1 | sed s/officeorg$ICONPRODUCTVERSION/officeorg/\`" -- {} \;
 find . -name "openoffice.org$LONGICONPRODUCTVERSION*" -exec bash -c \
   "mv \$1 \`echo \$1 | sed s/.org$LONGICONPRODUCTVERSION/.org/\`" -- {} \;
+find . -type l -print -exec ls -lag '{}' \; | gawk '{q="'\''" ; file=$0 ; \
+    getline; \
+    split($0, ls, " -> "); \
+    link=ls[2]; \
+    gsub(ENVIRON["ICONPRODUCTVERSION"], "", 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 \
   ./mime-info/openoffice.org.keys
 sed -i -e s/openoffice.org$LONGICONPRODUCTVERSION/openoffice.org/g \
@@ -2782,6 +2789,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Oct 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.4
+- Resolves: rhbz#333201 dangling symlinks
+
 * Fri Oct 12 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.3
 - reenable prelink-optimized launchers
 - rhbz#326161 make code compiled with icedtea compatible with 1.5.0 so libgcj




More information about the scm-commits mailing list