From b2ce5a38a5654a849d588c7e4850b4a7fc2170f4 Mon Sep 17 00:00:00 2001
From: Michael Leibowitz <michael.leibowitz@intel.com>
Date: Wed, 17 Jul 2013 14:25:14 -0700
Subject: [PATCH] Fix manifests

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

Change-Id: I4d98deb78664b35a32a2066e4dce6524782d003c
Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>
---
 libuw-imap-toolkit.manifest                 |  9 ---------
 packaging/libuw-imap-toolkit-devel.manifest |  5 +++++
 packaging/libuw-imap-toolkit.manifest       |  5 +++++
 packaging/uw-imap-toolkit.manifest          |  6 +++---
 packaging/uw-imap-toolkit.spec              | 15 ++++++++-------
 5 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 libuw-imap-toolkit.manifest
 create mode 100644 packaging/libuw-imap-toolkit-devel.manifest
 create mode 100644 packaging/libuw-imap-toolkit.manifest

diff --git a/libuw-imap-toolkit.manifest b/libuw-imap-toolkit.manifest
deleted file mode 100644
index a6508d0..0000000
--- a/libuw-imap-toolkit.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-<manifest>
-  <define> 
-    <domain name="libuw-imap-toolkit"/>
-  </define>
-  <request>
-    <domain name="libuw-imap-toolkit"/>
-  </request>
-</manifest>
-
diff --git a/packaging/libuw-imap-toolkit-devel.manifest b/packaging/libuw-imap-toolkit-devel.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/libuw-imap-toolkit-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/libuw-imap-toolkit.manifest b/packaging/libuw-imap-toolkit.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/libuw-imap-toolkit.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/uw-imap-toolkit.manifest b/packaging/uw-imap-toolkit.manifest
index 017d22d..c00c25b 100644
--- a/packaging/uw-imap-toolkit.manifest
+++ b/packaging/uw-imap-toolkit.manifest
@@ -1,5 +1,5 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+        <request>
+                <domain name="_" />
+        </request>
 </manifest>
diff --git a/packaging/uw-imap-toolkit.spec b/packaging/uw-imap-toolkit.spec
index 217d068..efb77f6 100644
--- a/packaging/uw-imap-toolkit.spec
+++ b/packaging/uw-imap-toolkit.spec
@@ -10,7 +10,8 @@ Release:    0
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
 Source0:    %{name}-%{version}.tar.gz
-Source1001: 	uw-imap-toolkit.manifest
+Source1001:	libuw-imap-toolkit.manifest
+Source1002:	libuw-imap-toolkit-devel.manifest
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires: libgcrypt-devel
@@ -39,11 +40,11 @@ IMAP-2007e development library for E-mail Framework
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} .
 
 %build
 ./autogen.sh
-%configure --disable-static 
+%configure --disable-static
 
 
 make %{?jobs:-j%jobs}
@@ -61,14 +62,14 @@ rm -rf %{buildroot}
 
 
 %files -n libuw-imap-toolkit
-%manifest %{name}.manifest
-%defattr(-,root,root,-) 
+%manifest libuw-imap-toolkit.manifest
+%defattr(-,root,root,-)
 %{_libdir}/libuw-imap-toolkit.so.*
 
 
 %files -n libuw-imap-toolkit-devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-) 
+%manifest libuw-imap-toolkit-devel.manifest
+%defattr(-,root,root,-)
 %{_libdir}/libuw-imap-toolkit.so
 %{_libdir}/pkgconfig/uw-imap-toolkit.pc
 %{_includedir}/uw-imap-toolkit/*
-- 
2.7.4