rpms/openoffice.org/devel openoffice.org.spec,1.2291,1.2292

Caolan McNamara caolanm at fedoraproject.org
Sat Jul 17 15:58:19 UTC 2010


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2773

Modified Files:
	openoffice.org.spec 
Log Message:
enable silgraphite support


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2291
retrieving revision 1.2292
diff -u -p -r1.2291 -r1.2292
--- openoffice.org.spec	16 Jul 2010 17:30:12 -0000	1.2291
+++ openoffice.org.spec	17 Jul 2010 15:58:19 -0000	1.2292
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 1
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -73,6 +73,7 @@ BuildRequires:  mesa-libGLU-devel, redla
 BuildRequires:  jakarta-commons-codec, jakarta-commons-httpclient, cppunit-devel
 BuildRequires:  jakarta-commons-lang, poppler-devel, fontpackages-devel, junit4
 BuildRequires:  pentaho-reporting-flow-engine, libXinerama-devel, mythes-devel
+BuildRequires:  silgraphite-devel
 
 Patch1:  openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
 Patch2:  openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
@@ -1670,8 +1671,7 @@ autoconf
  --with-external-dict-dir=/usr/share/myspell --without-myspell-dicts \
  --without-fonts --without-agg --without-ppds  --without-afms %{stlflags} \
  --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" \
- --with-external-tar=`pwd`/ext_sources \
- --disable-graphite # for now
+ --with-external-tar=`pwd`/ext_sources
 
 mkdir -p ext_sources
 cp %{SOURCE11} ext_sources
@@ -3795,6 +3795,9 @@ unopkg remove --shared org.openoffice.le
 %endif
 
 %changelog
+* Sat Jul 17 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-1.2
+- enable silgraphite support
+
 * Fri Jul 16 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-1.1
 - next milestone
 - drop integrated workspace.native317.patch



More information about the scm-commits mailing list