rpm/cherrytree
SHA256
1
0
Fork 0
forked from pool/cherrytree
Code Pull Requests Activity

Accepting request 849863 from home:malcolmlewis:branches:GNOME:Apps

Browse Source 
- Update to version 0.99.21+git20201121.e0afb5a6:
  * Fix typos in README, (gh#giuspen/cherrytree#1357)
  * Fix 7za sources License.txt issue,
    (gh#giuspen/cherrytree#1356).
  * Fix unit tests after latest changes for new arg option
    --new-window.
  * Adds --new-window option, (gh#giuspen/cherrytree#1355).
  * Fix issue with clipboard on windows,
    (gh#giuspen/cherrytree#1336, gh#giuspen/cherrytree#1344 and
    gh#giuspen/cherrytree#1341).
  * Suppress error when test a wrong password,
    (gh#giuspen/cherrytree#1350).
  * Table will contain right amount of column widths; removes table
    to xml copy-paste, (gh#giuspen/cherrytree#1349).
  * Fixes crash in html parser due to <li> without <ul>,
    (gh#giuspen/cherrytree#1348).
  * Fix crash when triying to move a table column,
    (gh#giuspen/cherrytree#1342).
  * Fix crash when pasting HTML, (gh#giuspen/cherrytree#1346).
  * Translation updates.
- Added cherrytree-set-git-version.patch and rebase since we are
  pulling from git again.

OBS-URL: https://build.opensuse.org/request/show/849863
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/cherrytree?expand=0&rev=127
This commit is contained in:
Dominique Leuenberger 2020-11-23 17:09:01 +00:00 committed by Git OBS Bridge
parent 33e669e395
commit a00012c929
8 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -5,9 +5,9 @@
<param name="submodules">enable</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
<param name="changesauthor">info@paolostivanin.com</param>
<param name="changesauthor">malcolmlewis@opensuse.org</param>
<param name="filename">cherrytree</param>
<param name="versionformat">0.99.20+git%cd.%h</param>
<param name="versionformat">0.99.21+git%cd.%h</param>
</service>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/giuspen/cherrytree.git</param>
<param name="changesrevision">736ca99f2c9cecebf7e01afe1beeb88b044d23d2</param></service></servicedata>
<param name="changesrevision">e0afb5a6f2c936f88a7131e77f86c39419efb780</param></service></servicedata>

3
cherrytree-0.99.20+git20201116.736ca99f.obscpio
View File

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

3
cherrytree-0.99.21+git20201121.e0afb5a6.obscpio Normal file
View File

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

12
cherrytree-set-git-version.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2020-11-21 07:41:58.000000000 -0600
+++ b/CMakeLists.txt 2020-11-21 08:27:00.146401506 -0600
@@ -4,7 +4,7 @@
file(READ "debian/changelog" CHANGELOG)
string(REGEX MATCH "cherrytree +\\(([0-9]+)\\.([0-9]+)\\.([0-9]+)[-+]" _ ${CHANGELOG})
-set(CT_VERSION ${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3})
+option(CT_VERSION ${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3})
set(CT_VERSION_WINDOWS ${CMAKE_MATCH_1},${CMAKE_MATCH_2},${CMAKE_MATCH_3},0)
message(STATUS "CT_VERSION = ${CT_VERSION}")

26
cherrytree.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Sat Nov 21 14:07:48 UTC 2020 - malcolmlewis@opensuse.org
- Update to version 0.99.21+git20201121.e0afb5a6:
* Fix typos in README, (gh#giuspen/cherrytree#1357)
* Fix 7za sources License.txt issue,
(gh#giuspen/cherrytree#1356).
* Fix unit tests after latest changes for new arg option
--new-window.
* Adds --new-window option, (gh#giuspen/cherrytree#1355).
* Fix issue with clipboard on windows,
(gh#giuspen/cherrytree#1336, gh#giuspen/cherrytree#1344 and
gh#giuspen/cherrytree#1341).
* Suppress error when test a wrong password,
(gh#giuspen/cherrytree#1350).
* Table will contain right amount of column widths; removes table
to xml copy-paste, (gh#giuspen/cherrytree#1349).
* Fixes crash in html parser due to <li> without <ul>,
(gh#giuspen/cherrytree#1348).
* Fix crash when triying to move a table column,
(gh#giuspen/cherrytree#1342).
* Fix crash when pasting HTML, (gh#giuspen/cherrytree#1346).
* Translation updates.
- Added cherrytree-set-git-version.patch and rebase since we are
pulling from git again.
-------------------------------------------------------------------
Tue Nov 17 09:10:21 UTC 2020 - info@paolostivanin.com

6
cherrytree.obsinfo
View File

@ -1,5 +1,5 @@
name: cherrytree
version: 0.99.20+git20201116.736ca99f
mtime: 1605564434
commit: 736ca99f2c9cecebf7e01afe1beeb88b044d23d2
version: 0.99.21+git20201121.e0afb5a6
mtime: 1605966118
commit: e0afb5a6f2c936f88a7131e77f86c39419efb780

6
cherrytree.spec
View File

@ -16,13 +16,15 @@
#
Name: cherrytree
Version: 0.99.20+git20201116.736ca99f
Version: 0.99.21+git20201121.e0afb5a6
Release: 0
Summary: A hierarchical note taking application
License: GPL-3.0-or-later
License: GPL-3.0-or-later and LGPL-2.1
Group: Productivity/Office/Other
URL: https://www.giuspen.com/cherrytree/
Source0: %{name}-%{version}.tar.xz
#PATCH-FIX-OPENSUSE cherrytree-set-git-version.patch malcolmlewis@opensuse.org -- Set git version in help about.
Patch0: cherrytree-set-git-version.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: python3-lxml