Fix manifests

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

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

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

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

diff --git a/packaging/bluetooth-share.spec b/packaging/bluetooth-share.spec
index d4a3a3d..67c4c1d 100644 (file)
--- a/packaging/bluetooth-share.spec
+++ b/packaging/bluetooth-share.spec
@@ -7,6 +7,9 @@ Release:    2
 Group:      Connectivity/Bluetooth
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
+Source1001:    %{name}.manifest
+Source1002:    libbluetooth-share.manifest
+Source1003:    libbluetooth-share-devel.manifest
 Requires(post): vconf
 Requires(post): coreutils
 Requires(post): sqlite
@@ -51,6 +54,7 @@ Development package for libbluetooth-share
 
 %prep
 %setup -q
+cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} .
 
 %build
 export CFLAGS+=" -fpie -fvisibility=hidden"
@@ -128,7 +132,7 @@ fi
 %postun -n libbluetooth-share -p /sbin/ldconfig
 
 %files
-%manifest bluetooth-share.manifest
+%manifest %{name}.manifest
 /opt/etc/smack/accesses.d/bluetooth-share.rule
 %defattr(-,root,root,-)
 %{_bindir}/bluetooth-share
@@ -136,10 +140,12 @@ fi
 %{_optdir}/share/bt-ftp
 
 %files -n libbluetooth-share
+%manifest libbluetooth-share.manifest
 %defattr(-, root, root)
 %{_libdir}/libbluetooth-share-api.so.0.*
 
 %files -n libbluetooth-share-devel
+%manifest libbluetooth-share-devel.manifest
 %defattr(-, root, root)
 /usr/include/bluetooth-share-api/bluetooth-share-api.h
 %{_libdir}/libbluetooth-share-api.so

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

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