1
0
forked from pool/sqlitebrowser

Accepting request 386799 from home:pluskalm:branches:server:database

OBS-URL: https://build.opensuse.org/request/show/386799
OBS-URL: https://build.opensuse.org/package/show/server:database/sqlitebrowser?expand=0&rev=18
This commit is contained in:
Martin Pluskal 2016-04-10 12:36:16 +00:00 committed by Git OBS Bridge
parent a6da1570ba
commit 8ea582809d
2 changed files with 7 additions and 5 deletions

View File

@ -1,5 +1,5 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 10 09:28:05 UTC 2016 - mpluskal@suse.com Sun Apr 10 09:55:39 UTC 2016 - mpluskal@suse.com
- Drop some build dependencies - Drop some build dependencies
* autotools are not used * autotools are not used
@ -7,6 +7,7 @@ Sun Apr 10 09:28:05 UTC 2016 - mpluskal@suse.com
- Add correct dependencies for post/postun macros - Add correct dependencies for post/postun macros
- Use cmake macros - Use cmake macros
- Drop some conditional build dependencies for unsupported releases - Drop some conditional build dependencies for unsupported releases
- Build with qt5 where possible
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 9 15:32:00 UTC 2016 - mailaender@opensuse.org Sat Apr 9 15:32:00 UTC 2016 - mailaender@opensuse.org

View File

@ -28,21 +28,22 @@ Source1: sqlitebrowser.1
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: sqlite3-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(sqlite3)
Requires(post): hicolor-icon-theme Requires(post): hicolor-icon-theme
Requires(post): update-desktop-files Requires(post): update-desktop-files
Requires(postun): hicolor-icon-theme Requires(postun): hicolor-icon-theme
Requires(postun): update-desktop-files Requires(postun): update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1320 # not on SLE-12
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
BuildRequires: libqt5-linguist-devel BuildRequires: libqt5-linguist-devel
BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(glib-2.0)
%else %else
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
%endif %endif
@ -71,7 +72,7 @@ to:
%build %build
%cmake \ %cmake \
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
-DUSE_QT5=true \ -DUSE_QT5=true \
%endif %endif
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_BUILD_TYPE=RelWithDebInfo