Hello community,
here is the log from the commit of package daps for openSUSE:Factory checked in
at 2015-05-06 07:48:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/daps (Old)
and /work/SRC/openSUSE:Factory/.daps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "daps"
Changes:
--------
--- /work/SRC/openSUSE:Factory/daps/daps.changes 2014-08-01
19:27:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2015-05-06
07:48:26.000000000 +0200
@@ -1,0 +2,109 @@
+Mon Apr 27 15:32:46 UTC 2015 - fsunderme...@opensuse.org
+
+New release DAPS 2.0~rc6
+
+* Bugfix: Due to an error in Makefile.am, the contents of
+ daps_xslt/relnotes were installed to daps_xslt/xhtml and
+ vice versa.
+
+-------------------------------------------------------------------
+Tue Apr 21 13:05:12 UTC 2015 - fsunderme...@opensuse.org
+
+New release DAPS 2.0~rc5
+(releases rc3 and rc4 have not been made available as SUSE builds)
+
+- Full support for DocBook 5 now (finally)
+- various fixes for ePUB (again):
+ -ePUB 2 builds without warnings/errors in epubcheck
+ -ePUB3 shows a few warnings/errors in epubcheck resulting from
+ errors in the stylesheets
+ -make sure ePUB gets a correct date format (YYYY-MM-DD)
+- Moved DAPS user config directory to ~/.config/daps/. The config file
+ has been renamed to dapsrc (the user will be notified and DAPS will
+ automatically do the move if the user agrees)
+- all of DocBook's profiling attributes are no supported
+- Various build fixes to make it work on Debian Wheezy, Fedora 20/21
+ openSUSE 13.x, SLE 12, and Ubuntu 14.10
+- tested DAPS on Debian Wheezy, Fedora 20/21 and Ubuntu 14.10
+- Added script and stylesheets to migrate DocBook4 projects to
+ DocBook 5 (libexec/daps-migrate)
+- various fixes and improvements for bin/daps-init (incl. man page)
+- Added support for local static/ directories
+- Established new locdrop workflow
+- Fixed daps-init
+- strings passed with --xsltparam no longer need to be uoted with double
+ and single quotes--only use double quotes now
+- Definied DAPS version for major, minor, and micro (configure.ac)
+ - Introduced daps_version_{major,minor,micro} substitutions
+ - Corrected URL from SourceForge to GitHub
+ - Used DAPS version in AC_MSG_NOTICE
+- Unified copyright statements
+- Let configure change the Version in entity-decl.ent
+- Created DOCTYPE and PI node manually for daps-xslt/profiling/
+ stylesheets
+- Added more testcases, fixed erfrors in test cases
+- Significant documentation updates for version 2.0
+- version string in manuals and man pages is now automatically set by
+ configure/make
+- provided useful READMEs in ASCII Doc format
+- Support for both, /usr/bin/xml (SUSE) and /usr/bin/xmlstarlet (Ubuntu)
+- stability fixes for make files
+- adjusted the test suite to code changes; made sure all tests are passed
+- man pages for daps-init, daps-susespell and daps-envconvert will
+ now be correctly installed
+- added various XSLT parameters to the documentation's DC-files to
+ make them look better when build with the upstream stylesheets
+
+Bug fixes:
+- issue #151: Detect DocBook XSL Stylesheet Version in daps
+- issue #157: Add option for optimising PNG files for targets locdrop and
+ package-src
+- issue #223: Paths starting with ~ are now correctly resolved
+- issue #227: Made --static for HTML builds the default
+- issue #230: Moved DAPS config to ~/.config/daps/
+- issue #249: Added support for all missing profiling attributes supported
+ by DocBook
+- issue #250: building Japanese text format requires external LANG
+ setting
+- issue #253: Implement Migration Stylesheets from DocBook 4 <-> DocBook 5
+- issue #260: Removed project-web directory (moved into gh-pages branch)
+- issue #262: Quoting is removed from subcommand-options
+- issue #264: Make STYLEROOT Platform Independant
+- issue #266: Review XEP config file handling
+- issue #267: Improve Default DAPS Layout
+- issue #268: Fix ePUB date issues
+- check for embeeded fonts in PDF now works correctly
+- ASPELL_LANG no longer gets overwritten with value from XML document if
+ set in config or on the command line
+- package-html no longer fails when called with --draft
+- DocBook5 validation now works correctly
+- epub is now correctly generated (STYLEIMG was not always set)
+- existing man page builds were duplicated rather than overwritten
+- callout graphics were not shown in PDF when using the
+ DocBook stylesheets
+
+Project:
+- project moved to GitHub
+- Moved all stylesheet related files to github://openSUSE/suse-xsl
+- obsolete docmanager code has been removed from the repository
+- source clean-up
+- source changes are tested with Travis
+
+-------------------------------------------------------------------
+Thu Aug 14 13:57:37 UTC 2014 - skn...@suse.de
+
+- Purely packaging related update: update list of excluded files,
+ streamline TAR archive fetch script
+
+-------------------------------------------------------------------
+Thu Aug 14 11:09:36 UTC 2014 - skn...@suse.de
+
+New release DAPS 2.0~rc2
+
+- EPUB 3 builds now succeed
+- Mobipocket builds succeed again
+- "static" directories are now expected to be located within
+ specific subfolders of the chosen style root
+- EPUB now supports "static" folders
+
+-------------------------------------------------------------------
Old:
----
daps-2.0~rc1.tar.bz2
daps-fetch-source
New:
----
daps-2.0~rc6.tar.bz2
daps-fetch-source-git
daps-fetch-source-svn
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ daps.spec ++++++
--- /var/tmp/diff_new_pack.SvZQ2l/_old 2015-05-06 07:48:27.000000000 +0200
+++ /var/tmp/diff_new_pack.SvZQ2l/_new 2015-05-06 07:48:27.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package daps
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX 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,7 +17,7 @@
Name: daps
-Version: 2.0~rc1
+Version: 2.0~rc6
Release: 0
###############################################################
@@ -46,7 +46,8 @@
Url: http://sourceforge.net/p/daps
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.rpmlintrc
-Source2: %{name}-fetch-source
+Source2: %{name}-fetch-source-svn
+Source3: %{name}-fetch-source-git
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -58,13 +59,14 @@
BuildRequires: docbook-xsl-stylesheets >= 1.77
BuildRequires: docbook_4
BuildRequires: fdupes
-BuildRequires: ghostscript-library
+BuildRequires: ghostscript
BuildRequires: inkscape
%if 0%{?suse_version} >= 1220
BuildRequires: libxml2-tools
%endif
BuildRequires: libxslt
-#%%if %%sles_version >= 11
+BuildRequires: libxslt-tools
+#%%if 0%%{?suse_version} == 1315
#BuildRequires: sles-release
#%%else
#BuildRequires: openSUSE-release
@@ -82,9 +84,7 @@
%else
BuildRequires: fop >= 0.94
%endif
-#---
-# Font stuff
-BuildRequires: fontpackages-devel
+BuildRequires: xmlstarlet
#
# In order to keep the requirements list as short as possible, only packages
@@ -119,10 +119,6 @@
%endif
Requires: xmlstarlet
-Recommends: aspell aspell-en
-%if 0%{?suse_version} < 1210
-Recommends: aspell-en-huge
-%endif
Recommends: daps-docmanager
Recommends: docbook_5
Recommends: epubcheck
@@ -136,6 +132,7 @@
%endif
Recommends: remake
Recommends: suse-doc-style-checker
+Recommends: w3m
# Internal XEP package:
Recommends: xep
Recommends: xmlformat
@@ -185,14 +182,15 @@
# 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
+# delete in case of an update, which $1=2
+if [ "2" = "$1" ]; then
+ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
+ --del %{name} || true
+fi
+# ... and readd it again
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{daps_catalog}
-%reconfigure_fonts_post
exit 0
#----------------------
@@ -203,24 +201,19 @@
# 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}
@@ -233,8 +226,9 @@
%{_bindir}/*
%{_datadir}/emacs/site-lisp/docbook_macros.el
%{docbuilddir}
-%{_ttfontsdir}/*
%exclude %{_defaultdocdir}/%{name}/INSTALL
+%exclude %{_sysconfdir}/%{name}/config.in
+%exclude %{_sysconfdir}/%{name}/catalog.xml
#----------------------
++++++ daps-2.0~rc1.tar.bz2 -> daps-2.0~rc6.tar.bz2 ++++++
++++ 90414 lines of diff (skipped)
++++++ daps-fetch-source-git ++++++
#!/bin/bash
#
#
# Create DAPS source tarball from GitHub
# Needed because we would like to exclude unnecessary stuff from
# the source RPM in order to keep it lean
#
# Copyright (C) 2015 SUSE Linux GmbH
#
# Author:
# Frank Sundermeyer <fsundermeyer at opensuse dot org>
#
NAME=daps
VERSION=
SPECFILE=${NAME}.spec
TMPDIR=$(mktemp -q -d --tmpdir daps_XXXXXXXX)
#----------
# Functions
#----------
# exit on error
#
function exit_on_error {
echo -e "$1"
# rm -rf $TMPDIR
exit 1
}
function help {
echo -e "$(basename $0) <DAPS_ARCHIVE_FILENAME>\n"
}
#-----
# MAIN
#-----
#
# Check for archive file name
#
if [[ -z $1 ]]; then
exit_on_error "Please specify a URl for a DAPS release archive on Github,
e.g.\nhttps://github.com/openSUSE/daps/archive/daps-2.0-rc5.tar.gz";
else
ARCHIVE_URL="$1"
ARCHIVE_NAME="${ARCHIVE_URL##*/}"
fi
# This script needs to be called from the daps osc checkout directory, so
# lets check whether 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
#-----------
# Download archive
#
echo "Downloading archive:"
(cd $TMPDIR && wget -nv $ARCHIVE_URL) || exit_on_error "Download of
$ARCHIVE_URL failed"
#-----------
# Unpack archive
#
case ${ARCHIVE_NAME##*.} in
zip)
UNPACK="unzip"
ARCHIVE_DIR=$(basename $ARCHIVE_NAME .zip)
;;
gz)
UNPACK="tar xfz"
ARCHIVE_DIR=$(basename $ARCHIVE_NAME .tar.gz)
;;
bz2)
UNPACK="tar xfj"
ARCHIVE_DIR=$(basename $ARCHIVE_NAME .tar.bz2)
;;
*)
exit_on_error "Unknown archive format"
esac
SRC_DIR=${TMPDIR}/${NAME}
EXCLUDES=${SRC_DIR}/packaging/exclude-files_for_daps_package.txt
(cd $TMPDIR && $UNPACK $ARCHIVE_NAME) || exit_on_error "Unpacking $ARCHIVE_NAME
failed"
mv ${TMPDIR}/${NAME}-${ARCHIVE_DIR}/ ${SRC_DIR}/
#-----------
# Get the version number
#
VERSION=$(egrep "^Version:\s*" ${SRC_DIR}/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 cf ${NAME}-${VERSION}.tar -C ${TMPDIR} \
--exclude-from=$EXCLUDES ${NAME} || exit_on_error "Failed to create the
tarball."
bzip2 -9 ${NAME}-${VERSION}.tar
echo "Successfully wrote source tarball ${NAME}-${VERSION}.tar.bz2"
#
# Copy the spec file if necessary
#
diff -q $SPECFILE ${SRC_DIR}/packaging/$SPECFILE >/dev/null
if [[ 0 = $? ]]; then
echo "Spec file is up-to-date."
else
cp ${SRC_DIR}/packaging/$SPECFILE . || exit_on_error "Failed to copy the
specfile."
echo "Successfully updated the spec file."
fi
#rm -rf ${TMPDIR}
exit 0
++++++ daps-fetch-source-svn ++++++
#!/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/trunk/daps
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 cf ${NAME}-${VERSION}.tar -C ${TMPDIR} \
--exclude-from=$EXCLUDES ${NAME} || exit_on_error "Failed to create 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 ++++++
--- /var/tmp/diff_new_pack.SvZQ2l/_old 2015-05-06 07:48:27.000000000 +0200
+++ /var/tmp/diff_new_pack.SvZQ2l/_new 2015-05-06 07:48:27.000000000 +0200
@@ -2,8 +2,8 @@
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")
+# false positive
+addFilter("no-manual-page-for-binary daps-init")
# internally used only, no man page needed
-addFilter("no-manual-page-for-binary daps-susespell")
+addFilter("no-manual-page-for-binary daps-auto.pl")
addFilter("no-manual-page-for-binary daps-xmlformat")
