rpms/openoffice.org/devel libtextcat.xcu, 1.2, 1.3 openoffice.org.spec, 1.1461, 1.1462

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	libtextcat.xcu openoffice.org.spec 
Log Message:
fix up configuration


Index: libtextcat.xcu
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/libtextcat.xcu,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtextcat.xcu	27 Aug 2007 12:05:17 -0000	1.2
+++ libtextcat.xcu	28 Mar 2008 16:07:07 -0000	1.3
@@ -3,6 +3,7 @@
  <node oor:name="Paths">
   <node oor:name="Fingerprint" oor:op="replace" oor:mandatory="true">
     <node oor:name="InternalPaths">
+     <node oor:name="$(insturl)/share/fingerprint" oor:op="remove"/>
      <node oor:name="file:///usr/share/libtextcat" oor:op="fuse" />
     </node>
    </node>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1461
retrieving revision 1.1462
diff -u -r1.1461 -r1.1462
--- openoffice.org.spec	28 Mar 2008 14:44:12 -0000	1.1461
+++ openoffice.org.spec	28 Mar 2008 16:07:07 -0000	1.1462
@@ -1333,7 +1333,8 @@
 mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
 cp %{PATCH4} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
 #libtextcat fingerprint location
-#$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH5}
+mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
+cp %{PATCH5} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
 #give a consistent javasettingsunopkginstall.xml
 #$RPM_BUILD_ROOT/%{oooinstdir}/program/unopkg list --shared || :
 rm -rf $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages/cache/* || :
@@ -2126,6 +2127,8 @@
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/AutoSaveCommon.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths/libtextcat.xcu
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery/AutoSaveRecovery.xcu
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Setup
@@ -2862,7 +2865,7 @@
 * Fri Mar 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.1
 - drop integrated workspace.cairotext01.patch
 - fix up launchers
-- recover most configuration settings
+- fix up configuration settings without using configimport
 - extend selinux bodge to arm, mips and s390
 
 * Tue Mar 27 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1