rpms/openoffice.org/devel openoffice.org.spec,1.1541,1.1542

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
some stuff moved back into basis layer upstream


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1541
retrieving revision 1.1542
diff -u -r1.1541 -r1.1542
--- openoffice.org.spec	19 Jun 2008 10:40:22 -0000	1.1541
+++ openoffice.org.spec	19 Jun 2008 13:18:17 -0000	1.1542
@@ -1558,8 +1558,7 @@
 #remove dictooo stuff which we disabled in configure
 rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
 #don't prompt user to register
-sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{oooinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
-sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{brinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
+sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
 #default autorecovery settings
 #don't prompt user to agree to license
 #libtextcat fingerprint location
@@ -2327,6 +2326,7 @@
 %dir %{basisinstdir}/share/registry/data/org/openoffice/Office
 %{basisinstdir}/share/registry/data/org/openoffice/Office/Calc.xcu
 %{basisinstdir}/share/registry/data/org/openoffice/Office/Canvas.xcu
+%{basisinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
 %{basisinstdir}/share/registry/data/org/openoffice/Office/DataAccess.xcu
 %{basisinstdir}/share/registry/data/org/openoffice/Office/Embedding.xcu
 %{basisinstdir}/share/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
@@ -2638,7 +2638,6 @@
 %dir %{oooinstdir}/share/registry/data/org
 %dir %{oooinstdir}/share/registry/data/org/openoffice
 %dir %{oooinstdir}/share/registry/data/org/openoffice/Office
-%{oooinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
 %{oooinstdir}/share/registry/data/org/openoffice/Office/Compatibility.xcu
 %{oooinstdir}/share/registry/data/org/openoffice/Office/UI.xcu
 %{oooinstdir}/share/registry/data/org/openoffice/Setup.xcu
@@ -2695,7 +2694,6 @@
 %dir %{brinstdir}/share/registry/data/org
 %dir %{brinstdir}/share/registry/data/org/openoffice
 %dir %{brinstdir}/share/registry/data/org/openoffice/Office
-%{brinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
 %{brinstdir}/share/registry/data/org/openoffice/Office/Compatibility.xcu
 %{brinstdir}/share/registry/data/org/openoffice/Office/UI.xcu
 %{brinstdir}/share/registry/data/org/openoffice/Setup.xcu