Merge pull request #24 from nemomobile-packages/vdv-devel

[qmf] Make installation of SSO provider optional.
sailfishos · Feb 4, 2014 · 48a45ca · 48a45ca
2 parents d696f8b + ed4b0a8
commit 48a45ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/qmf/src/libraries/qmfclient/qmfclient.pro b/qmf/src/libraries/qmfclient/qmfclient.pro
@@ -186,16 +186,18 @@ packagesExist(accounts-qt) | packagesExist(accounts-qt5) {
                ssosessionmanager.cpp \
                ssoauthplugin.cpp
 
-    # THIS NEEDS TO BE CHECKED
-    # Install email SSO provider description
-    sso_providers.files = share/email.provider
-    sso_providers.path  = $$QMF_INSTALL_ROOT/share/accounts/providers
+    contains(DEFINES,INSTALL_SSO_PROVIDER) {
+        # Install email SSO provider description
+        sso_providers.files = share/email.provider
+        sso_providers.path  = $$QMF_INSTALL_ROOT/share/accounts/providers
 
-    # Install email SSO service description
-    sso_services.files = share/email.service
-    sso_services.path  = $$QMF_INSTALL_ROOT/share/accounts/services
+        # Install email SSO service description
+        sso_services.files = share/email.service
+        sso_services.path  = $$QMF_INSTALL_ROOT/share/accounts/services
+
+        INSTALLS += sso_providers sso_services
+    }
 
-    INSTALLS += sso_providers sso_services
 } else {
      warning("Accounts-qt support requires accounts-qt")
 }

diff --git a/rpm/qmf-qt5.spec b/rpm/qmf-qt5.spec
@@ -239,7 +239,6 @@ ln -sf ../messageserver5.service "$UNIT_DIR/messageserver5.service"
 %{_libdir}/libqmfclient5.so.*
 %{_libdir}/qmf/plugins5/contentmanagers/libqmfstoragemanager.so
 %{_libdir}/qmf/plugins5/ssoauth/libpasswordplugin.so
-%{_datadir}/accounts/*
 # << files libqmfclient1-qt5
 
 %files examples