rpms/openoffice.org/devel openoffice.org.spec,1.2187,1.2188

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3573

Modified Files:
	openoffice.org.spec 
Log Message:
oh joy, sun->oracle branding changes name of extension filename :-)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2187
retrieving revision 1.2188
diff -u -p -r1.2187 -r1.2188
--- openoffice.org.spec	22 Apr 2010 08:41:23 -0000	1.2187
+++ openoffice.org.spec	22 Apr 2010 14:21:28 -0000	1.2188
@@ -1853,17 +1853,17 @@ dmake sdkoo
 cd ../../
 
 # unpack report-builder extension
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/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
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/oracle-report-builder.oxt
+unzip solver/%{OFFICEUPD}/unxlng*/bin/oracle-report-builder.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/oracle-report-builder.oxt
 
 # unpack wiki-publisher extension
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/swext/wiki-publisher.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
 
 # unpack presentation-minimizer extension
-install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/sun-presentation-minimizer.oxt
-unzip solver/%{OFFICEUPD}/unxlng*/bin/minimizer/sun-presentation-minimizer.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/sun-presentation-minimizer.oxt
-chmod -x $RPM_BUILD_ROOT%{baseinstdir}/extensions/sun-presentation-minimizer.oxt/help/component.txt
+install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/oracle-presentation-minimizer.oxt
+unzip solver/%{OFFICEUPD}/unxlng*/bin/minimizer/oracle-presentation-minimizer.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/oracle-presentation-minimizer.oxt
+chmod -x $RPM_BUILD_ROOT%{baseinstdir}/extensions/oracle-presentation-minimizer.oxt/help/component.txt
 
 # unpack presenter screen extension
 install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt
@@ -3289,8 +3289,8 @@ update-desktop-database %{_datadir}/appl
 
 %files report-builder
 %defattr(-,root,root,-)
-%docdir %{_datadir}/openoffice.org/extensions/sun-report-builder.oxt/help
-%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
+%docdir %{_datadir}/openoffice.org/extensions/oracle-report-builder.oxt/help
+%{_datadir}/openoffice.org/extensions/oracle-report-builder.oxt
 
 %pre report-builder
 if [ $1 -gt 1 ]; then
@@ -3300,7 +3300,7 @@ fi
 
 %post report-builder
     # register extension
-    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/sun-report-builder.oxt > /dev/null 2>&1 || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/oracle-report-builder.oxt > /dev/null 2>&1 || :
 
 %preun report-builder
 if [ $1 -eq 0 ]; then
@@ -3411,23 +3411,23 @@ unopkg remove --shared `grep -s identifi
 
 %files presentation-minimizer
 %defattr(-,root,root,-)
-%docdir %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/help
-%{baseinstdir}/extensions/sun-presentation-minimizer.oxt
+%docdir %{baseinstdir}/extensions/oracle-presentation-minimizer.oxt/help
+%{baseinstdir}/extensions/oracle-presentation-minimizer.oxt
 
 %pre presentation-minimizer
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
+    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/oracle-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
 fi
 
 %post presentation-minimizer
     # register extension
-    unopkg add --shared --force --link %{baseinstdir}/extensions/sun-presentation-minimizer.oxt > /dev/null 2>&1 || :
+    unopkg add --shared --force --link %{baseinstdir}/extensions/oracle-presentation-minimizer.oxt > /dev/null 2>&1 || :
 
 %preun presentation-minimizer
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
+    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/oracle-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
 fi
 
 %postun presentation-minimizer