Fix manifests

put manifests in packaging/
consistent use of %{name} macros

Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>

diff --git a/packaging/capi-system-system-settings-devel.manifest b/packaging/capi-system-system-settings-devel.manifest
new file mode 100644 (file)
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/capi-system-system-settings-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>

diff --git a/packaging/capi-system-system-settings.manifest b/packaging/capi-system-system-settings.manifest
index 017d22d..c00c25b 100644 (file)
--- a/packaging/capi-system-system-settings.manifest
+++ b/packaging/capi-system-system-settings.manifest
@@ -1,5 +1,5 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+        <request>
+                <domain name="_" />
+        </request>
 </manifest>

diff --git a/packaging/capi-system-system-settings.spec b/packaging/capi-system-system-settings.spec
index 9c9f632..03e6d09 100755 (executable)
--- a/packaging/capi-system-system-settings.spec
+++ b/packaging/capi-system-system-settings.spec
@@ -5,7 +5,8 @@ Release:    3
 Group:      System/API
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    capi-system-system-settings.manifest
+Source1001:    %{name}.manifest
+Source1002:    %{name}-devel.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(vconf)
@@ -38,7 +39,7 @@ Requires:  pkgconfig(capi-base-common)
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} .
 
 
 %build
@@ -58,12 +59,11 @@ make %{?jobs:-j%jobs}
 %files
 %manifest %{name}.manifest
 %license LICENSE.APLv2
-%manifest system-settings.manifest
 %{_libdir}/lib*.so.*
 /usr/bin/test_system_settings_gui
 
 %files devel
-%manifest %{name}.manifest
+%manifest %{name}-devel.manifest
 %{_includedir}/system/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/lib*.so

diff --git a/system-settings.manifest b/system-settings.manifest
deleted file mode 100644 (file)
index 97e8c31..0000000
--- a/system-settings.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>