rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch, 1.1, 1.2 openoffice.org.spec, 1.1491, 1.1492

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29788

Modified Files:
	openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch 
	openoffice.org.spec 
Log Message:
stupid register dialog is back

openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch:

Index: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch	26 May 2008 16:00:03 -0000	1.1
+++ openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch	6 Jun 2008 08:08:11 -0000	1.2
@@ -159,13 +159,12 @@
  
      // query fontconfig for a substitute
      rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pPattern, FcMatchPattern );
-@@ -969,6 +999,18 @@
+@@ -969,6 +999,17 @@
                  if (aI != rWrapper.m_aFontNameToLocalized.end())
                      sFamily = aI->second;
                  aName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 );
 +
 +
-+                fprintf(stderr, "incoming weight was %d\n", rWeight);
 +                int val = 0;
 +                if ( FcResultMatch == rWrapper.FcPatternGetInteger( pSet->fonts[0], FC_WEIGHT, 0, &val))
 +                    rWeight = convertWeight(val);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1491
retrieving revision 1.1492
diff -u -r1.1491 -r1.1492
--- openoffice.org.spec	3 Jun 2008 13:23:09 -0000	1.1491
+++ openoffice.org.spec	6 Jun 2008 08:08:11 -0000	1.1492
@@ -1,6 +1,6 @@
 %define oootag OOH680
 %define ooomilestone 17
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1345,6 +1345,8 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
 #don't prompt user to agree to license
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH3}
+#don't prompt user to register
+sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/Office/Common.xcu
 #default autosave settings
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH4}
 #libtextcat fingerprint location
@@ -2914,6 +2916,9 @@
 
 
 %changelog
+* Fri Jun 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.3
+- remove pointless "register" dialog request
+
 * Tue Jun 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.2
 - filter out -fasynchronous-unwind-tables because it doesn't work with -Os
   on i386