rpms/openoffice.org/devel openoffice.org.spec,1.1472,1.1473

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
fix up branding packaging


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1472
retrieving revision 1.1473
diff -u -r1.1472 -r1.1473
--- openoffice.org.spec	9 Apr 2008 08:06:38 -0000	1.1472
+++ openoffice.org.spec	9 Apr 2008 12:56:46 -0000	1.1473
@@ -1394,11 +1394,15 @@
 #give a consistent javasettingsunopkginstall.xml
 $RPM_BUILD_ROOT/%{oooinstdir}/program/unopkg list --shared || :
 rm -rf $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages/cache || :
-ln -s $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages/cache ../../../../%{baseinstdir}/share/uno_packages/cache
+pushd $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages
+ln -s ../../../../../%{baseinstdir}/share/uno_packages/cache cache
+popd
 %if %{langpacks}
 $RPM_BUILD_ROOT/%{brinstdir}/program/unopkg list --shared || :
 rm -rf $RPM_BUILD_ROOT/%{brinstdir}/share/uno_packages/cache || :
-ln -s $RPM_BUILD_ROOT/%{brinstdir}/share/uno_packages/cache ../../../../%{baseinstdir}/share/uno_packages/cache
+pushd $RPM_BUILD_ROOT/%{brinstdir}/share/uno_packages
+ln -s ../../../../../%{baseinstdir}/share/uno_packages/cache cache
+popd
 %endif
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{baseinstdir}/sdk"
 export WITH_LANG="en-US"