pool/daps
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 1.0beta1:

Browse Source 
* Rebuild large parts to make DAPS distribution-independent.
  - rewrote Makefile for automake/autoconf
    => configure; make; make install is now supported
  - thorough cross-distribution testing is still needed, basic tests
    have been run on RedHat, Debian and Ubuntu
* removal of custom stylesheets
  DAPS no longer uses the SUSE stylesheets as a default. It even no
  longer contains the SUSE stylesheets - they are now available as a
  separate package (suse-xsl-stylesheets in Documentation:Tools).
  - By default DAPS uses the generic DocBook stylesheets now
  - Custom stylesheets such as the SUSE stylesheets can be used by
    specifying up to four parameters on the command line/the config
    files:
    * Styleroot:
      Directory containing the custom stylesheets. Must have the same
      directory structure as the original DocBook stylesheet root
      directory. Does _not_ need to contain stylesheets for all output
      formats. If stylesheets are not found, DAPS will automatically
      fall back to the DocBook stylesheets.
      - Variable: STYLEROOT
      - Parameter: --styleroot
      - Value: absolute path to directory
    * Fallback styleroot
      Custom fallback styleroot. If DAPS cannot find styles for the
      given output format, it will automatically fall back to the
      DocBook stylesheets. This config option will add a custom
      fallback directory with higher priority. The DocBook stylesheets
      will remain as a last resort, however.
      - Variable: FALLBACK_STYLEROOT

OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=79
This commit is contained in:
Frank Sundermeyer 2012-03-08 11:17:04 +00:00 committed by Git OBS Bridge
parent d0f6f8dbbb
commit fc2e98f6b1
6 changed files with 192 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daps-0.9.2.tar.bz2
View File

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

3
daps-1.0beta1.tar.bz2 Normal file
View File

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

12
daps-fetch-source
View File

@ -9,7 +9,7 @@
# Frank Sundermeyer <fsundermeyer at opensuse dot org>
#
set -x
#set -x
NAME=daps
VERSION=
@ -47,7 +47,7 @@ fi
#
# Export daps from SVN
#
svn export $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed"
svn export -q $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed"
#
# Get the version number
@ -62,11 +62,13 @@ fi
# Create the tarball
#
export BZIP2=--best
tar cvjhf ${NAME}-${VERSION}.tar.bz2 -C ${TMPDIR} \
tar chf ${NAME}-${VERSION}.tar -C ${TMPDIR} \
--exclude-from=$EXCLUDES ${NAME} || exit_on_error "Failed to create the tarball."
tar rhf ${NAME}-${VERSION}.tar -C ${TMPDIR} ${NAME}/suse/xslt \
|| exit_on_error "Failed to add suse/xslt to the tarball."
bzip2 -9f ${NAME}-${VERSION}.tar
echo "Successfully created ${NAME}-${VERSION}.tar.bz2"
echo "Successfully wrote source tarball ${NAME}-${VERSION}.tar.bz2"
#
# Copy the spec file if necessary
#

121
daps.changes
View File

@ -1,3 +1,124 @@
-------------------------------------------------------------------
Wed Mar 7 15:54:22 UTC 2012 - fsundermeyer@opensuse.org
Version 1.0beta1:
* Rebuild large parts to make DAPS distribution-independent.
- rewrote Makefile for automake/autoconf
=> configure; make; make install is now supported
- thorough cross-distribution testing is still needed, basic tests
have been run on RedHat, Debian and Ubuntu
* removal of custom stylesheets
DAPS no longer uses the SUSE stylesheets as a default. It even no
longer contains the SUSE stylesheets - they are now available as a
separate package (suse-xsl-stylesheets in Documentation:Tools).
- By default DAPS uses the generic DocBook stylesheets now
- Custom stylesheets such as the SUSE stylesheets can be used by
specifying up to four parameters on the command line/the config
files:
* Styleroot:
Directory containing the custom stylesheets. Must have the same
directory structure as the original DocBook stylesheet root
directory. Does _not_ need to contain stylesheets for all output
formats. If stylesheets are not found, DAPS will automatically
fall back to the DocBook stylesheets.
- Variable: STYLEROOT
- Parameter: --styleroot
- Value: absolute path to directory
* Fallback styleroot
Custom fallback styleroot. If DAPS cannot find styles for the
given output format, it will automatically fall back to the
DocBook stylesheets. This config option will add a custom
fallback directory with higher priority. The DocBook stylesheets
will remain as a last resort, however.
- Variable: FALLBACK_STYLEROOT
- Parameter: --fb_styleroot
- Value: absolute path to directory
* CSS files:
Specify CSS files for HTML and/or CSS. By default no CSS file
will be used.
- Variables: HTML_CSS, EPUB_CSS
- Parameter: --css for html and epub targets
(daps -d <DC> html--css <CSS> )
- Value: absolute path to file
* rewrote FOP formatter handling - both supported formatters (FOP/XEP) are
now controlled by the following variables:
*_WRAPPER (wrapper script, libexec/daps-fop, libexec/daps-xep by default)
*_CONFIG (xml config file, etc/daps/xep/xep-daps.xml and
etc/daps/fop/fop-daps.xml by default. A specific fop-daps.xml
is installed for RedHat and SUSE by default)
*_OPTIONS (Command line options)
* renaming of parameters and variables
In order to make parameters and variables "self-speaking" the
following has been renamed:
- File ENV-file to DC-file (doc config file)
- Variable BASE_DIR to DOC_DIR (doc dir) => Terminology!
- Variable DTDROOT to DAPSROOT (daps installation directory)
- Variable FOP_TYPE to FORMATTER
- command line switch --fop to --formatter
- command line switch -e/--envfile has been renamed to
-d/--docconfig (-e/--envfile will still be supported)
* global parameter --base_dir no longer supported
Instead of specifying --base_dir with daps, you now need to specify a
full path (either relative or absolute) to the DC-file. However, the
"magic" that automatically tries to determine the path to a DC-file
when you do not specify a path or not even a DC file, still applies.
Therefore you only need to specify a valid path to the DC-file in
cases where you would have used --base_dir with previous DAPS
versions.
* --main parameter / MAIN
Instead of calling daps with -d/--docconfig you can also directly
specify a MAIN with --main=<PATH>. You need to specify a valid
relative or absolute path. If you just specify a
file name, ./xml/$MAIN is automatically assumed.
* packaging
The former DAPS version has been split into two packages:
- daps
- suse-xsl-stylesheets (SUSE stylesheets, NovDOC DTD, SUSE aspell
wordlist)
* other DAPS changes since 0.9.2 in brief:
- stylesheet images have been moved to fit the directory structure used
in the original stylesheets
- new variable STYLEDEVEL which can be used when developing stylesheets.
STYLEDEVEL _always_ takes precedence over STYLEROOT and can be set in
$USER_CONFIG
- Rewrote handling of profiling variables PROFARCH, PROFCONDITION,
PROFVENDOR, PROFOS - all 4 are now fully supported (formerly only
PROFOS and PROFARCH were fully supported)
- created catalog entry to resolve stylesheets in daps_xslt
- daps init has been moved to a separate script bin/daps-init
- each SUSE stylesheet file now contains a short overview of purpose
and parameters
- lots of stylesheet bugfixes
- license: GPL 2.0 or 3.0 at your choice
- fixed target man for man-page generation; man pages are not gzip'ed
by default (unless you specify --nogzip); manpage subdirectories
(man1, man2,...) are no longer created by default, but can rather be
enabled via the --subdirs switch
- new parameter --check for target epub checks build with epubcheck
- added very basic DocBook5 support (with xslt 1.0 stylesheets only)
still a lot to do on this front
- Default HTML format is now XHTML 1.0 (instead of HTML 4.01). Use
--html4 to generate HTML 4.01
- auto generate SUSE HTML4 stylesheets from XHTML stylesheets
- binaries that are only called from withion make have been moved to
libexec/
-------------------------------------------------------------------
Mon Jan 9 15:30:47 UTC 2012 - toms@suse.de

7
daps.rpmlintrc
View File

@ -1,5 +1,8 @@
addFilter("explicit-lib-dependency libxml2")
addFilter("explicit-lib-dependency libxslt")
addFilter("explicit-lib-dependency liberation-fonts")
#addFilter("non-executable-script .*/bin/create_dm_docu.py")
#addFilter("non-executable-script .*/bin/dm/test_dm.py")
addFilter("non-executable-script .*/bin/dm/test_dm.py")
# migration script for old susedoc projects, no man page needed
addFilter("no-manual-page-for-binary env_convert")
# internally used only, no man page needed
addFilter("no-manual-page-for-binary daps-xmlformat")

170
daps.spec
View File

