From 71d4aad718e86c45a4f59a711dfab44c2e061ebecdaffdd9d11446cf4a64053e Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Thu, 17 Jan 2013 15:37:41 +0000 Subject: [PATCH] Version 1.1.2: * added support for the static/ directory used by the new stylesheets for HTML * re-enabled the new font-macros in spec-file (see commit from Mon Aug 6 15:53:53 UTC 2012 - pgajdos@suse.com) that got overwritten OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=107 --- daps-1.1.1.tar.bz2 | 3 --- daps-1.1.2.tar.bz2 | 3 +++ daps.changes | 11 +++++++++++ daps.spec | 41 +++++++++++++++++++++++------------------ 4 files changed, 37 insertions(+), 21 deletions(-) delete mode 100644 daps-1.1.1.tar.bz2 create mode 100644 daps-1.1.2.tar.bz2 diff --git a/daps-1.1.1.tar.bz2 b/daps-1.1.1.tar.bz2 deleted file mode 100644 index 7d33a05..0000000 --- a/daps-1.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dcc65704885cc69f8b723a3710e96fb8ebc40866d76a909631bb531efcbac5f -size 2674206 diff --git a/daps-1.1.2.tar.bz2 b/daps-1.1.2.tar.bz2 new file mode 100644 index 0000000..50a0aa7 --- /dev/null +++ b/daps-1.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f9ca9336b39c12c9f796a5dcbb9112514abc6b910b16ae2ae907c3fbe0d02c3 +size 2676668 diff --git a/daps.changes b/daps.changes index 1d544c6..3fd9185 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jan 17 15:21:28 UTC 2013 - fsundermeyer@opensuse.org + +Version 1.1.2: + +* added support for the static/ directory used by the new + stylesheets for HTML +* re-enabled the new font-macros in spec-file (see commit from + Mon Aug 6 15:53:53 UTC 2012 - pgajdos@suse.com) that got + overwritten + ------------------------------------------------------------------- Mon Jan 14 15:56:50 UTC 2013 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index e251de0..d70b484 100644 --- a/daps.spec +++ b/daps.spec @@ -17,12 +17,26 @@ Name: daps -Version: 1.1.1 +Version: 1.1.2 Release: 0 +############################################################### +# +# ATTENTION: Do NOT edit this file outside of +# https://svn.code.sf.net/p/daps/svn/trunk/daps/packaging/daps.spec +# +# Your changes will be lost on the next update +# If you do not have access to the SVN repository, notify +# and +# or send a patch +# +################################################################ +# +# Please submit bugfixes or comments via https://sourceforge.net/p/daps/tickets +# + %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 @@ -224,13 +238,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} -%if 0%{?suse_version} > 1220 %reconfigure_fonts_post -%else -if test -x sbin/conf.d/SuSEconfig.fonts -then %run_suseconfig -m fonts -fi -%endif exit 0 #---------------------- @@ -246,21 +254,19 @@ if [ -x /usr/bin/edit-xml-catalog ] ; then --del %{name} fi -%if 0%{?suse_version} > 1220 -%reconfigure_fonts_postun -%else -if test -x sbin/conf.d/SuSEconfig.fonts -then %run_suseconfig -m fonts -fi -%endif +%reconfigure_fonts_post fi exit 0 +#---------------------- +%posttrans +%reconfigure_fonts_posttrans + #---------------------- %files %defattr(-,root,root) -%dir %{fontdir} +%dir %{_ttfontsdir} %dir %{_sysconfdir}/%{name} %dir %{_defaultdocdir}/%{name} @@ -273,8 +279,7 @@ exit 0 %{_bindir}/* %{_datadir}/emacs/site-lisp/docbook_macros.el %{docbuilddir} -%{fontdir}/* - +%{_ttfontsdir}/* %exclude %{_defaultdocdir}/%{name}/INSTALL #----------------------