From 4ef37c0712f5f5043768c66ffef2a7f5b76ba940 Mon Sep 17 00:00:00 2001
From: Michael Leibowitz <michael.leibowitz@intel.com>
Date: Wed, 17 Jul 2013 10:19:47 -0700
Subject: [PATCH] Fix manifests

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

Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>
---
 libSLP-db-util.manifest                 | 5 -----
 packaging/libslp-db-util-devel.manifest | 5 +++++
 packaging/libslp-db-util.manifest       | 6 +++---
 packaging/libslp-db-util.spec           | 7 ++++---
 4 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 libSLP-db-util.manifest
 create mode 100644 packaging/libslp-db-util-devel.manifest

diff --git a/libSLP-db-util.manifest b/libSLP-db-util.manifest
deleted file mode 100644
index 97e8c31..0000000
--- a/libSLP-db-util.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-	<request>
-		<domain name="_"/>
-	</request>
-</manifest>
diff --git a/packaging/libslp-db-util-devel.manifest b/packaging/libslp-db-util-devel.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/libslp-db-util-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/libslp-db-util.manifest b/packaging/libslp-db-util.manifest
index 017d22d..c00c25b 100644
--- a/packaging/libslp-db-util.manifest
+++ b/packaging/libslp-db-util.manifest
@@ -1,5 +1,5 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+        <request>
+                <domain name="_" />
+        </request>
 </manifest>
diff --git a/packaging/libslp-db-util.spec b/packaging/libslp-db-util.spec
index 2543292..52d98d9 100755
--- a/packaging/libslp-db-util.spec
+++ b/packaging/libslp-db-util.spec
@@ -5,7 +5,8 @@ License:        Apache-2.0
 Summary:        DB Utility
 Group:          Application Framework/Database
 Source0:        %{name}-%{version}.tar.gz
-Source1001: 	libslp-db-util.manifest
+Source1001:	%{name}.manifest
+Source1002:	%{name}-devel.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -23,7 +24,7 @@ Devel package for libslp-db-util (devel)
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} .
 
 %build
 %cmake .
@@ -44,7 +45,7 @@ make %{?_smp_mflags}
 %{_libdir}/libSLP-db-util.so.0.1.0
 
 %files devel
-%manifest %{name}.manifest
+%manifest %{name}-devel.manifest
 %defattr(-,root,root,-)
 %dir %{_includedir}/db-util
 %{_includedir}/db-util/*.h
-- 
2.7.4