Hello community, here is the log from the commit of package sqliteman for openSUSE:Factory checked in at 2017-05-10 20:50:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sqliteman (Old) and /work/SRC/openSUSE:Factory/.sqliteman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sqliteman" Wed May 10 20:50:31 2017 rev:2 rq:493321 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sqliteman/sqliteman.changes 2015-03-18 13:08:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sqliteman.new/sqliteman.changes 2017-05-10 20:50:34.418372282 +0200 @@ -1,0 +2,6 @@ +Sun May 7 14:52:58 UTC 2017 - tchva...@suse.com + +- Add fix to build under latest qscintilla split for qt4 and qt5: + * sqliteman-fix-qscintilla-find.patch + +------------------------------------------------------------------- New: ---- sqliteman-fix-qscintilla-find.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqliteman.spec ++++++ --- /var/tmp/diff_new_pack.cEUTuj/_old 2017-05-10 20:50:35.038284806 +0200 +++ /var/tmp/diff_new_pack.cEUTuj/_new 2017-05-10 20:50:35.042284242 +0200 @@ -1,7 +1,7 @@ # # spec file for package sqliteman # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2007 Petr Vanek # # All modifications and additions to the file contributed by third parties @@ -25,14 +25,25 @@ Group: Productivity/Databases/Tools Url: http://sqliteman.yarpen.cz/ Source0: http://download.sourceforge.net/%{name}/%{version}/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM: detect our name of qscintilla qt4 library +Patch0: sqliteman-fix-qscintilla-find.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: fdupes -BuildRequires: libqscintilla-devel -BuildRequires: libqt4-devel >= 4.2.0 BuildRequires: libqt4-sql-sqlite +BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(QtCore) >= 4.2.0 +BuildRequires: pkgconfig(QtDBus) >= 4.2.0 +BuildRequires: pkgconfig(QtGui) >= 4.2.0 +BuildRequires: pkgconfig(QtSql) >= 4.2.0 +BuildRequires: pkgconfig(QtXml) >= 4.2.0 +Requires: libqt4-sql-sqlite +%if 0%{?suse_version} > 1315 +BuildRequires: libqscintilla_qt4-devel +%else +BuildRequires: libqscintilla-devel +%endif %description The best developer's and/or admin's GUI tool for Sqlite3 @@ -41,13 +52,13 @@ %prep %setup -q +%patch0 -p1 rm -rf %{name}/qscintilla2 %build %cmake make %{?_smp_mflags} - %install %cmake_install %suse_update_desktop_file -G "Toolkit for Sqlite3 database" %{name} Office Database ++++++ sqliteman-fix-qscintilla-find.patch ++++++ Index: sqliteman-1.2.2/cmake/modules/FindQScintilla.cmake =================================================================== --- sqliteman-1.2.2.orig/cmake/modules/FindQScintilla.cmake +++ sqliteman-1.2.2/cmake/modules/FindQScintilla.cmake @@ -21,10 +21,10 @@ IF(QT4_FOUND) "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci ) - SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2) + SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 qscintilla2_qt4 libqscintilla2_qt4) FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES ${QSCINTILLA_NAMES} - PATHS ${QT_LIBRARY_DIR} + PATHS ${QT_LIBRARY_DIR} ) IF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
