Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tea for openSUSE:Factory checked in
at 2021-05-19 17:49:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tea (Old)
and /work/SRC/openSUSE:Factory/.tea.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tea"
Wed May 19 17:49:10 2021 rev:12 rq:894119 version:60.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/tea/tea.changes 2020-10-05 19:36:56.629424030
+0200
+++ /work/SRC/openSUSE:Factory/.tea.new.2988/tea.changes 2021-05-19
17:49:21.741539107 +0200
@@ -1,0 +2,22 @@
+Tue May 18 16:22:42 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Update to version 60.1.0
+ * Input-output subsystem was rewritten.
+ * QML support is dropped. No more plugins.
+ * Added 2/Rexx, Lua, Windows batch files as scripts support
+ * TEA now uses some icons from the desktop theme.
+ * Spellchecker module has been rewritten.
+ * Syntax highlighting engine is almost new, and old syntax
+ highlighting rule file format is not supported anymore
+ * TEA uses the new one, although based on the old one.
+ * Use Ctrl-mouse wheel to zoom text at current file.
+ * TEA start time is shorter due to some improvements
+ * spell checker now initialized on demand only
+ * Adds a sort of syntax highlighting for SRT and
+ Youtube subtitles (sbv, vtt) formats (timecode highlighting)
+ * Haskell highlighting also featured.
+ * Dates panel becomes more fancy.
+- Build with QT6 on Factory
+- Add 0001-Add-metainfo-use-GNUInstallDirs-install-metainfo-des.patch
+
+-------------------------------------------------------------------
Old:
----
org.semiletov.tea.appdata.xml
org.semiletov.tea.desktop
tea-qt-50.1.0.tar.gz
New:
----
0001-Add-metainfo-use-GNUInstallDirs-install-metainfo-des.patch
tea-qt-60.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tea.spec ++++++
--- /var/tmp/diff_new_pack.qUak1o/_old 2021-05-19 17:49:22.313536708 +0200
+++ /var/tmp/diff_new_pack.qUak1o/_new 2021-05-19 17:49:22.313536708 +0200
@@ -1,7 +1,7 @@
#
# spec file for package tea
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,25 +16,40 @@
#
+%if 0%{suse_version} >= 1550
+%bcond_without qt6
+%else
+%bcond_with qt6
+%endif
Name: tea
-Version: 50.1.0
+Version: 60.1.0
Release: 0
Summary: Qt-based text editor with image viewer
License: GPL-3.0-or-later
URL: http://semiletov.org/tea
Source:
https://github.com/psemiletov/tea-qt/archive/%{version}.tar.gz#/%{name}-qt-%{version}.tar.gz
-Source1: org.semiletov.tea.desktop
-Source2: org.semiletov.tea.appdata.xml
+# PATCH-FEATURE-UPSTREAM -- https://github.com/psemiletov/tea-qt/pull/45
+Patch0: 0001-Add-metainfo-use-GNUInstallDirs-install-metainfo-des.patch
BuildRequires: cmake
BuildRequires: hicolor-icon-theme
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
+%if %{with qt6}
+BuildRequires: cmake(Qt6Core)
+BuildRequires: cmake(Qt6Core5Compat)
+BuildRequires: cmake(Qt6Gui)
+BuildRequires: cmake(Qt6PrintSupport)
+BuildRequires: cmake(Qt6Qml)
+BuildRequires: cmake(Qt6Quick)
+BuildRequires: cmake(Qt6Widgets)
+%else
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5Widgets)
+%endif
BuildRequires: pkgconfig(hunspell)
BuildRequires: pkgconfig(zlib)
@@ -47,34 +62,25 @@
%prep
%setup -q -n tea-qt-%{version}
-
-cp -a %{SOURCE1} org.semiletov.tea.desktop
-cp -a %{SOURCE2} org.semiletov.tea.appdata.xml
-sed -i '/DESTINATION share\/applications/d' CMakeLists.txt
+%patch0 -p1
%build
%cmake \
-DUSE_ASPELL=ON \
-DUSE_PRINTER=ON \
-DUSE_PDF=ON \
- -DUSE_DJVU=ON \
- -DUSE_QML=ON
+ -DUSE_DJVU=ON
%cmake_build
%install
%cmake_install
-install -Dpm 0644 org.semiletov.tea.desktop
%{buildroot}%{_datadir}/applications/org.semiletov.tea.desktop
-install -Dpm 0644 icons/%{name}-icon-v3-01.png
%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-install -Dpm 0644 org.semiletov.tea.appdata.xml
%{buildroot}%{_datadir}/metainfo/org.semiletov.tea.appdata.xml
-
%files
%license COPYING
-%doc AUTHORS ChangeLog NEWS* README TODO
+%doc AUTHORS ChangeLog NEWS* README.md TODO
%{_bindir}/%{name}
-%{_datadir}/applications/org.semiletov.tea.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}*.*
-%dir %{_datadir}/metainfo/
-%{_datadir}/metainfo/org.semiletov.tea.appdata.xml
+%{_datadir}/metainfo/org.semiletov.tea.metainfo.xml
+%{_datadir}/applications/org.semiletov.tea.desktop
%changelog
++++++ 0001-Add-metainfo-use-GNUInstallDirs-install-metainfo-des.patch ++++++
>From 32e05bb203811cb00d91af8f025b9087e5e2fdd9 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <r...@fthiessen.de>
Date: Tue, 18 May 2021 18:50:04 +0200
Subject: [PATCH] Add metainfo, use GNUInstallDirs, install metainfo + desktop
---
CMakeLists.txt | 23 +++++++++++++++--------
desktop/metainfo.xml | 24 ++++++++++++++++++++++++
desktop/tea.desktop | 7 +++++--
3 files changed, 44 insertions(+), 10 deletions(-)
create mode 100644 desktop/metainfo.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c4d078..6d8f99e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0.2)
set (QT_MIN_VERSION "5.4.0")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -119,6 +119,11 @@ set(tea_DESKTOP
./desktop/tea.desktop
)
+set(tea_METAINFO
+ ./desktop/metainfo.xml
+)
+
+set(TEA_FQN "org.semiletov.tea")
#add_custom_target(dist
#COMMAND git archive
--prefix=${PROJECT}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}/
master | bzip2
>${PROJECT}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.tar.bz2
@@ -241,13 +246,15 @@ if(Qt${QT_VERSION_MAJOR} STREQUAL "Qt5")
target_link_libraries(tea Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::Core)
endif()
+include (GNUInstallDirs)
-install (TARGETS tea DESTINATION bin)
-install (FILES ${tea_ICONSVG} DESTINATION share/icons/hicolor/scalable/apps)
-install (FILES ${tea_ICONPNG32} DESTINATION share/icons/hicolor/32x32/apps)
-install (FILES ${tea_ICONPNG48} DESTINATION share/icons/hicolor/48x48/apps)
-install (FILES ${tea_ICONPNG64} DESTINATION share/icons/hicolor/64x64/apps)
-install (FILES ${tea_ICONPNG128} DESTINATION share/icons/hicolor/128x128/apps)
+install (TARGETS tea DESTINATION ${CMAKE_INSTALL_BINDIR})
+install (FILES ${tea_ICONSVG} DESTINATION
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
+install (FILES ${tea_ICONPNG32} DESTINATION
${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps)
+install (FILES ${tea_ICONPNG48} DESTINATION
${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps)
+install (FILES ${tea_ICONPNG64} DESTINATION
${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps)
+install (FILES ${tea_ICONPNG128} DESTINATION
${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps)
-install (FILES ${tea_DESKTOP} DESTINATION share/applications)
+install (FILES ${tea_DESKTOP} RENAME ${TEA_FQN}.desktop DESTINATION
${CMAKE_INSTALL_DATADIR}/applications)
+install (FILES ${tea_METAINFO} RENAME ${TEA_FQN}.metainfo.xml DESTINATION
${CMAKE_INSTALL_DATADIR}/metainfo)
diff --git a/desktop/metainfo.xml b/desktop/metainfo.xml
new file mode 100644
index 0000000..0bc821c
--- /dev/null
+++ b/desktop/metainfo.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2016 Sorokin Alexei <sor.ale...@meowr.ru> -->
+<component type="desktop">
+ <id>org.semiletov.tea</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-3.0-or-later</project_license>
+ <name>TEA</name>
+ <summary>Powerful text editor in Qt</summary>
+ <description>
+ <p>
+ TEA is a Qt-based text editor for UNIX-like systems. With an
+ ultimate small size TEA provides you hundreds of functions.
+ </p>
+ </description>
+
+ <launchable type="desktop-id">org.semiletov.tea.desktop</launchable>
+
+ <url type="homepage">http://semiletov.org/tea</url>
+ <developer_name>Peter Semiletov</developer_name>
+
+ <provides>
+ <binary>tea</binary>
+ </provides>
+</component>
diff --git a/desktop/tea.desktop b/desktop/tea.desktop
index 1dafaed..b806505 100644
--- a/desktop/tea.desktop
+++ b/desktop/tea.desktop
@@ -4,12 +4,15 @@ Terminal=false
Type=Application
Icon=tea
Exec=tea %U
-Categories=Utility;TextEditor;
+Categories=Qt;Utility;TextEditor;
StartupNotify=false
-MimeType=text/plain;
NoDisplay=false
Version=1.1
Keywords=text editor;text;editor;
Keywords[de]=Texteditor;Text;Editor;
Comment=Text editor with hundreds of functions
Comment[de]=Texteditor mit hunderten Funktionen
+Comment[eo]=Funkcia tekstoredaktilo per Qt
+Comment[ru]=???????????????????????????? ?????????????????? ????????????????
???? Qt
+Comment[uk]=???????????????????????????? ?????????????????? ????????????????
???? Qt
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
--
2.26.2
++++++ tea-qt-50.1.0.tar.gz -> tea-qt-60.1.0.tar.gz ++++++
++++ 46613 lines of diff (skipped)
