Accepting request 148938 from Documentation:Tools

Another update to version 1.1.2.

OBS-URL: https://build.opensuse.org/request/show/148938
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/daps?expand=0&rev=6
This commit is contained in:
Stephan Kulow 2013-01-21 16:35:41 +00:00 committed by Git OBS Bridge
commit 5204470bd8
4 changed files with 51 additions and 28 deletions

3
daps-1.1.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:506005cbc22eab106a59302c98f017c9199d4dc752571a13c64a92a9b1171aa5
size 2590393

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e03fca5e0929c3b808be2829826d847326681f84772f4370fc0e2819a2701f8a
size 2571809

View File

@ -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 Fri Dec 21 10:03:32 UTC 2012 - fsundermeyer@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package daps # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,12 +17,26 @@
Name: daps Name: daps
Version: 1.1 Version: 1.1.2
Release: 0 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
# <fsundermeyer@opensuse.org> and <toms@opensuse.org>
# or send a patch
#
################################################################
#
# Please submit bugfixes or comments via https://sourceforge.net/p/daps/tickets
#
%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
@ -71,17 +85,16 @@ BuildRequires: fop >= 0.94
#--- #---
# Fontstuff # Fontstuff
# #
%if 0%{?suse_version} > 1220
BuildRequires: dejavu-fonts
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
BuildRequires: gnu-free-fonts
BuildRequires: liberation-fonts BuildRequires: liberation-fonts
BuildRequires: mplus-fonts BuildRequires: mplus-fonts
%if 0%{?suse_version} > 1220
BuildRequires: dejavu-fonts
BuildRequires: gnu-free-fonts
%else %else
BuildRequires: dejavu BuildRequires: dejavu
BuildRequires: freefont BuildRequires: freefont
BuildRequires: liberation-fonts
BuildRequires: mplus-fonts
%endif %endif
# #
@ -173,7 +186,6 @@ Recommends: unfonts
%endif %endif
Obsoletes: susedoc Obsoletes: susedoc
Provides: susedoc
%description %description
DocBook Authoring and Publishing Suite (DAPS) 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 \ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{daps_catalog} --add /etc/xml/%{daps_catalog}
%if 0%{?suse_version} > 1220
%reconfigure_fonts_post %reconfigure_fonts_post
%else
if test -x sbin/conf.d/SuSEconfig.fonts
then %run_suseconfig -m fonts
fi
%endif
exit 0 exit 0
#---------------------- #----------------------
@ -246,21 +252,19 @@ if [ -x /usr/bin/edit-xml-catalog ] ; then
--del %{name} --del %{name}
fi fi
%if 0%{?suse_version} > 1220 %reconfigure_fonts_post
%reconfigure_fonts_postun
%else
if test -x sbin/conf.d/SuSEconfig.fonts
then %run_suseconfig -m fonts
fi
%endif
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}
@ -273,8 +277,7 @@ exit 0
%{_bindir}/* %{_bindir}/*
%{_datadir}/emacs/site-lisp/docbook_macros.el %{_datadir}/emacs/site-lisp/docbook_macros.el
%{docbuilddir} %{docbuilddir}
%{fontdir}/* %{_ttfontsdir}/*
%exclude %{_defaultdocdir}/%{name}/INSTALL %exclude %{_defaultdocdir}/%{name}/INSTALL
#---------------------- #----------------------