rpms/openoffice.org/devel .cvsignore, 1.175, 1.176 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.26, 1.27 openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch, 1.1, 1.2 openoffice.org.spec, 1.1572, 1.1573 sources, 1.300, 1.301 openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, 1.6, NONE openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch, 1.1, NONE workspace.ab55.patch, 1.2, NONE workspace.cairo06.patch, 1.1, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Fri Jul 11 11:56:06 UTC 2008 

Author: caolanm

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

Modified Files:
	.cvsignore 
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
	openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 
	openoffice.org.spec sources 
Removed Files:
	openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 
	openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch 
	workspace.ab55.patch workspace.cairo06.patch 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- .cvsignore	6 Jul 2008 19:15:50 -0000	1.175
+++ .cvsignore	11 Jul 2008 11:55:15 -0000	1.176
@@ -6,4 +6,4 @@
 redhat-langpacks.tar.gz
 evolocal.odb
 bengali.sdf
-DEV300_m23.tar.bz2
+DEV300_m24.tar.bz2

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	15 Apr 2008 18:04:28 -0000	1.26
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	11 Jul 2008 11:55:15 -0000	1.27
@@ -250,7 +250,7 @@
 diff -u -r1.28 optgdlg.cxx
 --- openoffice.org.orig/svx/source/dialog/optgdlg.cxx	5 Jan 2006 17:58:40 -0000	1.28
 +++ openoffice.org/svx/source/dialog/optgdlg.cxx	1 Feb 2006 11:04:37 -0000
-@@ -1197,8 +1197,6 @@
+@@ -1163,8 +1163,6 @@
  /* -----------------------------23.11.00 13:06--------------------------------
  
   ---------------------------------------------------------------------------*/
@@ -259,7 +259,7 @@
  // some things we'll need...
  static const OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
  static const OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
-@@ -1534,70 +1532,27 @@
+@@ -1500,70 +1498,27 @@
      BOOL bRet = FALSE;
  	SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
  	Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), UNO_QUERY );
@@ -340,7 +340,7 @@
  	}
  
      if(aAsianSupportCB.GetSavedValue() != aAsianSupportCB.IsChecked() )
-@@ -1639,51 +1594,32 @@
+@@ -1605,51 +1560,32 @@
  
  	return FALSE;
  }
@@ -414,7 +414,7 @@
      //collect the configuration values first
      aCurrentDocCB.Enable(FALSE);
      //
-@@ -1706,47 +1642,88 @@
+@@ -1672,47 +1608,88 @@
      catch(Exception&)
      {
      }
@@ -451,8 +451,8 @@
  			eCurLangCTL = ((const SvxLanguageItem*)pLang)->GetValue();
 +			bLanguageCurrentDoc_Impl = true;
 +		}
-+		aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
-+		aCurrentDocCB.Enable(!bLanguageCurrentDoc_Impl);
++        aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
++        aCurrentDocCB.Enable(!bLanguageCurrentDoc_Impl);
  	}
 -    if(LANGUAGE_NONE == eCurLang || LANGUAGE_DONTKNOW == eCurLang)
 -        aWesternLanguageLB.SelectLanguage(LANGUAGE_NONE);
@@ -463,7 +463,7 @@
 -        aAsianLanguageLB.SelectLanguage(LANGUAGE_NONE);
 -	else
 -		aAsianLanguageLB.SelectLanguage(eCurLangCJK);
-+	aCurrentDocCB.SaveValue();
++    aCurrentDocCB.SaveValue();
 +}
  
 -    if(LANGUAGE_NONE == eCurLangCTL || LANGUAGE_DONTKNOW == eCurLangCTL)
@@ -494,7 +494,6 @@
 -	sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale") );
 -    aWesternLanguageFT.Enable( bEnable );
 -    aWesternLanguageLB.Enable( bEnable );
--    
 +    // let LocaleSettingHdl enable/disable checkboxes for CJK/CTL support
 +    // #i15812# must be done *before* the configured currency is set
 +    // and update the decimal separator used for the given locale
@@ -517,7 +516,7 @@
 +    aCurrencyLB.Enable(!bReadonly);
 +    aCurrencyFT.Enable(!bReadonly);
 +    aCurrencyFI.Show(bReadonly);
-+
+ 
 +    ResetLang( rSet );
 +
 +    RegisterModify( &aCurrentDocCB );
@@ -526,7 +525,7 @@
  
      // #i15812# controls for CJK/CTL already enabled/disabled from LocaleSettingHdl
  #if 0
-@@ -1773,6 +1750,26 @@
+@@ -1739,6 +1716,26 @@
  /* -----------------------------20.04.01 15:09--------------------------------
  
   ---------------------------------------------------------------------------*/
