Hello community, here is the log from the commit of package notepadqq for openSUSE:Factory checked in at 2018-02-01 21:30:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notepadqq (Old) and /work/SRC/openSUSE:Factory/.notepadqq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notepadqq" Thu Feb 1 21:30:28 2018 rev:10 rq:571679 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/notepadqq/notepadqq.changes 2017-10-18 10:54:54.188428481 +0200 +++ /work/SRC/openSUSE:Factory/.notepadqq.new/notepadqq.changes 2018-02-01 21:31:40.722645315 +0100 @@ -1,0 +2,8 @@ +Thu Feb 1 11:38:09 UTC 2018 - sor.ale...@meowr.ru + +- Fix the RPM group. +- Add notepadqq-1.2.0-fix-qt-5.10.patch: Fix Qt 5.10+ version + detection (commit c340237) (boo#1078736, + gh#notepadqq/notepadqq#516). + +------------------------------------------------------------------- New: ---- notepadqq-1.2.0-fix-qt-5.10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notepadqq.spec ++++++ --- /var/tmp/diff_new_pack.1O7sgB/_old 2018-02-01 21:31:41.270619679 +0100 +++ /var/tmp/diff_new_pack.1O7sgB/_new 2018-02-01 21:31:41.274619493 +0100 @@ -1,7 +1,7 @@ # # spec file for package notepadqq # -# Copyright (c) 2017 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 @@ -21,14 +21,16 @@ Release: 0 Summary: Notepad++-like editor License: GPL-3.0+ -Group: Productivity/Editors/Other +Group: Productivity/Text/Editors Url: http://notepadqq.altervista.org/ Source: http://ppa.launchpad.net/%{name}-team/%{name}/ubuntu/pool/main/n/%{name}/%{name}_%{version}.orig.tar.bz2 +# PATCH-FIX-UPSTREAM notepadqq-1.2.0-fix-qt-5.10.patch boo#1078736 gh#notepadqq/notepadqq#516 -- Fix Qt 5.10+ version detection (commit c340237). +Patch0: notepadqq-1.2.0-fix-qt-5.10.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libqt5-linguist -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) >= 5.3 BuildRequires: pkgconfig(Qt5Gui) >= 5.3 @@ -46,28 +48,28 @@ %prep %setup -q -c +%patch0 -p1 pushd src/extension_tools/node_modules/archiver/node_modules -chmod 755 tar-stream/node_modules/bl/test/sauce.js -chmod 755 glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh +chmod 0755 tar-stream/node_modules/bl/test/sauce.js +chmod 0755 glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh popd -chmod 644 src/editor/libs/codemirror/mode/sas/sas.js +chmod 0644 src/editor/libs/codemirror/mode/sas/sas.js %build %qmake5 \ PREFIX=%{_prefix} \ - QMAKE_CXXFLAGS="%optflags" \ + QMAKE_CXXFLAGS="%{optflags}" \ LRELEASE=%{_libqt5_bindir}/lrelease \ notepadqq.pro -%make_jobs +make %{?_smp_mflags} V=1 %install %qmake5_install %suse_update_desktop_file -r %{name} Utility TextEditor -find %{buildroot}/ -name '.*' -print0 | xargs -0 rm -rf - -%fdupes %{buildroot}%{_datadir} +%fdupes %{buildroot}%{_datadir}/ +%if 0%{?suse_version} <= 1320 %post %desktop_database_post %icon_theme_cache_post @@ -75,17 +77,17 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files -%defattr(-,root,root) %doc CONTRIBUTING.md COPYING README.md %{_bindir}/%{name} %{_libexecdir}/%{name}/ %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %if 0%{?suse_version} == 1320 -%dir %{_datadir}/icons/hicolor/512x512 -%dir %{_datadir}/icons/hicolor/512x512/apps +%dir %{_datadir}/icons/hicolor/512x512/ +%dir %{_datadir}/icons/hicolor/512x512/apps/ %endif %{_datadir}/icons/hicolor/*/apps/%{name}.* ++++++ notepadqq-1.2.0-fix-qt-5.10.patch ++++++ --- a/src/ui/main.cpp +++ b/src/ui/main.cpp @@ -141,9 +141,9 @@ int main(int argc, char *argv[]) void checkQtVersion() { QString runtimeVersion = qVersion(); - if (runtimeVersion.startsWith("5.0") || - runtimeVersion.startsWith("5.1") || - runtimeVersion.startsWith("5.2")) { + int minorVersion = runtimeVersion.split(".")[1].toInt(); + if (runtimeVersion.startsWith("5") && + minorVersion <= 3) { Notepadqq::setOldQt(true); }
