Fix the manifest installation

Change-Id: Ife29b82d88464f4f0c654029fbf1c4085cccb82f

diff --git a/packaging/cert-svc.changes b/packaging/cert-svc.changes
index 7093d9f..3244810 100644 (file)
--- a/packaging/cert-svc.changes
+++ b/packaging/cert-svc.changes
@@ -1,3 +1,6 @@
+* Fri Jul 12 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> 0ec2117
+- Fix the manifest installation
+
 * Tue Jun 04 2013 Xavier Roche <xavrock.os@gmail.com> accepted/tizen/20130520.101205@65f9420
 - Fix lib var path for x64 build
 

diff --git a/packaging/cert-svc.manifest b/packaging/cert-svc.manifest
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index 260eca4..d9b4cca 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -6,7 +6,7 @@ Release: 45
 Group:   System/Libraries
 License: SAMSUNG
 Source0: %{name}-%{version}.tar.gz
-Source1: %{name}.manifest
+Source1001: %{name}.manifest
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -41,6 +41,7 @@ Certification service (developement files)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 %{!?build_type:%define build_type "Release"}
@@ -57,7 +58,6 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
 %make_install
-install -D %{SOURCE1} %{buildroot}%{_datadir}/%{name}.manifest
 ln -sf /opt/etc/ssl/certs %{buildroot}/opt/share/cert-svc/certs/ssl
 touch %{buildroot}/opt/share/cert-svc/pkcs12/storage
 chmod 766 %{buildroot}/opt/share/cert-svc/pkcs12/storage
@@ -97,7 +97,6 @@ fi
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%manifest %{_datadir}/%{name}.manifest
 %attr(0755,root,root) %{_bindir}/cert_svc_create_clean_db.sh
 %{_libdir}/*.so.*
 %{_bindir}/dpkg-pki-sig