[openoffice.org/f14/master] Resolves: rhbz#631727 missing (empty) samples dirs

[Caolan McNamara]

commit c780dcf53170cc71c1c3ac0ffa47bfcdd21a731a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 8 11:00:49 2010 +0100

    Resolves: rhbz#631727 missing (empty) samples dirs

 .gitignore          |    1 +
 openoffice.org.spec |   10 ++++++++--
 sources             |    1 +
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16e9adf..c9da060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 description.xml
 manifest.xml
 OOO330_m7.tar.bz2
+/redhat-langpacks.tar.gz
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 5f10954..e32ca76 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 7
-%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}
@@ -2921,10 +2921,13 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/share/registry/modules/org/openoffice/Setup/RegisterAndLicence.xcu
 %dir %{basisinstdir}/share/registry/res
 %{basisinstdir}/share/registry/res/fcfg_langpack_en-US.xcd
+%dir %{basisinstdir}/share/samples
+%{basisinstdir}/share/samples/en-US
 %dir %{basisinstdir}/share/template
 %{basisinstdir}/share/template/en-US
 %{basisinstdir}/share/template/wizard
-%{basisinstdir}/share/wordbook
+%dir %{basisinstdir}/share/wordbook
+%{basisinstdir}/share/wordbook/en-US
 %dir %{basisinstdir}/share/xslt
 %{basisinstdir}/share/xslt/common
 %dir %{basisinstdir}/share/xslt/export
@@ -3835,6 +3838,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Tue Sep 07 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-7.2
+- Resolves: rhbz#631727 missing (empty) samples dirs
+
 * Tue Sep 07 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-7.1
 - next milestone
 - drop integrated workspace.impress197.patch
diff --git a/sources b/sources
index 9c16dce..70d0299 100644
--- a/sources
+++ b/sources
@@ -17,3 +17,4 @@ f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 5d4db996b3fe3169bb3cc6af22aec605  description.xml
 22be99cb6dbf147543154099d3db0dfa  manifest.xml
 c2533a0542f91ebc5c010543a25ef1a3  OOO330_m7.tar.bz2
+0dd1d333fe555f9bec2ef4d623b69e7d  redhat-langpacks.tar.gz