From c69acb18c968dc836cc4b9073823f43a3c37878089144aa2cec4cf0c0b4b0215 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 22 Mar 2013 14:11:08 +0000 Subject: [PATCH 1/4] 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} OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=116 --- daps-1.1.4.tar.bz2 | 3 --- daps-1.1.5.tar.bz2 | 3 +++ daps-fetch-source | 2 +- daps.changes | 13 +++++++++++++ daps.spec | 4 ++-- 5 files changed, 19 insertions(+), 6 deletions(-) delete mode 100644 daps-1.1.4.tar.bz2 create mode 100644 daps-1.1.5.tar.bz2 diff --git a/daps-1.1.4.tar.bz2 b/daps-1.1.4.tar.bz2 deleted file mode 100644 index ea7da92..0000000 --- a/daps-1.1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7e2359bffd921dd42f43881ec3f87e7ba3d6337d9f83766814b959dc22fc89a -size 2666898 diff --git a/daps-1.1.5.tar.bz2 b/daps-1.1.5.tar.bz2 new file mode 100644 index 0000000..08275a0 --- /dev/null +++ b/daps-1.1.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:371177f84a3665ecba593f5c0cd18d252ccc58c5a7be9e9a1e6e861996075ce7 +size 2633814 diff --git a/daps-fetch-source b/daps-fetch-source index 684f668..cfdad70 100644 --- a/daps-fetch-source +++ b/daps-fetch-source @@ -14,7 +14,7 @@ NAME=daps VERSION= SPECFILE=${NAME}.spec -SVNPATH=svn://svn.code.sf.net/p/daps/svn/trunk/daps +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 diff --git a/daps.changes b/daps.changes index 35a7373..875f097 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Mar 22 13:50:03 UTC 2013 - fsundermeyer@opensuse.org + +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 - mmeister@suse.com diff --git a/daps.spec b/daps.spec index 02e892d..0b77cba 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.1.4 +Version: 1.1.5 Release: 0 ############################################################### @@ -44,7 +44,7 @@ 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 +Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc Source2: %{name}-fetch-source BuildRoot: %{_tmppath}/%{name}-%{version}-build From 963ed98fbf5bada17903dd01c85b55e9c5a9c340593a9a870e3ac0232b8a8555 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 22 Mar 2013 15:15:00 +0000 Subject: [PATCH 2/4] * spec-file update: Version 1.77 or better of the Docook stylesheets is required * updated Changelog OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=117 --- daps-1.1.5.tar.bz2 | 4 ++-- daps.changes | 7 +++++++ daps.spec | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/daps-1.1.5.tar.bz2 b/daps-1.1.5.tar.bz2 index 08275a0..f6c74eb 100644 --- a/daps-1.1.5.tar.bz2 +++ b/daps-1.1.5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:371177f84a3665ecba593f5c0cd18d252ccc58c5a7be9e9a1e6e861996075ce7 -size 2633814 +oid sha256:43bbe1927412eba39f28cda27110a0a275d0d01493b125a3023977bf676587cd +size 2632981 diff --git a/daps.changes b/daps.changes index 875f097..82dd436 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 22 15:13:47 UTC 2013 - fsundermeyer@opensuse.org + + * spec-file update: Version 1.77 or better of the Docook + stylesheets is required + * updated Changelog + ------------------------------------------------------------------- Fri Mar 22 13:50:03 UTC 2013 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 0b77cba..ea86d38 100644 --- a/daps.spec +++ b/daps.spec @@ -54,7 +54,7 @@ BuildArch: noarch BuildRequires: ImageMagick BuildRequires: bash >= 3.1 BuildRequires: dia -BuildRequires: docbook-xsl-stylesheets >= 1.75 +BuildRequires: docbook-xsl-stylesheets >= 1.77 BuildRequires: docbook_4 BuildRequires: fam BuildRequires: fdupes @@ -109,7 +109,7 @@ PreReq: sgml-skel Requires: ImageMagick Requires: bash >= 3.1 Requires: dia -Requires: docbook-xsl-stylesheets >= 1.75 +Requires: docbook-xsl-stylesheets >= 1.77 Requires: docbook_4 Requires: fam Requires: ghostscript-library From d08e13eda7d0861d0c02fbb91338735e29ff67b33999591d48232b8137bc71f3 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Mon, 25 Mar 2013 09:42:39 +0000 Subject: [PATCH 3/4] * fix for EPUB validation bug (EPUB Mime-Type file ended with a newline which caused a validation error) OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=119 --- daps-1.1.5.tar.bz2 | 4 ++-- daps.changes | 7 ++++++- daps.spec | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/daps-1.1.5.tar.bz2 b/daps-1.1.5.tar.bz2 index f6c74eb..58c8af3 100644 --- a/daps-1.1.5.tar.bz2 +++ b/daps-1.1.5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43bbe1927412eba39f28cda27110a0a275d0d01493b125a3023977bf676587cd -size 2632981 +oid sha256:8a3e95d0e509063989b515b5cdf54f392ca0f91e5a9d3611cb60c3de083fa784 +size 2654373 diff --git a/daps.changes b/daps.changes index 82dd436..2420950 100644 --- a/daps.changes +++ b/daps.changes @@ -1,9 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 25 09:28:54 UTC 2013 - fsundermeyer@opensuse.org + + * 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 - fsundermeyer@opensuse.org * spec-file update: Version 1.77 or better of the Docook stylesheets is required - * updated Changelog ------------------------------------------------------------------- Fri Mar 22 13:50:03 UTC 2013 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index ea86d38..89ef464 100644 --- a/daps.spec +++ b/daps.spec @@ -44,7 +44,7 @@ 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: %{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/daps/%{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc Source2: %{name}-fetch-source BuildRoot: %{_tmppath}/%{name}-%{version}-build From c031e1f60b0fe9a468638b7fef46550845fdbf2ed94b84647e1bda3ba5e52d27 Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Wed, 27 Mar 2013 06:56:27 +0000 Subject: [PATCH 4/4] - Fixed bnc#811376 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=120 --- daps.changes | 5 +++++ daps.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/daps.changes b/daps.changes index 2420950..b068db4 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 26 07:46:45 UTC 2013 - toms@suse.de + +- Fixed bnc#811376 + ------------------------------------------------------------------- Mon Mar 25 09:28:54 UTC 2013 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 89ef464..b804b67 100644 --- a/daps.spec +++ b/daps.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: daps Version: 1.1.5 Release: 0