Reduce number of generated rpms

* libs are not used standalone - squash them to common
* plugins don't make sense without service - move plugins to main rpm
* squash tests to one rpm
* squash devels to one rpm

Change-Id: I2f4c3462ca76ab43032e5979975d5e4b80c49728

diff --git a/packaging/askuser-notification.spec b/packaging/askuser-notification.spec
index f0ac888d9b0a247f920e7a42ee6d85ce78d2bd6b..487d076f226555d59b36f349561c1b42146f214b 100644 (file)
--- a/packaging/askuser-notification.spec
+++ b/packaging/askuser-notification.spec
@@ -37,7 +37,9 @@ BuildRequires: edje-bin
 %endif
 
 %description
-Daemon allowing user to grant or deny access for given application and privilege
+Provides daemon allowing user to grant or deny access to given privilege
+for a client application, and a plugin for supporting custom
+Cynara policy type "Ask user".
 
 %package -n libaskuser-notification-common
 Summary:    Askuser common library
@@ -45,33 +47,23 @@ Summary:    Askuser common library
 %description -n libaskuser-notification-common
 Askuser common library with common functionalities
 
-%package libs
-Summary: Askuser notification protocol library
-
-%description libs
-Askuser notification protocol library
-
 %package devel
+Requires: askuser-notification-client
+Requires: capi-privacy-privilege-manager
 Summary: Askuser notification protocol library development files
 
 %description devel
 Askuser notification protocol library development files
 
-%package plugin
-Summary: Askuser cynara plugin
-
-%description plugin
-Plugin for supporting custom cynara policy type "Ask user"
-
 %package test
-Summary: Tool for testing askuser-notification
+Summary: Tools for testing askuser-notification client and C API
 
 %description test
-Tool for testing askuser-notification
+Provides tests for checking the API provided by capi-privacy-privilege-manager
+and askuser-notification-client
 
 %package client
 Summary: Askuser notification client library
-Requires: askuser-notification-libs
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -81,12 +73,6 @@ has a particular privilege. It also allows an application to determine privacy
 privileges. It communicates with the askuser-notification service. It is an
 asynchronous API, therefore it can be integrated with any event loop mechanism.
 
-%package client-devel
-Summary: Askuser notification client library development files
-
-%description client-devel
-Askuser notification client library development files
-
 %package -n capi-privacy-privilege-manager
 Summary: Privacy Privilege Manager in TIZEN C API
 Requires: askuser-notification-client
@@ -99,18 +85,6 @@ Additionally, for privacy privileges, it provides an ability to determine
 their statuses by displaying an appropriate pop-up dialog box. A user
 can make a decision whether to give a privilege to an application or not.
 
-%package -n capi-privacy-privilege-manager-devel
-Summary: Privacy Privilege Manager in TIZEN C API development files
-
-%description -n capi-privacy-privilege-manager-devel
-Privacy Privilege Manager in TIZEN C API development files
-
-%package -n capi-privacy-privilege-manager-test
-Summary: Tests for Privacy Privilege Manager in TIZEN C API
-Requires: capi-privacy-privilege-manager
-
-%description -n capi-privacy-privilege-manager-test
-Provides tests for checking the API provided by capi-privacy-privilege-manager
 
 %prep
 %setup -q
@@ -150,24 +124,17 @@ ln -s ../askuser-notification-stream.socket %{buildroot}/%{_unitdir_user}/socket
 systemctl daemon-reload
 %endif
 
+systemctl restart cynara.service
+
 %preun
 
 %postun
+systemctl restart cynara.service
 
 %post -n libaskuser-notification-common -p /sbin/ldconfig
 
 %postun -n libaskuser-notification-common -p /sbin/ldconfig
 
-%post plugin
-systemctl restart cynara.service
-
-%postun plugin
-systemctl restart cynara.service
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
 %post client -p /sbin/ldconfig
 
 %postun client -p /sbin/ldconfig
@@ -183,53 +150,34 @@ systemctl restart cynara.service
 %if %{with_systemd_daemon}
 %{_unitdir_user}/askuser-notification.service
 %{_unitdir_user}/askuser-notification-stream.socket
