diff --git a/daps.changes b/daps.changes index babd302..5c951c3 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 6 15:53:53 UTC 2012 - pgajdos@suse.com + +- prepare spec file for dropping SuSEconfig.fonts (openFATE#313536) + ------------------------------------------------------------------- Thu May 3 20:24:49 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 369b62a..fc0ebb4 100644 --- a/daps.spec +++ b/daps.spec @@ -22,7 +22,6 @@ Release: 0 %define docbuilddir %{_datadir}/daps %define regcat %{_bindir}/sgml-register-catalog -%define fontdir %{_datadir}/fonts/truetype %define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current %define daps_catalog for-catalog-%{name}.xml @@ -66,6 +65,7 @@ BuildRequires: transfig # the requirements for installation BuildRequires: LinuxLibertine BuildRequires: dejavu +BuildRequires: fontpackages-devel BuildRequires: freefont BuildRequires: ghostscript-library BuildRequires: liberation-fonts @@ -199,7 +199,7 @@ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{daps_catalog} -%run_suseconfig_fonts +%reconfigure_fonts_post exit 0 #---------------------- @@ -215,15 +215,19 @@ if [ -x /usr/bin/edit-xml-catalog ] ; then --del %{name} fi -%run_suseconfig_fonts +%reconfigure_fonts_post fi exit 0 +#---------------------- +%posttrans +%reconfigure_fonts_posttrans + #---------------------- %files %defattr(-,root,root) -%dir %{fontdir} +%dir %{_ttfontsdir} %dir %{_sysconfdir}/%{name} %dir %{_defaultdocdir}/%{name} @@ -235,7 +239,7 @@ exit 0 %{_bindir}/* %{_datadir}/emacs/site-lisp/docbook_macros.el -%{fontdir}/* +%{_ttfontsdir}/* %{docbuilddir} %exclude %{_defaultdocdir}/%{name}/INSTALL