rpms/openoffice.org/devel .cvsignore, 1.94, 1.95 openoffice.org.spec, 1.612, 1.613 sources, 1.150, 1.151

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2746

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
rh#177205# add some templates, including a fedora themed presentation


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- .cvsignore	15 Dec 2005 14:00:48 -0000	1.94
+++ .cvsignore	31 Jan 2006 10:15:00 -0000	1.95
@@ -153,3 +153,6 @@
 SRC680_m145.tar.bz2
 evolocal.odb
 OOA680_m1.tar.bz2
+documentation.openoffice.org-templates.tar.gz
+redhat-templates.tar.gz
+Tigert-templates.tar.gz


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -r1.612 -r1.613
--- openoffice.org.spec	30 Jan 2006 15:01:18 -0000	1.612
+++ openoffice.org.spec	31 Jan 2006 10:15:00 -0000	1.613
@@ -135,6 +135,9 @@
 Source6:	GSI_ga.sdf
 Source7:	gcj-sed.sh
 Source8:	evolocal.odb
+Source9:        Tigert-templates.tar.gz
+Source10:       documentation.openoffice.org-templates.tar.gz
+Source11:       redhat-templates.tar.gz
 BuildRequires: 	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils
 BuildRequires: 	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires: 	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -237,8 +240,6 @@
 
 The OpenOffice.org team hopes you enjoy working with OpenOffice.org!
 
-Note: Non-.vor templates covered under the GPL license.
-
 %package core
 Summary: core modules for %{name}
 Group: Applications/Productivity
@@ -1098,6 +1099,11 @@
 done
 popd
 
+#add in some templates
+tar xzf %{SOURCE9} -C $RPM_BUILD_ROOT/%{instdir}/share
+tar xzf %{SOURCE10} -C $RPM_BUILD_ROOT/%{instdir}/share
+tar xzf %{SOURCE11} -C $RPM_BUILD_ROOT/%{instdir}/share
+
 #skip the swahelli for now
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*sw_TZ*
 
@@ -3382,7 +3388,7 @@
 - missing %defattr(-,root,root)
 - rh#179256# if java fails (i.e. was configured to use libgcj.so.6) reconfigure
   to pick up libgcj.so.7
-
+- rh#177205# add some templates, including a fedora themed presentation
 
 * Thu Jan 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-8
 - rh#178971# defer exec mem until bridge code


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- sources	17 Jan 2006 11:44:22 -0000	1.150
+++ sources	31 Jan 2006 10:15:00 -0000	1.151
@@ -7,3 +7,6 @@
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
 374c6a2d4d846acf171d0fd212d4d7af  OOA680_m1.tar.bz2
 9296ac8fa8e4f85cfdacfdaeeac6547f  openoffice.org-myspell-contrib.tar.gz
+b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
+8bc013e30e432ce3927e402e9aaa8c9f  redhat-templates.tar.gz
+1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz