Hello community,

here is the log from the commit of package daps.1662 for openSUSE:12.3:Update 
checked in at 2013-05-14 17:06:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/daps.1662 (Old)
 and      /work/SRC/openSUSE:12.3:Update/.daps.1662.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "daps.1662"

Changes:
--------
New Changes file:

--- /dev/null   2013-05-09 10:40:33.472011256 +0200
+++ /work/SRC/openSUSE:12.3:Update/.daps.1662.new/daps.changes  2013-05-14 
17:06:38.000000000 +0200
@@ -0,0 +1,1060 @@
+-------------------------------------------------------------------
+Mon May  6 11:28:00 UTC 2013 - [email protected]
+
+- Bugfix: Typo in Varaiable name
+- Created bnc #818744 requesting an online update
+
+-------------------------------------------------------------------
+Fri May  3 21:30:12 UTC 2013 - [email protected]
+
+- Removed one unnecessary make info output which may produce
+  irritating messages 
+
+-------------------------------------------------------------------
+Thu May  2 15:06:22 UTC 2013 - [email protected]
+
+Version 1.1.6 (Bugfix release):
+ * General:
+   - reducing code by adding MAIN to the list of DOCFILES, by
+       generating the list of ENTITY files globally and by
+       using HTML_DIR for HTML. HTML-SINGLE and JSP
+ * EPUB:
+   - fixed critical error: a single tmp dir was used to generate
+     different EPUB books
+   - EPUB zip file is now generated from a file list extracted from
+     OEBPS/content.opf. This ensures that only files referenced
+     in the content.opf are packaged
+   - Added fix for bug in DocBook stylesheets which generates an
+     empty date entry in content.opf which causes a validation error
+   - Improved CSS handling:
+     - if no CSS file is specified on the command line or in the
+       DC-file, the _first_ one found in <STYLEDIR>/epub/ is
+       automatically used
+     - --css now requires a parameter - if you do not want any CSS
+       file to be used, specify "none": --css=none
+   - EPUBs now validate with epubcheck 3.0
+ * HTML:
+   - if using the DocBook standard layout for resources
+     <STYLEDIR>/images
+     <STYLEDIR>/<FOO>.css
+     it is no longer manfdatory to specify a CSS file on the
+     command line or in the DC-file. DAPS will automatically use the
+     _first_ *.css file in <STYLDIR>/ if none is specified
+   - if using a static dir for resources
+      <STYLEDIR>/static
+                   |-css
+                   |-js
+                   |-images
+      you can now specify an alternative css file with --css or an
+      alternative static dir with --statdir
+    - this makes it possible to switch between stylsheets using the
+      two different resource directory approaches without having to
+      modify a DC-file
+    - the --css parameter now requires an argument. If you want to
+      use no stylesheet at all, specify --css=none
+    NOTE: This update requires to run the first HTML, HTML-Single
+          and JSP build after the update with the --clean switch in
+          order to create a clean result directory.
+    - if both variants (<STYLEDIR>/images and <STYLEDIR>/static
+      exist, the static directory is automatically used
+ * LOCDROP:
+   - DC-files are delivered with a locdrop if --def-file is
+     specified
+   - NO_TRANS_FILES was not correctly computed
+   - entity files were missing in packages
+ * PACKAGE-SRC:
+   - entity files were missing in packages
+ * ONLINE-DOCS:
+   - generating a uniquely named graphics tarball for each book
+     (when export-dir is set) instead of one that gets overwritten
+     with each build
+ 
+
+-------------------------------------------------------------------
+Tue Mar 26 07:46:45 UTC 2013 - [email protected]
+
+- Fixed bnc#811376
+
+-------------------------------------------------------------------
+Mon Mar 25 09:28:54 UTC 2013 - [email protected]
+
+ * fix for EPUB validation bug (EPUB Mime-Type file ended with 
+   a newline which caused a validation error)
+   
+-------------------------------------------------------------------
+Fri Mar 22 15:13:47 UTC 2013 - [email protected]
+
+ * spec-file update: Version 1.77 or better of the Docook
+   stylesheets is required 
+
+-------------------------------------------------------------------
+Fri Mar 22 13:50:03 UTC 2013 - [email protected]
+
+Version 1.1.5 (Bugfix release)
+
+ * fixed errors in EPUB generation (wrong paths in content.opf)
+   EPUBs should now be viewable in all ePUB viewers
+ * fixed two errors in target locdrop: no proper image tarball was
+   generated and the notrans-tarball had a wrong path 
+ * added a missing conditional requirement (on $IMG_DIRECTORIES)
+   for image building
+ * fixed errors when building dist-{html,htmlsingle,jsp}
+
+-------------------------------------------------------------------
+Fri Mar 22 09:22:01 UTC 2013 - [email protected]
+
+- Added url as source.
+  Please see http://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
+Wed Feb 13 14:37:26 UTC 2013 - [email protected]
+
+Version 1.1.4 (Bugfix Release):
+
+ * Fixed target productinfo, which did not produce any output when
+   ROOTID was not set
+
+-------------------------------------------------------------------
+Tue Feb  5 13:38:37 UTC 2013 - [email protected]
+
+ Version 1.1.3 (Bugfix Release):
+
+ * Added missing dependecies for Desktop/Document/Pagefile option
+   (fix for ticket #122 package-pdf: --documentfiles fails with
+   clean sources)
+ * Added switch "xsltparam" for package-pdf and package-html
+   (fix for ticket #121 package-pdf: --xsltparam missing)
+
+-------------------------------------------------------------------
+Thu Jan 17 15:21:28 UTC 2013 - [email protected]
+
+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 - [email protected]) that got
+  overwritten
+
+-------------------------------------------------------------------
+Mon Jan 14 15:56:50 UTC 2013 - [email protected]
+
+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 - [email protected]
+
+Version 1.1:
+
+daps-auto.pl:
+  * a perl script to automatically build documents and deploy them
+    to a remote machine via rsync
+
+EPUB:
+  * completely rewrote the epub generating code
+  * no longer needs an external script (db2epub.ruby) for
+    epub-file generation - now everything is handled in
+    make itself
+
+HTML/HTML-Single/JSP:
+  * added a --clean switch which clears the directory
+    before generating a new version
+
+Packaging:
+  * completely rewrote the code for package-src
+    - new option --set-date allows to set a publication date
+      (default: current date)
+  * new options for package-html and package-pdf
+    --desktopfiles: generates an archive with desktopfiles for KDE3
+    --documentfiles: generates a documnet file for KDE4/GNOME2
+    --pagefiles: generates a page file for GNOME3
+  * completely rewrote online-docs
+    - now automatically generates epub, color-pdf and single-html archive
+    - new option --export-dir to specify a results directory
+  * completely rewrote locdrop
+    - new option --export-dir to specify a results directory
+
+Spellchecking:
+  * no longer a stand-alone program
+  * use "daps -d DC-file spellcheck" to check single files 
+    (--file option), complete documents (via DC-file) or
+    parts of a document (vi ROOTID)
+  * can be configured via config variables ASPELL_* 
+
+Emacs macros for DocBook:
+  * Now supports nxml-mode
+
+Documentation:
+  * User Guide: significant additions
+
+Misc:
+  * Added a --manifest option to dist-html which adds a manifest
+    files containing the html-files in the same order as in the
+    document
++++ 863 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.3:Update/.daps.1662.new/daps.changes

New:
----
  daps-1.1.6.tar.bz2
  daps-fetch-source
  daps.changes
  daps.rpmlintrc
  daps.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ daps.spec ++++++
#
# spec file for package daps
#
# 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
# 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:        1.1.6
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
#  <[email protected]> and <[email protected]>
#  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 dbstyles       %{_datadir}/xml/docbook/stylesheet/nwalsh/current
%define daps_catalog   for-catalog-%{name}.xml

Summary:        DocBook Authoring and Publishing Suite
License:        GPL-2.0 or GPL-3.0
Group:          Productivity/Publishing/XML
Url:            http://sourceforge.net/p/daps
Source0:        
http://downloads.sourceforge.net/project/daps/%{name}-%{version}.tar.bz2
Source1:        %{name}.rpmlintrc
Source2:        %{name}-fetch-source
BuildRoot:      %{_tmppath}/%{name}-%{version}-build

BuildArch:      noarch

BuildRequires:  ImageMagick
BuildRequires:  bash >= 3.1
BuildRequires:  dia
BuildRequires:  docbook-xsl-stylesheets >= 1.77
BuildRequires:  docbook_4
BuildRequires:  fam
BuildRequires:  fdupes
BuildRequires:  ghostscript-library
BuildRequires:  inkscape
%if 0%{?suse_version} >= 1220
BuildRequires:  libxml2-tools
%endif
BuildRequires:  libxslt
#%%if %%sles_version >= 11
#BuildRequires:  sles-release
#%%else
#BuildRequires:  openSUSE-release
#%%endif
BuildRequires:  poppler-tools
BuildRequires:  python-lxml
BuildRequires:  python-xml
#BuildRequires:  sgml-skel
BuildRequires:  suse-xsl-stylesheets
BuildRequires:  svg-dtd
BuildRequires:  transfig
BuildRequires:  xml-commons-jaxp-1.3-apis
%if 0%{?suse_version} >= 1140
BuildRequires:  xmlgraphics-fop >= 0.94
%else
BuildRequires:  fop >= 0.94
%endif
#---
# Fontstuff
#
BuildRequires:  fontpackages-devel
BuildRequires:  liberation-fonts
BuildRequires:  mplus-fonts

%if 0%{?suse_version} > 1220
BuildRequires:  dejavu-fonts
BuildRequires:  gnu-free-fonts
%else
BuildRequires:  dejavu
BuildRequires:  freefont
%endif

#
# In order to keep the requirements list as short as possible, only packages
# needed ti build EPUB, HTML and PDF are really required
# All other packages required for editing or more exotic output formats
# are recommended rather than required

PreReq:         libxml2
PreReq:         sgml-skel

Requires:       ImageMagick
Requires:       bash >= 3.1
Requires:       dia
Requires:       docbook-xsl-stylesheets >= 1.77
Requires:       docbook_4
Requires:       fam
Requires:       ghostscript-library
Requires:       inkscape
Requires:       libxslt
Requires:       make
Requires:       poppler-tools
Requires:       python-lxml
Requires:       python-xml
#Requires:       sgml-skel
Requires:       suse-xsl-stylesheets
Requires:       svg-dtd
Requires:       transfig
Requires:       xml-commons-jaxp-1.3-apis
%if 0%{?suse_version} >= 1140
Requires:       xmlgraphics-fop >= 0.94
%else
Requires:       fop >= 0.94
%endif

Recommends:     aspell aspell-en
%if 0%{?suse_version} < 1210
Recommends:     aspell-en-huge
%endif
Recommends:     daps-docmanager
Recommends:     docbook_5
Recommends:     emacs psgml
Recommends:     epubcheck
Recommends:     exiftool
Recommends:     jing
Recommends:     optipng
%if 0%{?suse_version} >= 1140
Recommends:     perl-checkbot
%else
Recommends:     checkbot
%endif
Recommends:     remake
# Internal XEP package:
Recommends:     xep
Recommends:     xmlformat
Recommends:     xmlstarlet

#------
# Fonts
#------
%if 0%{?suse_version} > 1220
Requires:       dejavu-fonts
Requires:       gnu-free-fonts
Requires:       liberation-fonts
Requires:       mplus-fonts
Recommends:     agfa-fonts
Recommends:     fifth-leg-font
Recommends:     linux-libertine-fonts
# Chinese Fonts
Recommends:     arphic-fonts
# Japanese Fonts:
Recommends:     sazanami-fonts
# Korean Fonts:
Recommends:     un-fonts
%else
Requires:       dejavu
Requires:       freefont
Requires:       liberation-fonts
Requires:       mplus-fonts
Recommends:     agfa-fonts
Recommends:     fifth-leg-font
Recommends:     LinuxLibertine
# Chinese Fonts
Recommends:     ttf-arphic
# Japanese Fonts:
Recommends:     sazanami-fonts
# Korean Fonts:
Recommends:     unfonts
%endif

Obsoletes:      susedoc < 4.3.32
Provides:       susedoc = 4.3.32

%description
DocBook Authoring and Publishing Suite (DAPS)

DAPS contains a set of stylesheets, scripts and makefiles that enable
you to create HTML, PDF, EPUB and other formats from DocBook XML with a
single command. It also contains tools to generate profiled source
tarballs for distributing your XML sources for translation or review.

DAPS also includes tools that assist you when writing DocBook XML:
linkchecker, validator, spellchecker, editor macros and stylesheets for
converting DocBook XML.

DAPS is the successor of susedoc. See
/usr/share/doc/packages/daps/README.upgrade_from_susedoc_4.x
for upgrade instructions.


#--------------------------------------------------------------------------
%prep
%setup -q -n %{name}
#%%patch1 -p1

#--------------------------------------------------------------------------
%build
%configure --docdir=%{_defaultdocdir}/%{name} --disable-edit-rootcatalog
%__make  %{?_smp_mflags}

#--------------------------------------------------------------------------
%install
make install DESTDIR=$RPM_BUILD_ROOT

# create symlinks:
%fdupes -s $RPM_BUILD_ROOT/%{_datadir}

#----------------------
%post
#
# XML Catalog entries for daps profiling
#
# remove existing entries first (if existing) - needed for
# zypper in, since it does not call postun
#
# delete ...
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
  --del %{name}
# ... and add it again
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
  --add /etc/xml/%{daps_catalog}

%reconfigure_fonts_post
exit 0

#----------------------
%postun
#
# delete catalog entry for daps profiling
# only run if package is really uninstalled ($1 = 0) and not
# in case of an update
#
if [ 0 = $1 ]; then 
if [ -x /usr/bin/edit-xml-catalog ] ; then
  edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
  --del %{name}
fi

%reconfigure_fonts_post
fi
exit 0

#----------------------
%posttrans
%reconfigure_fonts_posttrans

#----------------------
%files
%defattr(-,root,root)

%dir %{_ttfontsdir}
%dir %{_sysconfdir}/%{name}
%dir %{_defaultdocdir}/%{name}

%config %{_sysconfdir}/xml/*.xml
%config %{_sysconfdir}/%{name}/*

%doc %{_mandir}/man1/*.1%{ext_man}
%doc %{_defaultdocdir}/%{name}/*

%{_bindir}/*
%{_datadir}/emacs/site-lisp/docbook_macros.el
%{docbuilddir}
%{_ttfontsdir}/*
%exclude %{_defaultdocdir}/%{name}/INSTALL

#----------------------

%changelog
++++++ daps-fetch-source ++++++
#!/bin/bash
#
#
# Create DAPS source tarball from SVN
#
# Copyright (C) 2004 - 2011 SUSE Linux Products GmbH
#
# Author:
# Frank Sundermeyer <fsundermeyer at opensuse dot org>
#

#set -x

NAME=daps
VERSION=
SPECFILE=${NAME}.spec
SVNPATH=svn://svn.code.sf.net/p/daps/svn/branches/daps_1.x
TMPDIR=$(mktemp -q -d --tmpdir daps_XXXXXXXX)
EXCLUDES=${TMPDIR}/${NAME}/packaging/exclude-files_for_daps_package.txt

#----------
# Functions
#----------

# exit on error
#
function exit_on_error {
    echo -e "$1"
    rm -rf $TMPDIR
    exit 1
}
#-----
# MAIN
#-----
#
# This script needs to be called from the daps osc checkout directory, so
# lets check whethter we are in the correct directory
#
if [[ ! -s daps.spec && ! -d .osc ]]; then
    echo "Looks like you are not in the daps checkout directory."
    read -p "Continue anyway (y/n) [n]: " CONT
    if [[ n = $CONT || N = $CONT ]]; then
        exit_on_error "Aborted by user."
    fi
fi

#
# Export daps from SVN 
#
svn export -q $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed"

#
# Get the version number
#
VERSION=$(egrep "^Version:\s*" ${TMPDIR}/${NAME}/packaging/$SPECFILE | sed 
's/^Version:\s*//')

if [[ -z $VERSION ]]; then
    exit_on_error "Couldn't get version number from spec-file."
fi

#
# Create the tarball
#
export BZIP2=--best
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 wrote source tarball ${NAME}-${VERSION}.tar.bz2"
#
# Copy the spec file if necessary
#
diff -q $SPECFILE ${TMPDIR}/${NAME}/packaging/$SPECFILE >/dev/null
if [[ 0 = $? ]]; then
    echo "spec file is up-to-date"
else
    cp ${TMPDIR}/${NAME}/packaging/$SPECFILE . || exit_on_error "Failed to copy 
the specfile."
    echo "Successfully updated the spec file."
fi
    
rm -rf ${TMPDIR}

exit 0
++++++ daps.rpmlintrc ++++++
addFilter("explicit-lib-dependency libxml2")
addFilter("explicit-lib-dependency libxslt")
addFilter("explicit-lib-dependency liberation-fonts")
addFilter("non-executable-script .*/daps/lib/daps_functions")
# migration script for old susedoc projects, no man page needed
addFilter("no-manual-page-for-binary daps-envconvert")
# internally used only, no man page needed
addFilter("no-manual-page-for-binary daps-susespell")
addFilter("no-manual-page-for-binary daps-xmlformat")
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to