rpms/openoffice.org/devel .cvsignore, 1.253, 1.254 openoffice.org.spec, 1.2277, 1.2278 sources, 1.405, 1.406

Caolan McNamara caolanm at fedoraproject.org
Tue Jul 13 13:17:20 UTC 2010


Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
some x86 specific foo


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- .cvsignore	13 Jul 2010 10:25:51 -0000	1.253
+++ .cvsignore	13 Jul 2010 13:17:19 -0000	1.254
@@ -13,3 +13,5 @@ ada24d37d8d638b3d8a9985e80bc2978-source-
 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
+18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2277
retrieving revision 1.2278
diff -u -p -r1.2277 -r1.2278
--- openoffice.org.spec	13 Jul 2010 12:52:46 -0000	1.2277
+++ openoffice.org.spec	13 Jul 2010 13:17:19 -0000	1.2278
@@ -17,9 +17,9 @@
 %endif
 
 %if %{stlport_abi_lockin}
-%define stlflags --with-stlport
+%define stlflags --with-stlport --without-system-cppunit
 %else
-%define stlflags --without-stlport
+%define stlflags --without-stlport --with-system-cppunit
 %endif
 
 %if %{langpacks}
@@ -56,6 +56,8 @@ Source13:       http://hg.services.openo
 Source14:       http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 Source15:       http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 Source16:       http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+Source17:       http://hg.services.openoffice.org/binaries/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
+Source18:       http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 
 BuildRequires:  zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
 BuildRequires:  binutils, java-devel, boost-devel, zlib-devel, vigra-devel
 BuildRequires:  python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -1685,6 +1687,8 @@ cp %{SOURCE13} ext_sources
 cp %{SOURCE14} ext_sources
 cp %{SOURCE15} ext_sources
 cp %{SOURCE16} ext_sources
+cp %{SOURCE17} ext_sources
+cp %{SOURCE18} ext_sources
 
 ./bootstrap
 source ./Linux*Env.Set.sh


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- sources	13 Jul 2010 10:25:22 -0000	1.405
+++ sources	13 Jul 2010 13:17:20 -0000	1.406
@@ -14,3 +14,5 @@ f0cda31fe18bf9289629a321663031b8  redhat
 20613b42d66eadc11c719374355f745c  redhat-langpacks.tar.gz
 99bf42c02028cdaf6628356ca982bc65  redhat-registry.tar.gz
 9696917af45aaad3693a2a5b1a840e5c  OOO330_m0.tar.bz2
+bd30e9cf5523cdfc019b94f5e1d7fd19  bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
+18f577b374d60b3c760a3a3350407632  18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz



More information about the scm-commits mailing list