rpms/openoffice.org/devel openoffice.org.spec,1.1458,1.1459

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Fri Mar 28 12:04:13 UTC 2008


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
figure out a way to get most configuration setting working again


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1458
retrieving revision 1.1459
diff -u -r1.1458 -r1.1459
--- openoffice.org.spec	28 Mar 2008 09:58:26 -0000	1.1458
+++ openoffice.org.spec	28 Mar 2008 12:03:10 -0000	1.1459
@@ -1326,11 +1326,14 @@
 #remove dictooo stuff which we disabled in configure
 rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
 #default autorecovery settings
-#$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH2}
+mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery
+cp %{PATCH2} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery
 #don't prompt user to agree to license
-#$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH3}
+mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Setup
+cp %{PATCH3} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Setup
 #default autosave settings
-#$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH4}
+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}
 #give a consistent javasettingsunopkginstall.xml




More information about the fedora-extras-commits mailing list