/[packages]/cauldron/libreoffice/current/SPECS/libreoffice.spec
ViewVC logotype

Diff of /cauldron/libreoffice/current/SPECS/libreoffice.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 82063 by tv, Fri Apr 8 06:28:17 2011 UTC revision 82064 by dmorgan, Fri Apr 8 07:14:52 2011 UTC
# Line 181  Patch40: 0001-Related-rhbz-680460-don-t- Line 181  Patch40: 0001-Related-rhbz-680460-don-t-
181  Patch41: 0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch  Patch41: 0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch
182  Patch42: 0001-Cut-Gordian-Knot-of-who-owns-the-font-options.patch  Patch42: 0001-Cut-Gordian-Knot-of-who-owns-the-font-options.patch
183  Patch43: 0001-beware-of-invalidated-iterator.patch  Patch43: 0001-beware-of-invalidated-iterator.patch
184    Patch44: rhbz680766.fix-mdds-crash.patch
185    Patch45: mdds.add-missing-link.patch
186    Patch46: mdds.do-not-insert-new-node.patch
187    
188  # Mageia patches  # Mageia patches
189  Patch100: libreoffice-fix-string.patch  Patch100: libreoffice-fix-string.patch
# Line 230  Obsoletes: openoffice.org-help-en_US < 1 Line 233  Obsoletes: openoffice.org-help-en_US < 1
233  Provides:  openoffice.org-help-en_US =   1:%version-%release  Provides:  openoffice.org-help-en_US =   1:%version-%release
234  Obsoletes: openoffice.org-help-en_GB < 1:3.3.1  Obsoletes: openoffice.org-help-en_GB < 1:3.3.1
235  Provides:  openoffice.org-help-en_GB =   1:%version-%release  Provides:  openoffice.org-help-en_GB =   1:%version-%release
236    Provides:  libreoffice-style-tango = %{version}-%{release}
237    Provides:  libreoffice-style-oxygen = %{version}-%{release}
238  %description core  %description core
239  The shared core libraries and support files for LibreOffice.  The shared core libraries and support files for LibreOffice.
240    
# Line 864  mv -f redhat.soc extras/source/palettes/ Line 868  mv -f redhat.soc extras/source/palettes/
868  #%patch41 -p1 -b .rhbz680460-honour-lcdfilter-subpixeling-et.patch  #%patch41 -p1 -b .rhbz680460-honour-lcdfilter-subpixeling-et.patch
869  #%patch42 -p1 -b .Cut-Gordian-Knot-of-who-owns-the-font-options.patch  #%patch42 -p1 -b .Cut-Gordian-Knot-of-who-owns-the-font-options.patch
870  %patch43 -p1 -b .beware-of-invalidated-iterator.patch  %patch43 -p1 -b .beware-of-invalidated-iterator.patch
871    %patch44 -p1 -b .rhbz680766.fix-mdds-crash.patch
872    
873  %patch100 -p0  %patch100 -p0
874  touch scripting/source/pyprov/delzip  touch scripting/source/pyprov/delzip
875  touch scripting/util/provider/beanshell/delzip  touch scripting/util/provider/beanshell/delzip
876  touch scripting/util/provider/javascript/delzip  touch scripting/util/provider/javascript/delzip
877    
878    cp %{PATCH45} mdds
879    cp %{PATCH46} mdds
880    
881  %build  %build
882  echo build start time is `date`, diskspace: `df -h . | tail -n 1`  echo build start time is `date`, diskspace: `df -h . | tail -n 1`
883  #don't build localized helps which are poorly translated  #don't build localized helps which are poorly translated

Legend:
Removed from v.82063  
changed lines
  Added in v.82064

  ViewVC Help
Powered by ViewVC 1.1.30