rpms/openoffice.org/devel openoffice.org.spec, 1.383, 1.384 sources, 1.98, 1.99

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4873

Modified Files:
	openoffice.org.spec sources 
Log Message:
too hard to fiddle with painful thing


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- openoffice.org.spec	11 Aug 2005 10:32:04 -0000	1.383
+++ openoffice.org.spec	11 Aug 2005 15:17:20 -0000	1.384
@@ -95,7 +95,6 @@
 Source4:	openoffice.org-simple-crash_report.sh
 Source5:	gcj-sed.sh
 Source6:	RegisterAndLicence.xcu
-Source7:	UseSystemFPicker.xcu
 BuildRequires: 	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils
 BuildRequires: 	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires: 	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -958,7 +957,7 @@
 
 %install
 #add our custom configuration options
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE6} %{SOURCE7}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE6}
 
 #rh#158977# clear execstack requirement
 execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so
@@ -982,6 +981,9 @@
 done
 popd
 
+#allow gtk file dialog to be default
+rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
+
 #remove script to munge OOo2 mime info into system, we'll do that
 rm -f $RPM_BUILD_ROOT/%{instdir}/program/update-mime-data
 
@@ -2503,7 +2505,6 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Common/*ctl*
 %{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
 %{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-en-US.xcu
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	11 Aug 2005 10:32:04 -0000	1.98
+++ sources	11 Aug 2005 15:17:20 -0000	1.99
@@ -4,5 +4,4 @@
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
 c733528059f1ea2b51c78d07738bf121  gcj-sed.sh
 bcd364abd153aacea0b7a6e186ff3ab0  SRC680_m123.tar.bz2
-214cc4f8f62d11353e26c47ab1b88c6d  UseSystemFPicker.xcu
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu