From 1c48fd1537677fff27fe723813ab868c01b87d0d Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin+git@viroteck.net>
Date: Tue, 25 Jun 2013 16:43:26 +0000
Subject: [PATCH] [connectionagent] Don't build/install daemon and
 configuration for Qt 4.

This also makes the Qt 4 packages depend on the Qt 5 package (for the daemon
implementation).

For the time being, Qt 4 declarative/tests are still built, and the Qt 4 tests
package is not co-installable with Qt 5.
---
 connectionagent.pro          |  5 +++--
 rpm/connectionagent-qt5.spec |  2 ++
 rpm/connectionagent-qt5.yaml |  5 ++++-
 rpm/connectionagent.spec     | 15 ++-------------
 rpm/connectionagent.yaml     | 14 +++-----------
 5 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/connectionagent.pro b/connectionagent.pro
index 864067f..70f2d2e 100644
--- a/connectionagent.pro
+++ b/connectionagent.pro
@@ -2,8 +2,6 @@ TEMPLATE = subdirs
 
 TEMPLATE += ordered
 
-SUBDIRS += config
-SUBDIRS += connd
 SUBDIRS += connectionagentplugin
 SUBDIRS += test
 
@@ -14,6 +12,9 @@ equals(QT_MAJOR_VERSION, 4):  {
 }
 
 equals(QT_MAJOR_VERSION, 5):  {
+    SUBDIRS += config
+    SUBDIRS += connd
+
     OTHER_FILES += rpm/connectionagent-qt5.spec \
                    rpm/connectionagent-qt5.yaml
 }
diff --git a/rpm/connectionagent-qt5.spec b/rpm/connectionagent-qt5.spec
index 3ce8efe..5ab65b0 100644
--- a/rpm/connectionagent-qt5.spec
+++ b/rpm/connectionagent-qt5.spec
@@ -23,6 +23,8 @@ BuildRequires:  pkgconfig(connman-qt5)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Qml)
+Provides:   connectionagent > 0.7.6
+Obsoletes:   connectionagent <= 0.7.6
 
 %description
 Connection Agent provides multi user access to connman's User Agent.
diff --git a/rpm/connectionagent-qt5.yaml b/rpm/connectionagent-qt5.yaml
index 6da7915..9729d64 100644
--- a/rpm/connectionagent-qt5.yaml
+++ b/rpm/connectionagent-qt5.yaml
@@ -13,7 +13,10 @@ Sources:
     - "%{name}-%{version}.tar.bz2"
 Requires:
     - connman-qt5-declarative
-    
+Provides:
+    - connectionagent > 0.7.6
+Obsoletes:
+    - connectionagent <= 0.7.6
 PkgConfigBR:
     - Qt5Core
     - Qt5DBus
diff --git a/rpm/connectionagent.spec b/rpm/connectionagent.spec
index 4cf8f6c..62755ae 100644
--- a/rpm/connectionagent.spec
+++ b/rpm/connectionagent.spec
@@ -16,7 +16,6 @@ License:    LGPLv2
 URL:        http://github.com/lpotter/connectionagent
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  connectionagent.yaml
-Requires:   connman-qt-declarative
 BuildRequires:  pkgconfig(QtCore)
 BuildRequires:  pkgconfig(QtDBus)
 BuildRequires:  pkgconfig(connman-qt4)
@@ -30,8 +29,7 @@ It also provides autoconnecting features.
 %package declarative
 Summary:    Declarative plugin for connection agent.
 Group:      Development/Tools
-Requires:   %{name} = %{version}-%{release}
-Requires:   %{name} = %{version}
+Requires:   connectionagent-qt5
 
 %description declarative
 This package contains the declarative plugin for connection agent.
@@ -39,8 +37,7 @@ This package contains the declarative plugin for connection agent.
 %package test
 Summary:    Tests for connection agent.
 Group:      Development/Tools
-Requires:   %{name} = %{version}-%{release}
-Requires:   %{name} = %{version}
+Requires:   connectionagent-qt5
 
 %description test
 This package contains the tests for connection agent.
@@ -71,14 +68,6 @@ rm -rf %{buildroot}
 # >> install post
 # << install post
 
-%files
-%defattr(-,root,root,-)
-%{_bindir}/connectionagent
-%{_datadir}/dbus-1/services/com.jolla.Connectiond.service
-%{_libdir}/systemd/user/connectionagent.service
-%{_sysconfdir}/dbus-1/session.d/connectionagent.conf
-# >> files
-# << files
 
 %files declarative
 %defattr(-,root,root,-)
diff --git a/rpm/connectionagent.yaml b/rpm/connectionagent.yaml
index 24e8056..3b038e8 100644
--- a/rpm/connectionagent.yaml
+++ b/rpm/connectionagent.yaml
@@ -11,9 +11,6 @@ Description: |
 
 Sources:
     - "%{name}-%{version}.tar.bz2"
-Requires:
-    - connman-qt-declarative
-    
 PkgConfigBR:
     - QtCore
     - QtDBus
@@ -21,19 +18,14 @@ PkgConfigBR:
     - QtNetwork
 Configure: none
 Builder: qmake
-Files:
-    - "%{_bindir}/connectionagent"
-    - "%{_datadir}/dbus-1/services/com.jolla.Connectiond.service"
-    - "%{_libdir}/systemd/user/connectionagent.service"
-    - "%{_sysconfdir}/dbus-1/session.d/connectionagent.conf"
-
+NoFiles: true
 SubPackages:
     - Name: declarative
       Summary: Declarative plugin for connection agent.
       Group: Development/Tools
       Description: This package contains the declarative plugin for connection agent.
       Requires:
-          - "%{name} = %{version}"
+          - connectionagent-qt5
       Files:
           - "%{_libdir}/qt4/imports/com/jolla/connection/*"
 
@@ -42,7 +34,7 @@ SubPackages:
       Group: Development/Tools
       Description: This package contains the tests for connection agent.
       Requires:
-          - "%{name} = %{version}"
+          - connectionagent-qt5
       Files:
         - "/opt/sdk/bin/testqml"
         - "/opt/sdk/share/applications/testqml.desktop"