rpms/openoffice.org/devel openoffice.org.langpack-common.template, 1.1.2.3, 1.1.2.4 openoffice.org.spec, 1.1440.2.34, 1.1440.2.35

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.langpack-common.template openoffice.org.spec 
Log Message:
resource locations


Index: openoffice.org.langpack-common.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-common.template,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- openoffice.org.langpack-common.template	26 Mar 2008 16:13:23 -0000	1.1.2.3
+++ openoffice.org.langpack-common.template	27 Mar 2008 08:03:39 -0000	1.1.2.4
@@ -10,6 +10,9 @@
 %{oooinstdir}/share/readme/README_LANG
 %{oooinstdir}/share/readme/README_LANG.html
 %dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%dir %{basisinstdir}/program/resource
+%{basisinstdir}/program/resource/*LANG.res 
 %dir %{basisinstdir}/share
 %dir %{basisinstdir}/share/registry 
 %dir %{basisinstdir}/share/registry/res 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.34
retrieving revision 1.1440.2.35
diff -u -r1.1440.2.34 -r1.1440.2.35
--- openoffice.org.spec	26 Mar 2008 13:15:53 -0000	1.1440.2.34
+++ openoffice.org.spec	27 Mar 2008 08:03:39 -0000	1.1440.2.35
@@ -1169,6 +1169,7 @@
     build --dlv_switch -link --all
 fi
 deliver -link
+#ooo#64726
 localize -m -x -l bn -f %{SOURCE5}
 cd ../..
 
@@ -1695,7 +1696,7 @@
 %defattr(-,root,root,-)
 %{_datadir}/openoffice.org/extensions
 %dir %{oooinstdir}
-%{oooinstdir}/extensions
+%{baseinstdir}/extensions
 %{oooinstdir}/LICENSE
 %{oooinstdir}/LICENSE.html
 %{oooinstdir}/README
@@ -2289,7 +2290,7 @@
 %{basisinstdir}/program/libxmlsecurity.so
 %{basisinstdir}/program/liboldxmlsec*
 %if %{stlport_abi_lockin}
-%{basisinstdir}/program/libstlport*.so
+%{ureinstdir}/lib/libstlport*.so
 %endif
 %{_datadir}/applications/openoffice.org-extensionmgr.desktop
 %{_datadir}/mime/packages/openoffice.org.xml