diff options
author | Michael Leibowitz <michael.leibowitz@intel.com> | 2013-07-17 10:41:16 -0700 |
---|---|---|
committer | Michael Leibowitz <michael.leibowitz@intel.com> | 2013-07-17 10:41:16 -0700 |
commit | 92708a5a1e9540f35822fc8eb94dcc2eeaf26b12 (patch) | |
tree | 9f751b9fc45e1dd0af76af263bcf988c630b28bb | |
parent | f91ea5c3ca8a5a7964156fc14fd69f8cee74c746 (diff) | |
download | msg-service-92708a5a1e9540f35822fc8eb94dcc2eeaf26b12.tar.gz msg-service-92708a5a1e9540f35822fc8eb94dcc2eeaf26b12.tar.bz2 msg-service-92708a5a1e9540f35822fc8eb94dcc2eeaf26b12.zip |
Fix manifests
put manifests in packaging/
consistent use of %{name} macros
Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>
-rwxr-xr-x | mms-plugin.manifest | 5 | ||||
-rwxr-xr-x | msg-service-tools.manifest | 12 | ||||
-rw-r--r-- | packaging/mms-plugin.manifest | 5 | ||||
-rw-r--r-- | packaging/msg-service-devel.manifest | 5 | ||||
-rw-r--r-- | packaging/msg-service-tools.manifest | 5 | ||||
-rw-r--r-- | packaging/msg-service.manifest | 6 | ||||
-rwxr-xr-x | packaging/msg-service.spec | 16 | ||||
-rw-r--r-- | packaging/sms-plugin.manifest | 5 | ||||
-rwxr-xr-x | sms-plugin.manifest | 5 |
9 files changed, 33 insertions, 31 deletions
diff --git a/mms-plugin.manifest b/mms-plugin.manifest deleted file mode 100755 index 2a0cec5..0000000 --- a/mms-plugin.manifest +++ /dev/null @@ -1,5 +0,0 @@ -<manifest> - <request> - <domain name="_"/> - </request> -</manifest> diff --git a/msg-service-tools.manifest b/msg-service-tools.manifest deleted file mode 100755 index f56f694..0000000 --- a/msg-service-tools.manifest +++ /dev/null @@ -1,12 +0,0 @@ -<manifest> - <request> - <domain name="msg-service"/> - </request> - - <assign> - <filesystem path="/etc/rc.d/init.d/msg-server" label="_" exec_label="none"/> - <filesystem path="/etc/rc.d/rc3.d/S70msg-server" label="_" exec_label="none"/> - <filesystem path="/etc/rc.d/rc5.d/S70msg-server" label="_" exec_label="none"/> - <filesystem path="/etc/config/sysinfo-message.xml" label="_"/> - </assign> -</manifest> diff --git a/packaging/mms-plugin.manifest b/packaging/mms-plugin.manifest new file mode 100644 index 0000000..c00c25b --- /dev/null +++ b/packaging/mms-plugin.manifest @@ -0,0 +1,5 @@ +<manifest> + <request> + <domain name="_" /> + </request> +</manifest> diff --git a/packaging/msg-service-devel.manifest b/packaging/msg-service-devel.manifest new file mode 100644 index 0000000..c00c25b --- /dev/null +++ b/packaging/msg-service-devel.manifest @@ -0,0 +1,5 @@ +<manifest> + <request> + <domain name="_" /> + </request> +</manifest> diff --git a/packaging/msg-service-tools.manifest b/packaging/msg-service-tools.manifest new file mode 100644 index 0000000..c00c25b --- /dev/null +++ b/packaging/msg-service-tools.manifest @@ -0,0 +1,5 @@ +<manifest> + <request> + <domain name="_" /> + </request> +</manifest> diff --git a/packaging/msg-service.manifest b/packaging/msg-service.manifest index 017d22d..c00c25b 100644 --- a/packaging/msg-service.manifest +++ b/packaging/msg-service.manifest @@ -1,5 +1,5 @@ <manifest> - <request> - <domain name="_"/> - </request> + <request> + <domain name="_" /> + </request> </manifest> diff --git a/packaging/msg-service.spec b/packaging/msg-service.spec index 0fd3714..c7f3108 100755 --- a/packaging/msg-service.spec +++ b/packaging/msg-service.spec @@ -6,7 +6,11 @@ Summary: Messaging Framework Library Group: System/Libraries Source0: %{name}-%{version}.tar.gz Source101: msg-service.service -Source1001: msg-service.manifest +Source1001: %{name}.manifest +Source1002: %{name}-devel.manifest +Source1003: %{name}-tools.manifest +Source1004: sms-plugin.manifest +Source1005: mms-plugin.manifest Requires(post): /usr/bin/sqlite3 Requires(post): /usr/bin/vconftool @@ -96,7 +100,7 @@ Description: MMS plugin library %prep %setup -q -cp %{SOURCE1001} . +cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} %{SOURCE1005} . %build @@ -515,14 +519,14 @@ fi /usr/share/license/msg-service/LICENSE.Flora %files devel -%manifest %{name}.manifest +%manifest %{name}-devel.manifest %defattr(-,root,root,-) %{_libdir}/libmsg_mapi.so %{_libdir}/pkgconfig/msg-service.pc %{_includedir}/msg-service/* %files tools -%manifest %{name}.manifest +%manifest %{name}-tools.manifest %defattr(-,root,root,-) %{_bindir}/msg-helper %{_bindir}/msg-server @@ -543,13 +547,13 @@ fi %files -n sms-plugin -%manifest %{name}.manifest +%manifest sms-plugin.manifest %defattr(-,root,root,-) %{_libdir}/libmsg_sms_plugin.so /usr/share/license/msg-service/LICENSE.Flora %files -n mms-plugin -%manifest %{name}.manifest +%manifest mms-plugin.manifest %defattr(-,root,root,-) %{_libdir}/libmsg_mms_plugin.so /usr/share/license/msg-service/LICENSE.Flora diff --git a/packaging/sms-plugin.manifest b/packaging/sms-plugin.manifest new file mode 100644 index 0000000..c00c25b --- /dev/null +++ b/packaging/sms-plugin.manifest @@ -0,0 +1,5 @@ +<manifest> + <request> + <domain name="_" /> + </request> +</manifest> diff --git a/sms-plugin.manifest b/sms-plugin.manifest deleted file mode 100755 index 2a0cec5..0000000 --- a/sms-plugin.manifest +++ /dev/null @@ -1,5 +0,0 @@ -<manifest> - <request> - <domain name="_"/> - </request> -</manifest> |