From 648e0cc8e5ebac749554dd4b037a0d200f577c5f Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Mon, 14 Jul 2014 17:13:16 +0200 Subject: Removed commhistory-qt5 dependency --- daemon/daemon.pro | 3 +-- rpm/pebble.spec | 11 +++++------ rpm/pebble.yaml | 1 - 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/daemon/daemon.pro b/daemon/daemon.pro index cfcdae1..9642a81 100644 --- a/daemon/daemon.pro +++ b/daemon/daemon.pro @@ -5,7 +5,7 @@ CONFIG += link_pkgconfig QT -= gui QT += bluetooth dbus contacts -PKGCONFIG += commhistory-qt5 mlite5 +PKGCONFIG += mlite5 QMAKE_CXXFLAGS += -std=c++0x LIBS += -L$$OUT_PWD/../ext/Log4Qt/ -llog4qt @@ -61,5 +61,4 @@ lib.files += $$OUT_PWD/../ext/Log4Qt/*.s* lib.path = /usr/share/pebble/lib # unnecesary includes, just so QtCreator could find headers... :-( -INCLUDEPATH += $$[QT_HOST_PREFIX]/include/commhistory-qt5 INCLUDEPATH += $$[QT_HOST_PREFIX]/include/mlite5 diff --git a/rpm/pebble.spec b/rpm/pebble.spec index 2ccceb0..1eda359 100644 --- a/rpm/pebble.spec +++ b/rpm/pebble.spec @@ -28,7 +28,6 @@ BuildRequires: pkgconfig(Qt5Contacts) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(commhistory-qt5) BuildRequires: pkgconfig(mlite5) BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 BuildRequires: desktop-file-utils @@ -69,6 +68,11 @@ desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/*.desktop +%post +# >> post +systemctl --user daemon-reload +# << post + %files %defattr(-,root,root,-) %{_bindir} @@ -81,8 +85,3 @@ desktop-file-install --delete-original \ %{_datadir}/%{name}/lib # >> files # << files - -%post -# >> post -systemctl --user daemon-reload -# << post diff --git a/rpm/pebble.yaml b/rpm/pebble.yaml index 16f3f2c..b976617 100644 --- a/rpm/pebble.yaml +++ b/rpm/pebble.yaml @@ -18,7 +18,6 @@ PkgConfigBR: - Qt5Quick - Qt5Qml - Qt5Core -- commhistory-qt5 - mlite5 - sailfishapp >= 0.0.10 Requires: -- cgit v1.2.3