From bf18e031192694b398f395a9c46bec7c4d70934a93ed5bfa0ecfcb15e9ac9fb0 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Sun, 7 Jan 2018 12:20:36 +0000 Subject: [PATCH] Accepting request 562310 from home:ecsos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update to 0.9.9 * Bug Fixes - Add python_3.5_fixes3.patch to Python build and update build docs on OSX to fix missing symbols - Fix crash caused by Preview holding pointer to user removed resource when front tab is non-html resource - Fix crash in FlowTab destructor due to re-entering flowtab during Syntax Highlighting and signals - Fix issue with file icons disappearing when reordering in Book Browser (commit ecb56b1f) - Fix missing epub3 Manifest cover-image property setting/unsetting with BookBrowser - Fix issue where cancelling the SaveAs dialog disconnected an existing epub from its saved path - Fix assertion error in sigil-gumbo when handling extraneous script end tags - Apply multiple fixes for gumbo from upstream - Fix segfault in Split at Cursor when not an html file - Make sure Add Cover tool properly handles existing manifest cover properties in EPUB3s - Correct error dialog to say “Sigil may need to close.” - Prevent Images and Misc items from being dragged to the Text folder in Book Browser (commit 30bb96d) - Fix Linux bug that prevents rich text from other programs being pasted into Book View (issue #320) - Fix bug where index entries inside em and dfn tags were ignored during index generation - Fix bug on Windows in spell checking when smart right single quotes are used for apostrophes - Fix bug in simple well-formed check to handle generic xml processing instructions - Fix bug in epub3 MetaEditor with title-type and collection-type properties - Fix plugin code to prevent book href vs manifest id clashes - Fix bug in Plugin Runner to allow it to delete non-manifested files properly - Fix bug in SourceUpdates to handle properly handle css properties with multiple urls - Fix bugs in well-formed check to better handle missing doctypes * New Features - Add SIGIL_DISABLE_CURSOR_BLINK environment variable to disable text cursor to aid Accessibility on OSX - Better use semantic information (guide types and Landmarks) to allow the user finer control of index generation - Attempt to improve Metadata Editor placeholder text to help beginners - Preview Window Title bar will now show height and width of the Preview Window - Allow users to limit/disable clipboard history saving via General Preferences - Convert br tags in header text to linebreaks for toc/ncx/nav generation routines - Support spell checking of words with numbers controlled by Preference settings - Add two additional Quick Lauch Icons for Plugins - Drop Patch sigil-version.patch, because right version is now in upstream OBS-URL: https://build.opensuse.org/request/show/562310 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/sigil?expand=0&rev=18 --- 0.9.8.tar.gz | 3 --- 0.9.9.tar.gz | 3 +++ sigil-version.patch | 12 --------- sigil.changes | 62 +++++++++++++++++++++++++++++++++++++++++++++ sigil.spec | 61 ++++++++++++++++++++------------------------ 5 files changed, 92 insertions(+), 49 deletions(-) delete mode 100644 0.9.8.tar.gz create mode 100644 0.9.9.tar.gz delete mode 100644 sigil-version.patch diff --git a/0.9.8.tar.gz b/0.9.8.tar.gz deleted file mode 100644 index eeed59f..0000000 --- a/0.9.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:deee9c43bf51519dbf70c299f0ae396ace7899e416e5d7a39c0b788f83d4d78a -size 18600528 diff --git a/0.9.9.tar.gz b/0.9.9.tar.gz new file mode 100644 index 0000000..2d900ef --- /dev/null +++ b/0.9.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12c1ace50598aef0a5e1397da3fdcd9c5ed9eba753c476d0ee5ab00a5d2d3764 +size 18675046 diff --git a/sigil-version.patch b/sigil-version.patch deleted file mode 100644 index d1f0fa0..0000000 --- a/sigil-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Pdpru Sigil-0.9.8.orig/CMakeLists.txt Sigil-0.9.8/CMakeLists.txt ---- Sigil-0.9.8.orig/CMakeLists.txt 2017-03-21 17:54:48.000000000 +0100 -+++ Sigil-0.9.8/CMakeLists.txt 2017-04-02 10:27:19.952071686 +0200 -@@ -29,7 +29,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PA - - set( SIGIL_MAJOR_VERSION 0 ) - set( SIGIL_MINOR_VERSION 9 ) --set( SIGIL_REVISION_VERSION 7 ) -+set( SIGIL_REVISION_VERSION 8 ) - set( SIGIL_FULL_VERSION ${SIGIL_MAJOR_VERSION}.${SIGIL_MINOR_VERSION}.${SIGIL_REVISION_VERSION} ) - - if( UNIX AND NOT APPLE ) diff --git a/sigil.changes b/sigil.changes index d851ddc..d6d8145 100644 --- a/sigil.changes +++ b/sigil.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Sun Jan 7 11:42:03 UTC 2018 - ecsos@opensuse.org + +- update to 0.9.9 + * Bug Fixes + - Add python_3.5_fixes3.patch to Python build and update build + docs on OSX to fix missing symbols + - Fix crash caused by Preview holding pointer to user removed + resource when front tab is non-html resource + - Fix crash in FlowTab destructor due to re-entering flowtab + during Syntax Highlighting and signals + - Fix issue with file icons disappearing when reordering in + Book Browser (commit ecb56b1f) + - Fix missing epub3 Manifest cover-image property + setting/unsetting with BookBrowser + - Fix issue where cancelling the SaveAs dialog disconnected + an existing epub from its saved path + - Fix assertion error in sigil-gumbo when handling extraneous + script end tags + - Apply multiple fixes for gumbo from upstream + - Fix segfault in Split at Cursor when not an html file + - Make sure Add Cover tool properly handles existing manifest + cover properties in EPUB3s + - Correct error dialog to say “Sigil may need to close.” + - Prevent Images and Misc items from being dragged to the Text + folder in Book Browser (commit 30bb96d) + - Fix Linux bug that prevents rich text from other programs + being pasted into Book View (issue #320) + - Fix bug where index entries inside em and dfn tags were + ignored during index generation + - Fix bug on Windows in spell checking when smart right single + quotes are used for apostrophes + - Fix bug in simple well-formed check to handle generic xml + processing instructions + - Fix bug in epub3 MetaEditor with title-type + and collection-type properties + - Fix plugin code to prevent book href vs manifest id clashes + - Fix bug in Plugin Runner to allow it to delete non-manifested + files properly + - Fix bug in SourceUpdates to handle properly handle + css properties with multiple urls + - Fix bugs in well-formed check to better handle missing + doctypes + * New Features + - Add SIGIL_DISABLE_CURSOR_BLINK environment variable + to disable text cursor to aid Accessibility on OSX + - Better use semantic information (guide types and Landmarks) + to allow the user finer control of index generation + - Attempt to improve Metadata Editor placeholder text to help + beginners + - Preview Window Title bar will now show height and width + of the Preview Window + - Allow users to limit/disable clipboard history saving via + General Preferences + - Convert br tags in header text to linebreaks for toc/ncx/nav + generation routines + - Support spell checking of words with numbers controlled by + Preference settings + - Add two additional Quick Lauch Icons for Plugins +- Drop Patch sigil-version.patch, + because right version is now in upstream + ------------------------------------------------------------------- Sat Apr 1 17:49:18 UTC 2017 - ecsos@opensuse.org diff --git a/sigil.spec b/sigil.spec index 222588f..53f5678 100644 --- a/sigil.spec +++ b/sigil.spec @@ -1,7 +1,7 @@ # # spec file for package sigil # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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: sigil -Version: 0.9.8 +Version: 0.9.9 Release: 0 Summary: WYSIWYG Ebook Editor License: GPL-3.0 @@ -29,59 +29,54 @@ Source1: https://github.com/Sigil-Ebook/Sigil/raw/master/docs/Sigil_User_ Source2: %{name}.desktop # PATCH-FIX-OPENSUSE Disabled __DATE__ and __TIME__ which is replaced later in pre section Patch0: %{name}-gt-0.9.0-Dialogs-About.cpp.patch -# PATCH-FIX-OPENSUSE Set right version -Patch1: %{name}-version.patch - -BuildRequires: cmake >= 3.0 BuildRequires: boost-devel +BuildRequires: cmake >= 3.0 +BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hunspell-devel -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: pkgconfig(Qt5XmlPatterns) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5WebChannel) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: libqt5-qtbase-devel >= 5.4.2 BuildRequires: libqt5-qtlocation-devel >= 5.4.2 BuildRequires: libstdc++-devel BuildRequires: libxerces-c-devel +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel BuildRequires: make +BuildRequires: pcre-devel +BuildRequires: python3-devel >= 3.4 BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: zlib-devel -BuildRequires: pcre-devel -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel -BuildRequires: python3-devel >= 3.4 -BuildRequires: dos2unix +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(Qt5WebChannel) +BuildRequires: pkgconfig(Qt5WebKit) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(Qt5XmlPatterns) # not need for build, only check for exists -BuildRequires: python3-tk -BuildRequires: python3-six -BuildRequires: python3-lxml BuildRequires: python3-html5lib +BuildRequires: python3-lxml +BuildRequires: python3-six +BuildRequires: python3-tk #BuildRequires: python3-regex BuildRequires: python3-Pillow -BuildRequires: python3-cssutils BuildRequires: python3-cssselect +BuildRequires: python3-cssutils #BuildRequires: python3-chardet -Requires: python3-tk -Requires: python3-six -Requires: python3-lxml Requires: python3-html5lib +Requires: python3-lxml +Requires: python3-six +Requires: python3-tk #Requires: python3-regex Requires: python3-Pillow -Requires: python3-cssutils Requires: python3-cssselect +Requires: python3-cssutils #Requires: python3-chardet - - %description Sigil is an editor for the EPUB format. It is designed for WYSIWYG editing of EPUB files and for converting other formats to EPUB. It @@ -93,14 +88,12 @@ specification and create a hierarchical Table of Contents. %setup -q -n Sigil-%{version} sed -i 's/\r//' ChangeLog.txt README.md COPYING.txt %patch0 -p 1 -%patch1 -p 1 %{__cp} -v %{S:1} . %{__cp} -v %{S:2} . # rpmlint dos2unix src/Resource_Files/python3lib/meta*.py dos2unix src/Resource_Files/python3lib/opf_*.py - - +find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python|#!\/usr\/bin\/python3|g' {} \; #FIXME MANUAL UPDATE OF DATE REQUIRED HERE!!!! # Fix "Your file uses __DATE and __TIME__ this causes the package to rebuild