Cleanup spec and remove defunct system V startup scripts

Fix several rpmlint errors and removed the pointless startup script
from the source and all the logic for installing it in the spec

diff --git a/packaging/security-server.changes b/packaging/security-server.changes
index dac8124..a773a57 100644 (file)
--- a/packaging/security-server.changes
+++ b/packaging/security-server.changes
@@ -1,3 +1,7 @@
+* Fri Aug 23 2013 Rusty Lynch <rusty.lynch@intel.com> submit/tizen/20130716.223318@0e96d3e
+- Cleanup spec and remove defunct system V startup scripts
+- smack API has changed; smack_new_label_from socket returns the label length.
+
 * Fri Jul 12 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> b7787d6
 - Fix the manifest installation
 

diff --git a/packaging/security-server.spec b/packaging/security-server.spec
index dffa22a..72b1742 100644 (file)
--- a/packaging/security-server.spec
+++ b/packaging/security-server.spec
@@ -1,11 +1,9 @@
-#sbs-git:slp/pkgs/s/security-server security-server 0.0.37
 Name:       security-server
 Summary:    Security server and utilities
 Version:    0.0.73
 Release:    1
-Group:      TO_BE/FILLED_IN
-License:    Apache License, Version 2.0
-URL:        N/A
+Group:      Security/Service
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source2:    libsecurity-server-client.manifest
 Source3:    security-server.service
@@ -22,58 +20,41 @@ Requires(postun): systemd
 BuildRequires: pkgconfig(libprivilege-control)
 
 %description
-Security server and utilities
+Tizen security server and utilities
 
 %package -n libsecurity-server-client
 Summary:    Security server (client)
-Group:      Development/Libraries
+Group:      Security/Libraries
 Requires:   security-server = %{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description -n libsecurity-server-client
-Security server package (client)
-
-#%package -n wrt-security
-#Summary:    wrt-security-daemon and client libraries.
-#Group:      Development/Libraries
-#Requires(post): /sbin/ldconfig
-#Requires(postun): /sbin/ldconfig
-#
-#%description -n wrt-security
-#Wrt-security-daemon and client libraries.
-#
-#%package -n wrt-security-devel
-#Summary:    Header files for client libraries.
-#Group:      Development/Libraries
-#Requires:   wrt-security = %{version}-%{release}
-#
-#%description -n wrt-security-devel
-#Developer files for client libraries.
+Tizen Security server client libraries
 
 %package -n libsecurity-server-client-devel
 Summary:    Security server (client-devel)
-Group:      Development/Libraries
+Group:      Security/Development
 Requires:   libsecurity-server-client = %{version}-%{release}
 
 %description -n libsecurity-server-client-devel
-Security server package (client-devel)
+Development files needed for using the security client
 
 %package -n security-server-devel
 Summary:    for web applications (Development)
-Group:      Development/Libraries
+Group:      Security/Development
 Requires:   security-server = %{version}-%{release}
 
 %description -n security-server-devel
-Security daemon for web applications (Development)
+Development files for the Tizen security server
 
 %package -n security-server-certs
 Summary:    Certificates for web applications.
-Group:      Development/Libraries
+Group:      Security/Libraries
 Requires:   security-server
 
 %description -n security-server-certs
-Certificates for wrt.
+Certificates for the Tizen Web-Runtime
 
 %prep
 %setup -q
@@ -109,17 +90,9 @@ systemctl daemon-reload
 if [ $1 == 1 ]; then
     systemctl restart security-server.service
 fi
-mkdir -p /etc/rc.d/rc3.d
-mkdir -p /etc/rc.d/rc5.d
-ln -sf /etc/rc.d/init.d/security-serverd /etc/rc.d/rc3.d/S10security-server
-ln -sf /etc/rc.d/init.d/security-serverd /etc/rc.d/rc5.d/S10security-server
 
 %postun
 systemctl daemon-reload
-if [ "$1" = 0 ]; then
-    rm -f /etc/rc.d/rc3.d/S10security-server
-    rm -f /etc/rc.d/rc5.d/S10security-server
-fi
 
 %post -n libsecurity-server-client -p /sbin/ldconfig
 
@@ -130,7 +103,6 @@ fi
 %defattr(-,root,root,-)
 /usr/lib/systemd/system/multi-user.target.wants/security-server.service
 /usr/lib/systemd/system/security-server.service
-%attr(755,root,root) /etc/rc.d/init.d/security-serverd
 %attr(755,root,root) /usr/bin/security-server
 
 %{_datadir}/license/%{name}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 258ea12..82af0e8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -71,11 +71,6 @@ INSTALL(FILES
     DESTINATION /usr/include/security-server
     )
 
-INSTALL(FILES
-    ${SECURITY_SERVER_PATH}/security-serverd
-    DESTINATION /etc/rc.d/init.d
-    )
-
 ################################################################################
 
 #CONFIGURE_FILE(security-server.pc.in security-server.pc @ONLY)

diff --git a/src/security-serverd b/src/security-serverd
deleted file mode 100644 (file)
index 48fbefc..0000000
--- a/src/security-serverd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# start secure-storage server
-/usr/bin/security-server &