Fix the manifest installation

Change-Id: I32c2c22ebfb91e1ae497a807791c2703f1667c1d

diff --git a/packaging/security-server.changes b/packaging/security-server.changes
new file mode 100644 (file)
index 0000000..dac8124
--- /dev/null
+++ b/packaging/security-server.changes
@@ -0,0 +1,3 @@
+* 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 44520ad..dffa22a 100644 (file)
--- a/packaging/security-server.spec
+++ b/packaging/security-server.spec
@@ -7,9 +7,9 @@ Group:      TO_BE/FILLED_IN
 License:    Apache License, Version 2.0
 URL:        N/A
 Source0:    %{name}-%{version}.tar.gz
-Source1:    security-server.manifest
 Source2:    libsecurity-server-client.manifest
 Source3:    security-server.service
+Source1001: %{name}.manifest
 BuildRequires: cmake
 BuildRequires: zip
 BuildRequires: pkgconfig(dlog)
@@ -77,6 +77,7 @@ Certificates for wrt.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 export LDFLAGS+="-Wl,--rpath=%{_libdir}"
@@ -92,8 +93,6 @@ mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
 cp LICENSE %{buildroot}/usr/share/license/libsecurity-server-client
 %make_install
-install -D %{SOURCE1} %{buildroot}%{_datadir}/security-server.manifest
-install -D %{SOURCE2} %{buildroot}%{_datadir}/libsecurity-server-client.manifest
 
 mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
 install -m 0644 %{SOURCE3} %{buildroot}/usr/lib/systemd/system/security-server.service