Fix manifests

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

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

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

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

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

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

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

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

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

diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec
index cb4dde3..a5bb505 100644 (file)
--- a/packaging/pkgmgr.spec
+++ b/packaging/pkgmgr.spec
@@ -5,7 +5,13 @@ Release:    1
 Group:      Application Framework/Package Management
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    pkgmgr.manifest
+Source1001:    %{name}.manifest
+Source1002:    %{name}-client.manifest
+Source1003:    %{name}-client-devel.manifest
+Source1004:    %{name}-server.manifest
+Source1005:    %{name}-installer.manifest
+Source1006:    %{name}-installer-devel.manifest
+Source1007:    %{name}-types-devel.manifest
 BuildRequires:  cmake
 BuildRequires:  unzip
 BuildRequires:  gettext-tools
@@ -74,10 +80,10 @@ Package Manager client types develpoment package for packaging
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} %{SOURCE1005} %{SOURCE1006} %{SOURCE1007} .
 
 %build
-%cmake . 
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install
@@ -133,14 +139,14 @@ update-mime-database /usr/share/mime
 %exclude %{_sysconfdir}/package-manager/server/queue_status
 
 %files client
-%manifest %{name}.manifest
+%manifest %{name}-client.manifest
 %defattr(-,root,root,-)
 %dir /etc/package-manager
 /etc/package-manager/pkg_path.conf
 %{_libdir}/libpkgmgr-client.so.*
 
 %files client-devel
-%manifest %{name}.manifest
+%manifest %{name}-client-devel.manifest
 %defattr(-,root,root,-)
 %{_includedir}/package-manager.h
 %{_includedir}/pkgmgr-dbinfo.h
@@ -148,21 +154,21 @@ update-mime-database /usr/share/mime
 %{_libdir}/libpkgmgr-client.so
 
 %files server -f package-manager.lang
-%manifest %{name}.manifest
+%manifest %{name}-server.manifest
 %defattr(-,root,root,-)
 %{_datadir}/dbus-1/services/org.tizen.slp.pkgmgr.service
 %{_bindir}/pkgmgr-server
 %{_sysconfdir}/package-manager/server
 
 %files installer
-%manifest %{name}.manifest
+%manifest %{name}-installer.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libpkgmgr_installer.so.*
 %{_libdir}/libpkgmgr_installer_status_broadcast_server.so.*
 %{_libdir}/libpkgmgr_installer_client.so.*
 
 %files installer-devel
-%manifest %{name}.manifest
+%manifest %{name}-installer-devel.manifest
 %defattr(-,root,root,-)
 %dir %{_includedir}/pkgmgr
 %{_includedir}/pkgmgr/pkgmgr_installer.h
@@ -175,7 +181,7 @@ update-mime-database /usr/share/mime
 
 
 %files types-devel
-%manifest %{name}.manifest
+%manifest %{name}-types-devel.manifest
 %defattr(-,root,root,-)
 %{_includedir}/package-manager-types.h
 %{_includedir}/package-manager-plugin.h

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

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

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

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