-%{_unitdir_user}/sockets.target.wants/*
+%{_unitdir_user}/sockets.target.wants
 %endif
-%{_datadir}/askuser-notification/res/*
+%{_datadir}/askuser-notification/res
+%{_libdir}/cynara/plugin/service
 
 %files -n libaskuser-notification-common
 %manifest libaskuser-notification-common.manifest
 %license LICENSE
 %{_libdir}/libaskuser-notification-common.so*
-
-%files libs
-%manifest default.manifest
-%license LICENSE
 %{_libdir}/libaskuser-notification.so.*
 
 %files devel
-%{_libdir}/libaskuser-notification.so
-%{_includedir}/askuser-notification
-%{_libdir}/pkgconfig/askuser-notification.pc
-
-%files plugin
-%manifest default.manifest
-%license LICENSE
-%{_libdir}/cynara/plugin/service/*
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/askuser-notification-client/*.h
+%{_includedir}/privacy-privilege-manager/*.h
+%{_libdir}/*.so
 
 %files test
 %attr(755,root,root) %{_bindir}/askuser-notification-test
+%attr(755,root,root) %{_bindir}/capi-privacy-privilege-manager-test
 
 %files client
 %manifest default.manifest
 %license LICENSE
 %attr(644,-,-) %{_libdir}/libaskuser-notification-client.so.*
 
-%files client-devel
-%{_includedir}/askuser-notification-client/*.h
-%{_libdir}/pkgconfig/askuser-notification-client.pc
-%{_libdir}/libaskuser-notification-client.so
-
 %files -n capi-privacy-privilege-manager
 %manifest default.manifest
 %license LICENSE
 %attr(644,-,-) %{_libdir}/libcapi-privacy-privilege-manager.so.*
 
-%files -n capi-privacy-privilege-manager-devel
-%{_includedir}/privacy-privilege-manager/*.h
-%{_libdir}/pkgconfig/capi-privacy-privilege-manager.pc
-%{_libdir}/libcapi-privacy-privilege-manager.so
-
-%files -n capi-privacy-privilege-manager-test
-%manifest default.manifest
-%attr(755,root,root) %{_bindir}/capi-privacy-privilege-manager-test

diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt
index a8f95393ea91b603b9bd162b0265b3cc8467b002..78ac4133dcbb5e0b6734d834d7edf01e2772f3c8 100644 (file)
--- a/pkgconfig/CMakeLists.txt
+++ b/pkgconfig/CMakeLists.txt
@@ -16,7 +16,6 @@
 # @author      Piotr Sawicki <p.sawicki2@partner.samsung.com>
 #
 
-ADD_SUBDIRECTORY(askuser-notification)
 ADD_SUBDIRECTORY(askuser-notification-client)
 ADD_SUBDIRECTORY(capi-privacy-privilege-manager)
 

diff --git a/pkgconfig/askuser-notification/CMakeLists.txt b/pkgconfig/askuser-notification/CMakeLists.txt
deleted file mode 100644 (file)
index 25ee0df..0000000
--- a/pkgconfig/askuser-notification/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-# @file        CMakeLists.txt
-# @author      Piotr Sawicki <p.sawicki2@partner.samsung.com>
-#
-
-CONFIGURE_FILE(askuser-notification.pc.in askuser-notification.pc @ONLY)
-
-INSTALL(FILES
-    ${CMAKE_BINARY_DIR}/pkgconfig/askuser-notification/askuser-notification.pc
-    DESTINATION
-    ${LIB_INSTALL_DIR}/pkgconfig
-    )

diff --git a/pkgconfig/askuser-notification/askuser-notification.pc.in b/pkgconfig/askuser-notification/askuser-notification.pc.in
deleted file mode 100644 (file)
index 82b95b2..0000000
--- a/pkgconfig/askuser-notification/askuser-notification.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-# Package Information for pkg-config
-
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
-
-Name: askuser-notification
-Description: askuser-notification library
-Version: @ASKUSER_VERSION@
-Libs: -L${libdir} -laskuser-notification
-Cflags: -I${includedir}/askuser-notification

diff --git a/src/ipc/CMakeLists.txt b/src/ipc/CMakeLists.txt
index 8e1c2c41f70054b5f6d61fd2c0321b09ffd7be20..0558dc04c89f7a484bbd2b718bc151568bf82dee 100644 (file)
--- a/src/ipc/CMakeLists.txt
+++ b/src/ipc/CMakeLists.txt
@@ -70,9 +70,5 @@ TARGET_LINK_LIBRARIES(${TARGET_ASKUSER_NOTIFICATION_LIB_TEST} ${TARGET_ASKUSER_N
 INSTALL(TARGETS     ${TARGET_ASKUSER_NOTIFICATION_LIB}
         DESTINATION ${LIB_INSTALL_DIR})
 
-FILE(GLOB HEADERS   ${ASKUSER_NOTIFICATION_LIB_PATH}/*.h)
-INSTALL(FILES       ${HEADERS}
-        DESTINATION ${INCLUDE_INSTALL_DIR}/askuser-notification)
-
 INSTALL(TARGETS     ${TARGET_ASKUSER_NOTIFICATION_LIB_TEST}
         DESTINATION ${BIN_INSTALL_DIR})