@ -1,163 +1,151 @@
#
# spec file for package daps
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
# Copyright (c) 2012 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#
Name: daps
Version: 0.9.2
Version: 1.0beta1
Release: 0
%define dtdversion 1.0
%define dtdname novdoc
%define docbuilddir %{_datadir}/daps
%define regcat %{_bindir}/sgml-register-catalog
%define fontdir %{_datadir}/fonts/truetype
%define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current
%define root_catalog for-catalog-%{dtdname}-%{dtdversion}.xml
%define daps_catalog for-catalog-%{name}-%{version}.xml
%define daps_catalog for-catalog-%{name}.xml
Release: 1
Summary: DocBook Authoring and Publishing Suite
License: GPL-2.0 or GPL-3.0
Group: Productivity/Publishing/XML
URL: http://sourceforge.net/p/daps
Url: http://sourceforge.net/p/daps
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.rpmlintrc
Source2: %{name}-fetch-source
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: bash >= 4.0
BuildRequires: dia
BuildRequires: docbook_4
BuildRequires: docbook-xsl-stylesheets >= 1.75
BuildRequires: python-xml
BuildRequires: docbook_4
%if 0%{?suse_version} > 1140
BuildRequires: perl-Image-ExifTool
%else
BuildRequires: exiftool
%endif
%if 0%{?suse_version} >= 1220
BuildRequires: libxml2-tools
%endif
BuildRequires: ImageMagick
BuildRequires: fam
BuildRequires: fdupes
BuildRequires: ImageMagick
BuildRequires: inkscape
BuildRequires: libxslt
BuildRequires: openSUSE-release
BuildRequires: optipng
BuildRequires: python-xml
BuildRequires: sgml-skel
BuildRequires: suse-xsl-stylesheets
BuildRequires: svg-dtd
BuildRequires: trang
BuildRequires: transfig
BuildRequires: unzip
BuildRequires: xorg-x11-devel
# the following requirements are not really needed for building, but we add
# them nevertheless in order to see if the build target is able to fullfill
# the requirements for installation
BuildRequires: LinuxLibertine
BuildRequires: dejavu
BuildRequires: freefont
BuildRequires: ghostscript-library
BuildRequires: java
BuildRequires: liberation-fonts
BuildRequires: LinuxLibertine
BuildRequires: mplus-fonts
BuildRequires: opensp
BuildRequires: poppler-tools
BuildRequires: xalan-j2
BuildRequires: xml-commons-resolver
BuildRequires: xmlformat
BuildRequires: xmlstarlet
BuildRequires: zip
%if 0%{?suse_version} >= 1140
BuildRequires: perl-checkbot
BuildRequires: xmlgraphics-fop >= 0.94
%else
BuildRequires: fop >= 0.94
%if %{undefined sles_version}
BuildRequires: checkbot
%endif
BuildRequires: fop >= 0.94
BuildRequires: xerces-j2
%if 0%{?suse_version} == 1130
BuildRequires: xml-commons-jaxp-1.3-apis
%endif
%if 0%{?suse_version} < 1130
BuildRequires: xml-commons-apis-bootstrap
%endif
%endif
%if 0%{?suse_version} < 1120
BuildRequires: python-xml
%endif
PreReq: libxml2
PreReq: sgml-skel
Requires: ImageMagick
Requires: LinuxLibertine
Requires: bash >= 4.0
Requires: dejavu
Requires: dia
Requires: docbook_4
Requires: docbook-xsl-stylesheets >= 1.75
Requires: docbook_4
Requires: exiftool
Requires: fam
Requires: freefont
Requires: ghostscript-library
Requires: ImageMagick
Requires: inkscape
Requires: java
Requires: libxslt
Requires: liberation-fonts
Requires: LinuxLibertine
Requires: libxslt
Requires: make
Requires: mplus-fonts
Requires: opensp
Requires: optipng
Requires: poppler-tools
Requires: sgml-skel
Requires: svg-dtd
Requires: transfig
Requires: unzip
Requires: xalan-j2
Requires: xml-commons-resolver
Requires: xmlformat
Requires: xmlstarlet
Requires: zip
%if 0%{?suse_version} >= 1140
Requires: perl-checkbot
Requires: xmlgraphics-fop >= 0.94
%else
Requires: fop >= 0.94
%if %{undefined sles_version}
Requires: checkbot
Requires: checkbot
%else
Recommends: checkbot
%endif
Requires: fop >= 0.94
Requires: xerces-j2
%if 0%{?suse_version} == 1130
Requires: xml-commons-jaxp-1.3-apis
%endif
%if 0%{?suse_version} < 1130
Requires: xml-commons-apis-bootstrap
%endif
%endif
%if 0%{?suse_version} < 1120
BuildRequires: python-xml
Requires: python-xml
%endif
Recommends: agfa-fonts
Recommends: aspell aspell-en aspell-en-huge
Recommends: aspell aspell-en
# Only works only for openSUSE 11.4 and below
%if 0%{?suse_version} < 1210
Recommends: aspell-en-huge
%endif
Recommends: daps-docmanager
Recommends: docbook_5
Recommends: emacs psgml
Recommends: epubcheck
# Split of ttf-founder-simplified and ttf-founder-traditional
Recommends: FZFangSong FZHeiTi FZSongTi
Recommends: fifth-leg-font
Recommends: jing
Recommends: remake
# needed to create ePUBs
Recommends: ruby
# Japanese Fonts:
Recommends: sazanami-fonts
Recommends: suse-xsl-stxlesheets
# Chinese
Recommends: ttf-arphic
# Korean Fonts:
@ -168,7 +156,6 @@ Recommends: xep
#Obsoletes: susedoc <= 4.3.27
Provides: susedoc < 4.4
%description
DocBook Authoring and Publishing Suite (DAPS)
@ -193,51 +180,28 @@ for upgrade instructions.
#--------------------------------------------------------------------------
%build
# specifying VERSION is manadatory!!
%__make %{?_smp_mflags} VERSION=%{version}
%configure --docdir=%{_defaultdocdir}/%{name} --disable-edit-rootcatalog
%__make %{?_smp_mflags}
#--------------------------------------------------------------------------
%install
# specifying VERSION is manadatory!!
make install DESTDIR=$RPM_BUILD_ROOT VERSION=%{version}
# make_install macro does not have a DESTDIR in 11.1/SLE 11 !!
#%#make_install VERSION=%{version}
make install DESTDIR=$RPM_BUILD_ROOT
# create symlinks:
%fdupes -s $RPM_BUILD_ROOT/%{_datadir}
#----------------------
%post
# SGM CATALOG
#
if [ -x %{regcat} ]; then
for CATALOG in CATALOG.%{dtdname}-%{dtdversion}; do
%{regcat} -a %{_datadir}/sgml/$CATALOG >/dev/null 2>&1 || true
done
fi
# XML Catalog
# XML Catalog entries for daps profiling
#
# remove existing entries first (if existing) - needed for
# zypper in, since it does not call postun
#
# The first two ones are only there for campatibility reasons and
# can be removed in the future
#
# delete ...
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}-%{version}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}xslt-%{version}
#
# These two entries need to stay
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}-%{dtdversion}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{name}-%{version}
#
# now add new entries
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{root_catalog}
--del %{name}
# ... and add it again
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{daps_catalog}
@ -246,44 +210,24 @@ exit 0
#----------------------
%postun
if [ ! -f %{_sysconfdir}/xml/%{root_catalog} -a -x /usr/bin/edit-xml-catalog ] ; then
for c in CATALOG.%{dtdname}-%{dtdversion}; do
%{regcat} -r %{_datadir}/sgml/$c >/dev/null 2>&1
done
# XML Catalog
#
# The first two ones are only there for campatibility reasons and
# can be removed in the future
#
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}-%{version}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}xslt-%{version}
#
# These two entries need to stay
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}-%{dtdversion}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{name}-%{version}
# delete catalog entry for daps profiling
if [ -x /usr/bin/edit-xml-catalog ] ; then
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{name}
fi
%run_suseconfig_fonts
exit 0
#----------------------
%files
%defattr(-,root,root)
%dir %{fontdir}
%dir %{_sysconfdir}/%{name}
%dir %{_datadir}/xml/%{dtdname}
%dir %{_datadir}/xml/%{dtdname}/schema
%dir %{_datadir}/xml/%{dtdname}/schema/*
%dir %{_datadir}/xml/%{dtdname}/schema/*/1.0
%dir %{_defaultdocdir}/%{name}
%config /var/lib/sgml/CATALOG.*
%config %{_sysconfdir}/xml/*.xml
%config %{_sysconfdir}/%{name}/*
@ -291,12 +235,10 @@ exit 0
%doc %{_defaultdocdir}/%{name}/*
%{_bindir}/*
%{_datadir}/sgml/CATALOG.*
%{_datadir}/emacs/site-lisp/docbook_macros.el
%{fontdir}/*
%{docbuilddir}
%{_datadir}/xml/%{dtdname}/schema/dtd/%{dtdversion}/*
%{_datadir}/xml/%{dtdname}/schema/rng/%{dtdversion}/*
#----------------------
%changelog