Accepting request 130233 from Documentation:Tools

- prepare spec file for dropping SuSEconfig.fonts (openFATE#313536) (forwarded request 130128 from pgajdos)

OBS-URL: https://build.opensuse.org/request/show/130233
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/daps?expand=0&rev=4
This commit is contained in:
Ismail Dönmez 2012-08-07 19:49:20 +00:00 committed by Git OBS Bridge
commit c4c1a41ea4
2 changed files with 14 additions and 5 deletions

View File

@ -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 Thu May 3 20:24:49 UTC 2012 - fsundermeyer@opensuse.org

View File

@ -22,7 +22,6 @@ Release: 0
%define docbuilddir %{_datadir}/daps %define docbuilddir %{_datadir}/daps
%define regcat %{_bindir}/sgml-register-catalog %define regcat %{_bindir}/sgml-register-catalog
%define fontdir %{_datadir}/fonts/truetype
%define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current %define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current
%define daps_catalog for-catalog-%{name}.xml %define daps_catalog for-catalog-%{name}.xml
@ -66,6 +65,7 @@ BuildRequires: transfig
# the requirements for installation # the requirements for installation
BuildRequires: LinuxLibertine BuildRequires: LinuxLibertine
BuildRequires: dejavu BuildRequires: dejavu
BuildRequires: fontpackages-devel
BuildRequires: freefont BuildRequires: freefont
BuildRequires: ghostscript-library BuildRequires: ghostscript-library
BuildRequires: liberation-fonts 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 \ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{daps_catalog} --add /etc/xml/%{daps_catalog}
%run_suseconfig_fonts %reconfigure_fonts_post
exit 0 exit 0
#---------------------- #----------------------
@ -215,15 +215,19 @@ if [ -x /usr/bin/edit-xml-catalog ] ; then
--del %{name} --del %{name}
fi fi
%run_suseconfig_fonts %reconfigure_fonts_post
fi fi
exit 0 exit 0
#----------------------
%posttrans
%reconfigure_fonts_posttrans
#---------------------- #----------------------
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%dir %{fontdir} %dir %{_ttfontsdir}
%dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}
%dir %{_defaultdocdir}/%{name} %dir %{_defaultdocdir}/%{name}
@ -235,7 +239,7 @@ exit 0
%{_bindir}/* %{_bindir}/*
%{_datadir}/emacs/site-lisp/docbook_macros.el %{_datadir}/emacs/site-lisp/docbook_macros.el
%{fontdir}/* %{_ttfontsdir}/*
%{docbuilddir} %{docbuilddir}
%exclude %{_defaultdocdir}/%{name}/INSTALL %exclude %{_defaultdocdir}/%{name}/INSTALL