diff --git a/daps-1.1.2.tar.bz2 b/daps-1.1.2.tar.bz2 new file mode 100644 index 0000000..8edb2cf --- /dev/null +++ b/daps-1.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:506005cbc22eab106a59302c98f017c9199d4dc752571a13c64a92a9b1171aa5 +size 2590393 diff --git a/daps-1.1.tar.bz2 b/daps-1.1.tar.bz2 deleted file mode 100644 index f93b3f8..0000000 --- a/daps-1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e03fca5e0929c3b808be2829826d847326681f84772f4370fc0e2819a2701f8a -size 2571809 diff --git a/daps.changes b/daps.changes index d2bdb59..3fd9185 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +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 + +Version 1.1.1 (Bugfix Release): + +* fix for ticket #113 (daps-xslt/mallard/docbook.xsl missing) +* fix for ticket #114 (package-html with easy file names wanted) +* settings for BUILD_DIR in config files were ignored + ------------------------------------------------------------------- Fri Dec 21 10:03:32 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 572a574..9c8f729 100644 --- a/daps.spec +++ b/daps.spec @@ -1,7 +1,7 @@ # # spec file for package daps # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,26 @@ Name: daps -Version: 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 @@ -71,17 +85,16 @@ BuildRequires: fop >= 0.94 #--- # Fontstuff # -%if 0%{?suse_version} > 1220 -BuildRequires: dejavu-fonts BuildRequires: fontpackages-devel -BuildRequires: gnu-free-fonts BuildRequires: liberation-fonts BuildRequires: mplus-fonts + +%if 0%{?suse_version} > 1220 +BuildRequires: dejavu-fonts +BuildRequires: gnu-free-fonts %else BuildRequires: dejavu BuildRequires: freefont -BuildRequires: liberation-fonts -BuildRequires: mplus-fonts %endif # @@ -173,7 +186,6 @@ Recommends: unfonts %endif Obsoletes: susedoc -Provides: susedoc %description DocBook Authoring and Publishing Suite (DAPS) @@ -224,13 +236,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 +252,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 +277,7 @@ exit 0 %{_bindir}/* %{_datadir}/emacs/site-lisp/docbook_macros.el %{docbuilddir} -%{fontdir}/* - +%{_ttfontsdir}/* %exclude %{_defaultdocdir}/%{name}/INSTALL #----------------------