rpms/openoffice.org/devel openoffice.org.spec,1.1793,1.1794

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5145

Modified Files:
	openoffice.org.spec 
Log Message:
ogltrans won't be an extension after all


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1793
retrieving revision 1.1794
diff -u -r1.1793 -r1.1794
--- openoffice.org.spec	12 Feb 2009 14:37:55 -0000	1.1793
+++ openoffice.org.spec	12 Feb 2009 15:40:57 -0000	1.1794
@@ -292,9 +292,6 @@
 Group: Applications/Productivity
 Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
 Requires(pre):    openoffice.org-core
-Requires(post):   openoffice.org-core
-Requires(preun):  openoffice.org-core
-Requires(postun): openoffice.org-core
 
 %description ogltrans
 OpenGL Transitions enable 3D slide transitions to be used in %{name}.
@@ -1576,7 +1573,7 @@
  --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm \
  --disable-fontooo --disable-mathmldtd --disable-Xaw --disable-gnome-vfs \
  --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown \
- --enable-evolution2 --enable-cairo --enable-dbus --enable-ogltrans \
+ --enable-evolution2 --enable-cairo --enable-dbus --enable-opengl \
  --enable-minimizer --enable-presenter-console --enable-pdfimport \
  --enable-wiki-publisher --enable-report-builder --enable-vba \
  --with-vba-package-format="builtin" --with-system-libs \
@@ -1797,10 +1794,6 @@
 unzip solver/%{OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/pdfimport.oxt
 chmod -x $RPM_BUILD_ROOT%{baseinstdir}/extensions/pdfimport.oxt/help/component.txt
 
-# unpack OGLTrans extension
-install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/ogltrans.oxt
-unzip solver/%{OFFICEUPD}/unxlng*/bin/ogltrans/ogltrans.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/ogltrans.oxt
-
 # revoke ScriptProviders and make into extensions
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/program
 regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForBeanShell.jar"
@@ -3288,27 +3281,25 @@
 
 %files ogltrans
 %defattr(-,root,root,-)
-%{baseinstdir}/extensions/ogltrans.oxt
+%dir %{baseinstdir}
+%{basisinstdir}/program
+%{basisinstdir}/program/OGLTrans.uno.so
+%dir %{basisinstdir}/share
+%dir %{basisinstdir}/share/config
+%dir %{basisinstdir}/share/config/soffice.cfg
+%dir %{basisinstdir}/share/config/soffice.cfg/simpress
+%{basisinstdir}/share/config/soffice.cfg/simpress/transitions-ogl.xml
+%dir %{basisinstdir}/share/registry
+%dir %{basisinstdir}/share/registry/modules
+%dir %{basisinstdir}/share/registry/modules/org
+%dir %{basisinstdir}/share/registry/modules/org/openoffice
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Impress
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Impress/Impress-ogltrans.xcu
 
 %pre ogltrans
-if [ $1 -gt 1 ]; then
-    # Upgrade => deregister old extension
-    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/ogltrans.oxt/description.xml | cut -d '"' -f 2` || :
-fi
-
-%post ogltrans
-    # register extension
-    unopkg add --shared --force --link %{baseinstdir}/extensions/ogltrans.oxt > /dev/null || :
-
-%preun ogltrans
-if [ $1 -eq 0 ]; then
-    # not upgrading => deregister
-    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/ogltrans.oxt/description.xml | cut -d '"' -f 2` || :
-fi
-
-%postun ogltrans
-    # clear disk cache
-    unopkg list --shared > /dev/null 2>&1 || :
+# deregister old extension if it is still there
+unopkg remove --shared `grep identifier %{baseinstdir}/extensions/ogltrans.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
 
 %files presentation-minimizer
 %defattr(-,root,root,-)
@@ -3672,7 +3663,9 @@
 %{basisinstdir}/program/libplaceware*.so
 %dir %{basisinstdir}/share
 %dir %{basisinstdir}/share/config
-%{basisinstdir}/share/config/soffice.cfg
+%dir %{basisinstdir}/share/config/soffice.cfg
+%dir %{basisinstdir}/share/config/soffice.cfg/simpress
+%{basisinstdir}/share/config/soffice.cfg/simpress/transitions-ogl.xml
 %dir %{basisinstdir}/share/registry
 %dir %{basisinstdir}/share/registry/data
 %dir %{basisinstdir}/share/registry/data/org