From: Michael Leibowitz Date: Wed, 17 Jul 2013 21:26:27 +0000 (-0700) Subject: Fix manifests X-Git-Tag: submit/tizen/20130910.003637^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_generic;p=platform%2Fcore%2Fapi%2Fbluetooth.git Fix manifests put manifests in packaging/ consistent use of %{name} macros Signed-off-by: Michael Leibowitz --- diff --git a/bluetooth.manifest b/bluetooth.manifest deleted file mode 100644 index 75b0fa5..0000000 --- a/bluetooth.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/capi-network-bluetooth-devel.manifest b/packaging/capi-network-bluetooth-devel.manifest new file mode 100644 index 0000000..c00c25b --- /dev/null +++ b/packaging/capi-network-bluetooth-devel.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/capi-network-bluetooth.manifest b/packaging/capi-network-bluetooth.manifest index 017d22d..c00c25b 100644 --- a/packaging/capi-network-bluetooth.manifest +++ b/packaging/capi-network-bluetooth.manifest @@ -1,5 +1,5 @@ - - - + + + diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec index 8482154..2103acc 100644 --- a/packaging/capi-network-bluetooth.spec +++ b/packaging/capi-network-bluetooth.spec @@ -5,7 +5,8 @@ Release: 1 Group: Connectivity/API License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source1001: capi-network-bluetooth.manifest +Source1001: %{name}.manifest +Source1002: %{name}-devel.manifest BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) @@ -31,7 +32,7 @@ Network Bluetooth Framework. %prep %setup -q -cp %{SOURCE1001} . +cp %{SOURCE1001} %{SOURCE1002} . %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` @@ -50,11 +51,10 @@ make %{?jobs:-j%jobs} %files %manifest %{name}.manifest %license LICENSE.APLv2 LICENSE -%manifest bluetooth.manifest %{_libdir}/libcapi-network-bluetooth.so.* %files devel -%manifest %{name}.manifest +%manifest %{name}-devel.manifest %{_includedir}/network/bluetooth.h %{_libdir}/pkgconfig/capi-network-bluetooth.pc %{_libdir}/libcapi-network-bluetooth.so