make package work a bit better

connectionagent.pro

@@ -2,7 +2,10 @@ TEMPLATE = subdirs
 
 TEMPLATE += ordered
 
+
+SUBDIRS += rpm
 SUBDIRS += connd
 SUBDIRS += connectionagentplugin
 SUBDIRS += test/testqml
-SUBDIRS += rpm
+
+

rpm/connectionagent.spec

@@ -0,0 +1,95 @@
+# 
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.25
+# 
+
+Name:       connectionagent
+
+# >> macros
+# << macros
+
+Summary:    User Agent daemon
+Version:    0.1
+Release:    0
+Group:      Communications/Connectivity Adaptation
+License:    LGPLv2
+URL:        http://github.com/lpotter/connectionagent
+Source0:    %{name}-%{version}.tar.bz2
+Source100:  connectionagent.yaml
+Requires:   qt
+Requires:   qt-dbus
+Requires:   connman-qt
+Requires:   connman-qt-declarative
+BuildRequires:  pkgconfig(QtCore)
+BuildRequires:  pkgconfig(QtDBus)
+
+%description
+Connection Agent provides multi user access to connman's User Agent.
+
+
+%package declarative
+Summary:    Declarative plugin for connection agent.
+Group:      Development/Tools
+Requires:   %{name} = %{version}-%{release}
+Requires:   %{name} = %{version}
+
+%description declarative
+This package contains the declarative plugin for connection agent.
+
+%package test
+Summary:    Declarative test for connection agent.
+Group:      Development/Tools
+Requires:   %{name} = %{version}-%{release}
+Requires:   %{name} = %{version}
+
+%description test
+This package contains the declarative plugin for connection agent.
+
+
+%prep
+%setup -q -n %{name}-%{version}
+
+# >> setup
+# << setup
+
+%build
+# >> build pre
+# << build pre
+
+%qmake 
+
+make %{?jobs:-j%jobs}
+
+# >> build post
+# << build post
+
+%install
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
+%qmake_install
+
+# >> install post
+# << install post
+
+
+%files
+%defattr(-,root,root,-)
+%{_usr}/bin/connectionagent
+%{_usr}/share/dbus-1/services/com.jolla.Connectiond.service
+# >> files
+# << files
+
+%files declarative
+%defattr(-,root,root,-)
+%{_libdir}/qt4/imports/com/jolla/connection/*
+# >> 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

rpm/connectionagent.yaml

@@ -1,28 +1,30 @@
-Name: Connectionagent
+Name: connectionagent
 Summary: User Agent daemon
 Version: 0.1
 Release: 0
-Group: "System/ConnectionAgent"
-License: LGPLv2+
-URL: http://gitorious.org/connectionagent
+Group: "Communications/Connectivity Adaptation"
+License: LGPLv2
+URL: http://github.com/lpotter/connectionagent 
 Description: |
     Connection Agent provides multi user access to connman's User Agent.
 Sources:
     - "%{name}-%{version}.tar.bz2"
-    - "connectionagent.service"
 Requires:
     - qt
     - qt-dbus
-
+    - connman-qt
+    - connman-qt-declarative
+
 PkgConfigBR:
     - QtCore
     - QtDBus
 
+
 Configure: none
 Builder: qmake
-UseAsNeeded: no
-
-QMakeOptions:
+Files:
+    - "%{_usr}/bin/connectionagent"
+    - "%{_usr}/share/dbus-1/services/com.jolla.Connectiond.service"
 
 SubPackages:
     - Name: declarative
@@ -34,3 +36,15 @@ SubPackages:
       Files:
           - "%{_libdir}/qt4/imports/com/jolla/connection/*"
 
+    - Name: test
+      Summary: Declarative test for connection agent.
+      Group: Development/Tools
+      Description: This package contains the declarative plugin for connection agent.
+      Requires:
+          - "%{name} = %{version}"
+      Files:
+        - "/opt/sdk/bin/testqml"
+        - "/opt/sdk/share/applications/testqml.desktop"
+        - "/opt/sdk/share/testqml/*"
+
+

rpm/rpm.pro

@@ -1,8 +1,9 @@
 TEMPLATE = subdirs
+
 OTHER_FILES += \
  com.jolla.Connectiond.service
 
-service.path = $${INSTALL_PREFIX}/share/dbus-1/services
+service.path = $${INSTALL_PREFIX}/usr/share/dbus-1/services
 service.files = com.jolla.Connectiond.service