SPECS: openoffice.org.spec - unify font package naming
glen
glen at pld-linux.org
Sun Jan 7 14:43:07 CET 2007
Author: glen Date: Sun Jan 7 13:43:07 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unify font package naming
---- Files affected:
SPECS:
openoffice.org.spec (1.679 -> 1.680)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.679 SPECS/openoffice.org.spec:1.680
--- SPECS/openoffice.org.spec:1.679 Sun Jan 7 11:13:42 2007
+++ SPECS/openoffice.org.spec Sun Jan 7 14:43:02 2007
@@ -221,7 +221,6 @@
Requires: %{name}-calc = %{epoch}:%{version}-%{release}
Requires: %{name}-draw = %{epoch}:%{version}-%{release}
Requires: %{name}-emailmerge = %{epoch}:%{version}-%{release}
-Requires: %{name}-fonts-OpenSymbol = %{epoch}:%{version}-%{release}
Requires: %{name}-graphicfilter = %{epoch}:%{version}-%{release}
Requires: %{name}-impress = %{epoch}:%{version}-%{release}
Requires: %{name}-javafilter = %{epoch}:%{version}-%{release}
@@ -230,6 +229,7 @@
Requires: %{name}-testtools = %{epoch}:%{version}-%{release}
Requires: %{name}-writer = %{epoch}:%{version}-%{release}
Requires: %{name}-xsltfilter = %{epoch}:%{version}-%{release}
+Requires: fonts-TTF-OpenSymbol = %{epoch}:%{version}-%{release}
ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -431,12 +431,13 @@
%description testtools
QA tools for OpenOffice.org, enables automated testing.
-%package fonts-OpenSymbol
+%package -n fonts-TTF-OpenSymbol
Summary: OpenSymbol fonts
Group: Fonts
Requires(post,postun): fontpostinst
+Obsoletes: openoffice.org-fonts-OpenSymbol
-%description fonts-OpenSymbol
+%description -n fonts-TTF-OpenSymbol
OpenSymbol fonts.
%package i18n-af
@@ -2325,10 +2326,10 @@
[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
[ ! -x /usr/bin/update-mime-database ] || /usr/bin/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
-%post fonts-OpenSymbol
+%post -n fonts-TTF-OpenSymbol
fontpostinst TTF
-%postun fonts-OpenSymbol
+%postun -n fonts-TTF-OpenSymbol
fontpostinst TTF
%files
@@ -3148,7 +3149,7 @@
%attr(755,root,root) %{_libdir}/%{name}/program/libuno_sal.so
%attr(755,root,root) %{_libdir}/%{name}/program/libuno_salhelpergcc3.so
-%files fonts-OpenSymbol
+%files -n fonts-TTF-OpenSymbol
%defattr(644,root,root,755)
%{_fontsdir}/TTF/*.ttf
@@ -3683,6 +3684,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.680 2007/01/07 13:43:02 glen
+- unify font package naming
+
Revision 1.679 2007/01/07 10:13:42 sls
- created subpackage -fonts-OpenSymbol
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.679&r2=1.680&f=u
More information about the pld-cvs-commit
mailing list