rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.31, 1.1440.2.32

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Log Message:
own the new dirs


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.31
retrieving revision 1.1440.2.32
diff -u -r1.1440.2.31 -r1.1440.2.32
--- openoffice.org.spec	25 Mar 2008 12:18:11 -0000	1.1440.2.31
+++ openoffice.org.spec	25 Mar 2008 18:24:45 -0000	1.1440.2.32
@@ -1217,6 +1217,9 @@
 cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
 cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
 chmod -R +w $RPM_BUILD_ROOT/%{instdir}
+#provide an owner for these dir
+mkdir -p $RPM_BUILD_ROOT/%{instdir}/extensions
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openoffice.org/extensions
 %if %{langpacks}
 dmake ooolanguagepack
 %endif
@@ -1226,8 +1229,8 @@
 cd ../../
 
 # unpack report-builder extension
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/sun-report-builder.oxt
-unzip solver/%{OFFICEUPD}/unxlng*/bin/sun-report-builder.oxt -d $RPM_BUILD_ROOT%{_datadir}/sun-report-builder.oxt
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/sun-report-builder.oxt
+unzip solver/%{OFFICEUPD}/unxlng*/bin/sun-report-builder.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
 
 #add enough to the sdk to build the kde vcl plug out of tree
 cp -r solenv/ $RPM_BUILD_ROOT/%{instdir}/sdk
@@ -1698,6 +1701,7 @@
 %files core
 %defattr(-,root,root,-)
 %dir %{instdir}
+%{instdir}/extensions
 %{instdir}/LICENSE
 %{instdir}/LICENSE.html
 %{instdir}/README
@@ -2310,6 +2314,7 @@
 #icons and mime
 %{_datadir}/icons/*
 %{_datadir}/mime-info/*
+%{_datadir}/openoffice.org
 %{instdir}/program/libxmlsecurity.so
 %{instdir}/program/liboldxmlsec*
 %if %{stlport_abi_lockin}
@@ -2449,7 +2454,7 @@
 
 %files report-builder
 %defattr(-,root,root,-)
-%{_datadir}/sun-report-builder.oxt
+%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
 
 %pre report-builder
 if [ $1 -gt 1 ]; then
@@ -2459,7 +2464,7 @@
 
 %post report-builder
     # register extension
-    echo yes | unopkg add --shared --link %{_datadir}/sun-report-builder.oxt > /dev/null || :
+    echo yes | unopkg add --shared --link %{_datadir}/openoffice.org/extensions/sun-report-builder.oxt > /dev/null || :
 
 %preun report-builder
 if [ $1 -eq 0 ]; then