@@ -553,7 +552,7 @@
  IMPL_LINK(  OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
  {
  	DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" );
-@@ -1780,23 +1777,23 @@
+@@ -1746,23 +1743,23 @@
      sal_Bool bCheck = pBox->IsChecked();
  	if ( &aAsianSupportCB == pBox )
  	{

openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch:

Index: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch	25 May 2006 11:08:14 -0000	1.1
+++ openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch	11 Jul 2008 11:55:15 -0000	1.2
@@ -66,17 +66,17 @@
  			<value>$(userurl)/database/biblio.odb</value>
 --- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx	19 Dec 2005 17:26:24 -0000	1.13
 +++ openoffice.org/extensions/source/abpilot/abspilot.cxx	16 Feb 2006 12:45:38 -0000
-@@ -151,12 +151,9 @@ namespace abp
- 		m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) );
- 
+@@ -124,12 +124,8 @@
  		// some initial settings
--#ifdef WITH_MOZILLA
- #ifdef UNX
+ #ifdef MACOSX
+         m_aSettings.eType = AST_MACAB;
+-#elif WITH_MOZILLA
+-#ifdef UNX
 -		m_aSettings.eType = AST_MORK;
 -#else
 -		m_aSettings.eType = AST_OE;
 -#endif
-+// FIXME: if KDE use KAB instead
++#elif UNX
 +		m_aSettings.eType = AST_EVOLUTION;
  #else
  		m_aSettings.eType = AST_OTHER;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1572
retrieving revision 1.1573
diff -u -r1.1572 -r1.1573
--- openoffice.org.spec	10 Jul 2008 20:14:08 -0000	1.1572
+++ openoffice.org.spec	11 Jul 2008 11:55:15 -0000	1.1573
@@ -1,6 +1,6 @@
 %define oootag DEV300
-%define ooomilestone 23
-%define rh_rpm_release 2
+%define ooomilestone 24
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -100,23 +100,19 @@
 Patch30: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
 Patch31: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
 Patch32: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch33: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch34: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch35: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch36: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch37: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
-Patch38: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
-Patch39: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
-Patch40: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
-Patch41: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
-Patch42: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
-Patch43: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
-Patch44: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch45: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
-Patch46: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
-Patch47: workspace.cairo06.patch
-Patch48: workspace.ab55.patch
-Patch49: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch33: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch34: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch35: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch36: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
+Patch37: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+Patch38: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
+Patch39: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
+Patch40: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+Patch41: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
+Patch42: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch43: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
+Patch44: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
+Patch45: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1261,23 +1257,19 @@
 %patch30 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
 %patch31 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
 %patch32 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch33 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch34 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch35 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch36 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch37 -p1 -b .ooo90055.swext.allowadmin.patch
-%patch38 -p1 -b .oooXXXXX.odk.3layer.patch
-%patch39 -p1 -b .ooo90037.vcl.cairotransforms.patch
-%patch40 -p1 -b .ooo90178.tools.fixmacro.patch
-%patch41 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
-%patch42 -p1 -b .ooo82545.np_sdk.x86_64.patch
-%patch43 -p1 -b .ooo90306.sw.wrongprotection.patch
-%patch44 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch45 -p1 -b .ooo90876.connectivity.evoab2.patch
-%patch46 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
-%patch47 -p1 -b .workspace.cairo06.patch
-%patch48 -p1 -b .workspace.ab55.patch
-%patch49 -p1 -b .ooo86142.serbiannumbering.patch
+%patch33 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch34 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch35 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch36 -p1 -b .oooXXXXX.odk.3layer.patch
+%patch37 -p1 -b .ooo90037.vcl.cairotransforms.patch
+%patch38 -p1 -b .ooo90178.tools.fixmacro.patch
+%patch39 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
+%patch40 -p1 -b .ooo82545.np_sdk.x86_64.patch
+%patch41 -p1 -b .ooo90306.sw.wrongprotection.patch
+%patch42 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch43 -p1 -b .ooo90876.connectivity.evoab2.patch
+%patch44 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
+%patch45 -p1 -b .ooo86142.serbiannumbering.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2972,7 +2964,7 @@
 %pre presentation-minimizer
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared org.openoffice.legacy.sun-presentation-minimizer.oxt || :
+    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d\\\" -f 2` || :
 fi
 
 %post presentation-minimizer
@@ -2982,7 +2974,7 @@
 %preun presentation-minimizer
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared org.openoffice.legacy.sun-presentation-minimizer.oxt || :
+    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d\\\" -f 2` || :
 fi
 
 %postun presentation-minimizer
@@ -3583,7 +3575,12 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Jul 10 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-2
+* Fri Jul 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.24-1
+- next version
+- drop integrated openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+- drop integrated openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
+- drop integrated workspace.cairo06.patch
+- drop integrated workspace.ab55.patch
 - Resolves: rhbz#452385 add postgress-jdbc to default classpath
 - Resolves: rhbz#454682 expand macro to get correct name for
   inconsistent, unnecessarily complicated, redundant and nigh universially 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- sources	6 Jul 2008 19:15:50 -0000	1.300
+++ sources	11 Jul 2008 11:55:15 -0000	1.301
@@ -6,4 +6,4 @@
 261ff401db54526e1f5cf7bbe5f2adaf  redhat-langpacks.tar.gz
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
 0c0e868b34329d90a7c9a92f1704775c  bengali.sdf
-faaec17320265bf4e5b5566defb30162  DEV300_m23.tar.bz2
+1b7bbc74567bcf2528c49a32cda0b6e8  DEV300_m24.tar.bz2


--- openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch DELETED ---


--- openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch DELETED ---


--- workspace.ab55.patch DELETED ---


--- workspace.cairo06.patch DELETED ---

More information about the fedora-extras-commits mailing list