rpms/openoffice.org/devel openoffice.org.spec,1.1766,1.1767

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#477435 my hatred of these stupid font macros now knows no bounds


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1766
retrieving revision 1.1767
diff -u -r1.1766 -r1.1767
--- openoffice.org.spec	19 Jan 2009 13:22:30 -0000	1.1766
+++ openoffice.org.spec	20 Jan 2009 10:00:07 -0000	1.1767
@@ -142,7 +142,7 @@
 %define sdkinstdir %{baseinstdir}/basis3.0/sdk
 %define oooinstdir %{instdir}/openoffice.org3
 %define brinstdir %{instdir}/broffice.org3
-%define fontname %{name}
+%define fontname opensymbol
 %define OFFICEUPD 300
 %define UPD %nil
 %define SOPOST l*
@@ -164,7 +164,7 @@
 %package core
 Summary: Core modules for %{name}
 Group: Applications/Productivity
-Requires: %{name}-fonts
+Requires: %{name}-%{fontname}-fonts
 Requires: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts
 Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: hunspell-en, hyphen-en
@@ -355,12 +355,12 @@
 The PDF Importer imports PDF into drawing documents to preserve layout
 and enable basic editing of PDF documents.
 
-%package fonts
+%package %{fontname}-fonts
 Summary: %{name} dingbats font
 Group: User Interface/X
 Requires: fontpackages-filesystem
 
-%description fonts
+%description %{fontname}-fonts
 A dingbats font, OpenSymbol, suitable for use by %{name} for bullets and
 mathematical symbols. 
 
@@ -909,7 +909,7 @@
 Summary: Italian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-it, hyphen-it
+Requires: hunspell-it, hyphen-it, mythes-it
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-it < 1:3.0.0
 
@@ -3238,7 +3238,7 @@
     # clear disk cache
     unopkg list --shared > /dev/null 2>&1 || :
 
-%_font_pkg opens___.ttf
+%_font_pkg -n %{fontname} opens___.ttf
 
 %files calc-core
 %defattr(-,root,root,-)
@@ -3828,9 +3828,12 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jan 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
+* Tue Jan 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#480362 add
   openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
+- add mythes-it
+- rhbz#477435 tweak to get font packaging macros to give a usable
+  package
 
 * Mon Jan 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add