summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyungwook Tak <k.tak@samsung.com>2016-03-02 11:13:42 (GMT)
committerKyungwook Tak <k.tak@samsung.com>2016-03-02 11:13:42 (GMT)
commitb4ea2b8348e45f355cdf1140b666f0897fc63644 (patch)
tree8b78e412c6cb59c80fa17a14062b499b6f859ea4
parent4ba1b26fcea5409a5b27ab24e2f8b5dfb9f497b8 (diff)
downloadlibwebappenc-b4ea2b8348e45f355cdf1140b666f0897fc63644.zip
libwebappenc-b4ea2b8348e45f355cdf1140b666f0897fc63644.tar.gz
libwebappenc-b4ea2b8348e45f355cdf1140b666f0897fc63644.tar.bz2
Refine spec filerefs/changes/44/60844/1
- Fix groups - Remove non-used definition - Use macros Change-Id: I109ebe1280138c23bbd12f7f97e7665110cdd646 Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
-rw-r--r--LICENSE (renamed from LICENSE.Apache-2.0)0
-rw-r--r--packaging/libwebappenc.spec28
2 files changed, 5 insertions, 23 deletions
diff --git a/LICENSE.Apache-2.0 b/LICENSE
index 247c97d..247c97d 100644
--- a/LICENSE.Apache-2.0
+++ b/LICENSE
diff --git a/packaging/libwebappenc.spec b/packaging/libwebappenc.spec
index ec61ff1..342d1f3 100644
--- a/packaging/libwebappenc.spec
+++ b/packaging/libwebappenc.spec
@@ -2,7 +2,7 @@ Name: libwebappenc
Summary: Web application encryption service
Version: 0.1.0
Release: 1
-Group: System/Libraries
+Group: Security/Libraries
License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
Source1001: %{name}.manifest
@@ -21,7 +21,7 @@ Web application encryption and decryption service
%package devel
Summary: Web application encryption service (development files)
-Group: Development/Libraries
+Group: Security/Development
Requires: %{name} = %{version}-%{release}
%description devel
@@ -29,14 +29,12 @@ Web application encryption and decryption service (development files)
%package test
Summary: Web application encryption service (test)
-Group: Development
+Group: Security/Development
Requires: %{name} = %{version}-%{release}
%description test
Web application encryption and decryption service (test)
-
-
%prep
%setup -q
cp %{SOURCE1001} .
@@ -50,23 +48,13 @@ cp %{SOURCE1001} .
-DBINDIR=%TZ_SYS_BIN \
-DSYSTEMD_UNIT_DIR=%{_unitdir} \
-DCMAKE_BUILD_TYPE=%{build_type} \
- -DTZ_SYS_BIN=%TZ_SYS_BIN \
-DTZ_SYS_SHARE=%TZ_SYS_SHARE
make %{?jobs:-j%jobs}
-
%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{TZ_SYS_SHARE}/license
-cp LICENSE.Apache-2.0 %{buildroot}%{TZ_SYS_SHARE}/license/%{name}
%make_install
-mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-ln -s ../webappenc-initializer.service %{buildroot}%{_unitdir}/multi-user.target.wants/webappenc-initializer.service
-
-
-%clean
-rm -rf %{buildroot}
+%install_service multi-user.target.wants webappenc-initializer.service
%post
/sbin/ldconfig
@@ -88,11 +76,9 @@ if [ $1 = 0 ]; then
systemctl daemon-reload
fi
-
%files
-%defattr(-,root,root,-)
%manifest %{name}.manifest
-%{TZ_SYS_SHARE}/license/%{name}
+%license LICENSE
%{_libdir}/%{name}.so.*
%{_unitdir}/webappenc-initializer.service
%{_unitdir}/multi-user.target.wants/webappenc-initializer.service
@@ -101,13 +87,9 @@ fi
%{TZ_SYS_SHARE}/wae/app_dek/WAE_APPDEK_KEK_PublicKey.pem
%files devel
-%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/%{name}.so
%files test
-%defattr(-,root,root,-)
%{TZ_SYS_BIN}/wae_tests
-
-