Commit 9b1807d9 authored by Lorn Potter's avatar Lorn Potter

[connectionagent] remove lipstick dependency, as it is not needed

parent 55f1e04b
......@@ -5,14 +5,12 @@ QT -= gui
equals(QT_MAJOR_VERSION, 4): {
TARGET = connectionagent
INCLUDEPATH += libconnman-qt
INCLUDEPATH += lipstick
LIBS += -lconnman-qt4 -llipstick
LIBS += -lconnman-qt4
}
equals(QT_MAJOR_VERSION, 5): {
TARGET = connectionagent
INCLUDEPATH += libconnman-qt5
INCLUDEPATH += lipstick
LIBS += -lconnman-qt5 -llipstick-qt5
LIBS += -lconnman-qt5
}
CONFIG += console link_pkgconfig
......
......@@ -9,7 +9,7 @@ Name: connectionagent-qt5
# << macros
Summary: User Agent daemon
Version: 0.6.6
Version: 0.6.7
Release: 0
Group: Communications/Connectivity Adaptation
License: LGPLv2
......@@ -19,10 +19,7 @@ Source100: connectionagent-qt5.yaml
Requires: connman-qt5-declarative
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(connman-qt5)
BuildRequires: pkgconfig(lipstick-qt5)
%description
Connection Agent provides multi user access to connman's User Agent.
......@@ -57,7 +54,6 @@ This package contains the declarative plugin for connection agent.
# >> build pre
# << build pre
export QT_SELECT=5
%qmake5
make %{?jobs:-j%jobs}
......@@ -69,8 +65,7 @@ make %{?jobs:-j%jobs}
rm -rf %{buildroot}
# >> install pre
# << install pre
export QT_SELECT=5
%qmake5_install
%qmake_install
# >> install post
# << install post
......@@ -89,3 +84,10 @@ export QT_SELECT=5
# >> files declarative
# << files declarative
%files test
%defattr(-,root,root,-)
/opt/sdk/bin/testqml
/opt/sdk/share/applications/testqml.desktop
/opt/sdk/share/testqml/*
# >> files test
# << files test
Name: connectionagent-qt5
Summary: User Agent daemon
Version: 0.6.6
Version: 0.6.7
Release: 0
Group: "Communications/Connectivity Adaptation"
License: LGPLv2
......@@ -18,7 +18,6 @@ PkgConfigBR:
- Qt5Core
- Qt5DBus
- connman-qt5
- lipstick-qt5
Configure: none
Builder: qmake5
......
......@@ -9,7 +9,7 @@ Name: connectionagent
# << macros
Summary: User Agent daemon
Version: 0.6.6
Version: 0.6.7
Release: 0
Group: Communications/Connectivity Adaptation
License: LGPLv2
......@@ -20,7 +20,6 @@ Requires: connman-qt-declarative
BuildRequires: pkgconfig(QtCore)
BuildRequires: pkgconfig(QtDBus)
BuildRequires: pkgconfig(connman-qt4)
BuildRequires: pkgconfig(lipstick)
%description
Connection Agent provides multi user access to connman's User Agent.
......
Name: connectionagent
Summary: User Agent daemon
Version: 0.6.6
Version: 0.6.7
Release: 0
Group: "Communications/Connectivity Adaptation"
License: LGPLv2
......@@ -18,7 +18,6 @@ PkgConfigBR:
- QtCore
- QtDBus
- connman-qt4
- lipstick
Configure: none
Builder: qmake
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment