Simplify packaging

The modularity of activationd does not seem to be used in real life.

Change-Id: I680d8dff90862ddd3687058d99595dc5fa9326c6

diff --git a/packaging/activationd.spec b/packaging/activationd.spec
index 5132e965de9eaf29d3e9f36e2dc34b39164b29c7..25dce2bb72dfeee813e23c3b9ce6c6eaceacbba0 100644 (file)
--- a/packaging/activationd.spec
+++ b/packaging/activationd.spec
@@ -1,81 +1,35 @@
+%define with_activationd_glib_support 1
+
 Name:       activationd
-Version:    0.2.1
+Version:    0.2.2
 Release:    0
 License:    Apache-2.0, MIT
 Source0:    %{name}-%{version}.tar.xz
 Source1001: %{name}.manifest
 Summary:    Event-based activation daemon
 Group:      System/Monitoring
-Requires:   event-processing-core
-Requires:   event-processing-vconf
-Requires:   event-processing-dbus
-Requires:   event-processing-unit-control
-Requires:   event-processing-activation-dm
 Requires:   activationd-plugin
 BuildRequires: pkgconfig(vconf)
 
-%define with_activationd_glib_support 1
-
-%description
-Activationd allows starting systemd units based on various system events.
-
-%package -n event-processing-core
-Summary:       Event handling framework
 BuildRequires: pkgconfig(libsystemd)
 BuildRequires: pkgconfig(json-c)
 %if %{with_activationd_glib_support}
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(libsyscommon)
 %endif
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(dlog)
 
-%description -n event-processing-core
-This package provides framework for handling system-wide events.
-
-%package -n event-processing-extra
-Summary:    activationd test services
-Group:      System/Monitoring
-
-%description -n event-processing-extra
-Event processing extra modules
-
-%package -n event-processing-vconf
-Summary:    vconf listener module for epc
-Group:      System/Monitoring
-BuildRequires: pkgconfig(vconf)
-Requires:   event-processing-core
-
-%description -n event-processing-vconf
-This package provides a listener for vconf events
-
-%package -n event-processing-dbus
-Summary:    dbus listener module for epc
-Group:      System/Monitoring
-
-%package -n event-processing-unit-control
-Summary:    unit control dbus api module for epc
-Group:      System/Monitoring
-Requires:   event-processing-extra = %{version}
-
-%description -n event-processing-unit-control
-This package provides dbus api for unit control
-
-%description -n event-processing-dbus
-This package provides a listener for dbus events
-
-%package -n event-processing-activation-dm
-Summary:    Activation decision maker
-Group:      System/Monitoring
-Requires:   event-processing-core
-
-%description -n event-processing-activation-dm
-This package provides a decision maker for activating systemd units based on various system events
+%description
+Activationd allows starting systemd units based on various system events.
 
 %package -n activationd-test-services
 Summary:    activationd test services
 Group:      System/Monitoring
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(glib-2.0)
-Requires:   event-processing-core
+Requires:   actd
 
 %description -n activationd-test-services
 Services used to test activationd functionality
@@ -91,9 +45,6 @@ Files used in external modules development
 Summary:    Activationd API
 Group:      Development/Libraries
 License:    MIT
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(dlog)
 
 %description -n libactd
 This library provides API for interaction with modules
@@ -149,19 +100,32 @@ mkdir -p %{buildroot}/%{enabled_moduledir}
        echo %{moduleconfdir}/%1.so >> %2-files; \
        echo %{enabled_moduledir}/%1.so >> %2-files;
 
-%install_module service_restart_action extra
-%install_module unit_start_action extra
-%install_module forward_signal_action extra
-%install_module vconf_key_changed_event vconf
-%install_module vconf_listener vconf
-%install_module dbus_signal_event dbus
-%install_module dbus_listener dbus
-%install_module unit_control_api unit-control
-%install_module unit_control_event unit-control
-%install_module unit_control_dm unit-control
-%install_module activation_dm activation-dm
-
-%files
+%install_module service_restart_action core
+%install_module unit_start_action core
+%install_module forward_signal_action core
+%install_module vconf_key_changed_event core
+%install_module vconf_listener core
+%install_module dbus_signal_event core
+%install_module dbus_listener core
+%install_module unit_control_api core
+%install_module unit_control_event core
+%install_module unit_control_dm core
+%install_module activation_dm core
+
+%files -f core-files
+%license COPYING
+%manifest %{name}.manifest
+%{_sbindir}/actd
+%{_sbindir}/actdctl
+%{_libdir}/actd/actd.conf
+%{_unitdir}/actd.service
+%{_unitdir}/basic.target.wants/actd.service
+%dir %{_libdir}/actd/modules.conf.d
+%{_libdir}/actd/modules.conf.d/activation_eh.conf.d/50-default.conf
+%{_libdir}/actd/modules.conf.d/vconf_listener.conf.d/50-default.conf
+%{_libdir}/actd/modules.conf.d/dbus_listener.conf.d/50-default.conf
+%{_libdir}/actd/modules.conf.d/unit_control_eh.conf.d/50-default.conf
+%{_sysconfdir}/dbus-1/system.d/org.tizen.activationd.conf
 
 %files -n libactd
 %license LICENSE.MIT
@@ -177,21 +141,6 @@ mkdir -p %{buildroot}/%{enabled_moduledir}
 %{_libdir}/pkgconfig/epc.pc
 %{_includedir}/epc/*
 
-%files -n event-processing-activation-dm -f activation-dm-files
-%license COPYING
-%{_libdir}/actd/modules.conf.d/activation_eh.conf.d/50-default.conf
-
-%files -n event-processing-vconf -f vconf-files
-%{_libdir}/actd/modules.conf.d/vconf_listener.conf.d/50-default.conf
-
-%files -n event-processing-dbus -f dbus-files
-%{_libdir}/actd/modules.conf.d/dbus_listener.conf.d/50-default.conf
-
-%files -n event-processing-unit-control -f unit-control-files
-%license COPYING
-%{_sysconfdir}/dbus-1/system.d/org.tizen.activationd.conf
-%{_libdir}/actd/modules.conf.d/unit_control_eh.conf.d/50-default.conf
-
 %files -n activationd-test-services
 %license COPYING
 %manifest %{name}.manifest
@@ -213,16 +162,4 @@ mkdir -p %{buildroot}/%{enabled_moduledir}
 %{_libdir}/actd/modules.conf.d/activation_eh.conf.d/99-acceptance-test.conf
 %{_libdir}/actd/modules.conf.d/unit_control_eh.conf.d/99-acceptance-test.conf
 
-%files -n event-processing-core
-%license COPYING
-%manifest %{name}.manifest
-%{_sbindir}/actd
-%{_sbindir}/actdctl
-%{_libdir}/actd/actd.conf
-%{_unitdir}/actd.service
-%{_unitdir}/basic.target.wants/actd.service
-%dir %{_libdir}/actd/modules.conf.d
-
-%files -n event-processing-extra -f extra-files
-
 %docs_package