rpms/openoffice.org/devel openoffice.org.spec,1.1735,1.1736

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25951

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#477435 package opensymbol in a rpm of its own


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1735
retrieving revision 1.1736
diff -u -r1.1735 -r1.1736
--- openoffice.org.spec	22 Dec 2008 16:16:00 -0000	1.1735
+++ openoffice.org.spec	22 Dec 2008 16:50:41 -0000	1.1736
@@ -65,7 +65,7 @@
 BuildRequires:	lpsolve-devel, saxon, hsqldb, bsh, lucene, lucene-contrib
 BuildRequires:  mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp
 BuildRequires:  jakarta-commons-codec, jakarta-commons-httpclient
-BuildRequires:  jakarta-commons-lang, poppler-devel
+BuildRequires:  jakarta-commons-lang, poppler-devel, fontpackages-devel
 BuildRequires:  pentaho-reporting-flow-engine, libXinerama-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
@@ -161,7 +161,7 @@
 %package core
 Summary: Core modules for %{name}
 Group: Applications/Productivity
-Requires: liberation-fonts >= 1.00
+Requires: %{name}-fonts, liberation-fonts >= 1.00
 Requires: dejavu-fonts-sans, dejavu-fonts-serif, dejavu-fonts-sans-mono
 Requires: hunspell-en, hyphen-en
 Requires: saxon, lucene
@@ -351,6 +351,15 @@
 The PDF Importer imports PDF into drawing documents to preserve layout
 and enable basic editing of PDF documents.
 
+%package fonts
+Summary: %{name} dingbats font
+Group: User Interface/X
+Requires: fontpackages-filesystem
+
+%description fonts
+A dingbats font, OpenSymbol, suitable for use by %{name} for bullets and
+mathematical symbols. 
+
 %package writer-core
 Summary: Word Processor libraries for %{name}
 Group: Applications/Productivity
@@ -1908,6 +1917,13 @@
 mv -f $RPM_BUILD_ROOT/%{basisinstdir}/program/unohelper.py* .
 popd
 
+# rhbz#477435 package opensymbol separately
+pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/fonts/truetype
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+popd
+rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/fonts
+
 #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs 
 #have snuck through
 pic=0
@@ -2488,7 +2504,6 @@
 %{basisinstdir}/share/config/wizard
 %dir %{basisinstdir}/share/dtd
 %{basisinstdir}/share/dtd/officedocument
-%{basisinstdir}/share/fonts
 %{basisinstdir}/share/gallery
 %{basisinstdir}/share/psprint
 %dir %{basisinstdir}/share/registry
@@ -3210,6 +3225,8 @@
     # clear disk cache
     unopkg list --shared > /dev/null 2>&1 || :
 
+%_font_pkg -n fonts -f opens___.ttf
+
 %files calc-core
 %defattr(-,root,root,-)
 %dir %{basisinstdir}
@@ -3802,6 +3819,7 @@
 - Workaround: rhbz#477174 recover metacity workarounds without hanging in
   gdk_x11_get_server_time
 - add hyphen-bg
+- Resolves: rhbz#477435 package opensymbol in a rpm of its own
 
 * Sat Dec 19 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-14.1
 - next milestone