rpms/openoffice.org/devel openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch, NONE, 1.1 openoffice.org.spec, 1.1514, 1.1515

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch 
Log Message:
raw stupidity

openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch:

--- NEW FILE openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch ---
--- openoffice.org.orig/swext/mediawiki/src/description.xml	2008-05-28 08:41:27.000000000 +0100
+++ openoffice.org/swext/mediawiki/src/description.xml	2008-05-28 08:40:41.000000000 +0100
@@ -6,7 +6,7 @@
         <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
     </display-name>
 	<registration>
-        <simple-license accept-by="user" default-license-id="lic-en-US">
+        <simple-license accept-by="admin" default-license-id="lic-en-US">
             <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
         </simple-license>
     </registration>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1514
retrieving revision 1.1515
diff -u -r1.1514 -r1.1515
--- openoffice.org.spec	27 May 2008 08:11:44 -0000	1.1514
+++ openoffice.org.spec	28 May 2008 08:44:31 -0000	1.1515
@@ -130,6 +130,7 @@
 Patch54: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch55: openoffice.org-3.0.0.ooo88815.oox.parallel.patch
 Patch56: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch57: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -245,6 +246,19 @@
 and page headers as well as group, page footers and calculation fields to
 accomplish complex database reports.
 
+%package wiki-publisher
+Summary: Create Wiki articles on MediaWiki servers with %{name}
+Group: Applications/Productivity
+Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
+Requires: jakarta-commons-codec jakarta-commons-httpclient
+Requires: jakarta-commons-lang jakarta-commons-logging
+
+%description wiki-publisher
+The Wiki Publisher enables you to create Wiki articles on MediaWiki servers
+without having to know the syntax of the MediaWiki markup language. Publish
+your new and existing documents transparently with %{name}-writer to a wiki
+page.
+
 %package presentation-minimizer
 Summary: Shrink %{name} presentations
 Group: Applications/Productivity
@@ -1250,6 +1264,7 @@
 %patch54 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch55 -p1 -b .ooo88815.oox.parallel.patch
 %patch56 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch57 -p1 -b .ooo90055.swext.allowadmin.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1351,6 +1366,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 source Linux*Env.Set.sh
+PLAT=`sal/unxlng*/bin/gen_makefile | sed -e "s/RTL_.*:=//g" | xargs | sed -e "s/ /_/g" | sed -r "s/[A-Z]+/\L&/g"`
+%define PLATFORM_ID $PLAT
 #figure out the icon version
 export LONGICON`grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
 export ICONPRODUCTVERSION=${LONGICONPRODUCTVERSION/./}
@@ -1434,6 +1451,17 @@
 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
 
+# unpack wiki-publisher extension
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/wiki-publisher.oxt
+unzip solver/%{OFFICEUPD}/unxlng*/bin/swext/wiki-publisher.oxt-d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
+pushd $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
+rm -rf commons-*.jar
+ln -s /usr/share/java/commons-codec.jar commons-codec-1.3.jar
+ln -s /usr/share/java/commons-httpclient.jar commons-httpclient-3.1.jar
+ln -s /usr/share/java/commons-lang.jar commons-lang-2.3.jar
+ln -s /usr/share/java/commons-logging.jar commons-logging-1.1.1.jar
+popd
+
 # 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
@@ -2530,8 +2558,9 @@
 %{oooinstdir}/program/unopkg
 %{oooinstdir}/program/unopkg.bin
 %{oooinstdir}/program/bootstraprc
-%{oooinstdir}/program/setuprc
 %{oooinstdir}/program/fundamentalrc
+%{oooinstdir}/program/setuprc
+%{oooinstdir}/program/versionrc
 
 %post core
 update-mime-database %{_datadir}/mime > /dev/null
@@ -2582,7 +2611,6 @@
 %{oooinstdir}/program/soffice.bin
 %{oooinstdir}/program/sofficerc
 %{oooinstdir}/program/spadmin
-%{oooinstdir}/program/versionrc
 %dir %{oooinstdir}/share
 %dir %{oooinstdir}/share/config
 %{oooinstdir}/share/config/images_brand.zip
@@ -2787,6 +2815,30 @@
     # clear disk cache
     unopkg list --shared > /dev/null 2>&1 || :
 
+%files wiki-publisher
+%defattr(-,root,root,-)
+%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
+
+%pre wiki-publisher
+if [ $1 -gt 1 ]; then
+    # Upgrade => deregister old extension
+    unopkg remove --shared com.sun.wiki-publisher || :
+fi
+
+%post wiki-publisher
+    # register extension
+    echo yes | unopkg add --shared --link %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt > /dev/null || :
+
+%preun wiki-publisher
+if [ $1 -eq 0 ]; then
+    # not upgrading => deregister
+    unopkg remove --shared com.sun.wiki-publisher || :
+fi
+
+%postun wiki-publisher
+    # clear disk cache
+    unopkg list --shared > /dev/null 2>&1 || :
+
 %files presentation-minimizer
 %defattr(-,root,root,-)
 %{baseinstdir}/extensions/sun-presentation-minimizer.oxt
@@ -2818,7 +2870,7 @@
 %pre presenter-screen
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared org.openoffice.PresenterScreen || :
+    unopkg remove --shared org.openoffice.PresenterScreen-%{PLATFORM_ID} || :
 fi
 
 %post presenter-screen
@@ -2828,7 +2880,7 @@
 %preun presenter-screen
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared org.openoffice.PresenterScreen || :
+    unopkg remove --shared org.openoffice.PresenterScreen-%{PLATFORM_ID} || :
 fi
 
 %postun presenter-screen
@@ -3369,13 +3421,14 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
-* Mon May 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.14-1
+* Wed May 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.14-1
 - next version
 - Require new hunspell-ml for Malayalam langpack
 - drop integrated openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 - drop integrated openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
 - add openoffice.org-3.0.0.ooo89921.oox.parallel.patch
 - Resolves: rhbz#445588 add openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+- add openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
 
 * Mon May 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.13-1
 - next version