rpms/openoffice.org/devel redhat-agreement.xsl, NONE, 1.1 openoffice.org.spec, 1.1600, 1.1601

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	redhat-agreement.xsl 
Log Message:
Resolves: rhbz#457600 licences are localized apparently


--- NEW FILE redhat-agreement.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ex="http://openoffice.org/extensions/description/2006" version="1.0">

<xsl:template match="@*|node()">
	<xsl:copy>
	    <xsl:apply-templates select="@*|node()"/>
	</xsl:copy>
</xsl:template>

<xsl:template match="ex:registration"/>

</xsl:stylesheet>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1600
retrieving revision 1.1601
diff -u -r1.1600 -r1.1601
--- openoffice.org.spec	1 Aug 2008 23:48:29 -0000	1.1600
+++ openoffice.org.spec	3 Aug 2008 16:03:06 -0000	1.1601
@@ -1,6 +1,6 @@
 %define oootag DEV300
 %define ooomilestone 28
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -51,6 +51,7 @@
 Source5:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 Source6:        redhat-registry.tar.gz
 Source7:        redhat-langpacks.tar.gz
+Source8:        redhat-agreement.xsl
 BuildRequires:	zip, findutils, autoconf, flex, bison, icu, gcc-c++
 BuildRequires:	binutils, java-devel, boost-devel, zlib-devel, vigra-devel
 BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -1474,6 +1475,9 @@
 mv pythonscript.py* $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
 popd
 
+# remove force-agrement to extensions licences
+find $RPM_BUILD_ROOT/%{_datadir}/openoffice.org/extensions $RPM_BUILD_ROOT/%{baseinstdir}/extensions -name description.xml -exec sh -c 'xsltproc --novalid --nonet -o {}.tmp %{SOURCE8} {} && mv -f {}.tmp {}' \;
+
 #add enough to the sdk to build the kde vcl plug out of tree
 cp -r solenv/ $RPM_BUILD_ROOT/%{sdkinstdir}
 cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{sdkinstdir}/bin
@@ -2844,7 +2848,7 @@
 
 %post report-builder
     # register extension
-    echo yes | unopkg add --shared --link %{_datadir}/openoffice.org/extensions/sun-report-builder.oxt > /dev/null || :
+    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/sun-report-builder.oxt > /dev/null || :
 
 %preun report-builder
 if [ $1 -eq 0 ]; then
@@ -2919,7 +2923,7 @@
 
 %post wiki-publisher
     # register extension
-    echo yes | unopkg add --shared --link %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt > /dev/null || :
+    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt > /dev/null || :
 
 %preun wiki-publisher
 if [ $1 -eq 0 ]; then
@@ -2943,7 +2947,7 @@
 
 %post presentation-minimizer
     # register extension
-    echo yes | unopkg add --shared --link %{baseinstdir}/extensions/sun-presentation-minimizer.oxt > /dev/null || :
+    unopkg add --shared --link %{baseinstdir}/extensions/sun-presentation-minimizer.oxt > /dev/null || :
 
 %preun presentation-minimizer
 if [ $1 -eq 0 ]; then
@@ -2967,7 +2971,7 @@
 
 %post presenter-screen
     # register extension
-    echo yes | unopkg add --shared --link %{baseinstdir}/extensions/presenter-screen.oxt > /dev/null || :
+    unopkg add --shared --link %{baseinstdir}/extensions/presenter-screen.oxt > /dev/null || :
 
 %preun presenter-screen
 if [ $1 -eq 0 ]; then
@@ -3564,10 +3568,11 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Aug 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-2
+* Sun Aug 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-2
 - Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
 - Resolves: rhbz#457529 reset number recognition default in writer back to 
   pre 3.0 settings. Its a stupid feature for a word processor.
+- Resolves: rhbz#457600 licences are localized apparently
 
 * Mon Jul 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-1
 - next version