From a58e38aed5648ebe374653252a564e58a346ee98 Mon Sep 17 00:00:00 2001 From: Jihoon Jung Date: Mon, 4 Dec 2017 13:09:01 +0900 Subject: [PATCH] separate devel package and main package Signed-off-by: Jihoon Jung --- .../{d2dd.manifest => d2d-manager-devel.manifest} | 0 packaging/d2d-manager.manifest | 5 +++++ packaging/{d2dd.service => d2d-manager.service} | 0 packaging/d2d-manager.spec | 26 ++++++++++++++-------- src/subownerclient/main.c | 24 ++++++++++++++++++++ 5 files changed, 46 insertions(+), 9 deletions(-) rename packaging/{d2dd.manifest => d2d-manager-devel.manifest} (100%) create mode 100644 packaging/d2d-manager.manifest rename packaging/{d2dd.service => d2d-manager.service} (100%) create mode 100755 src/subownerclient/main.c diff --git a/packaging/d2dd.manifest b/packaging/d2d-manager-devel.manifest similarity index 100% rename from packaging/d2dd.manifest rename to packaging/d2d-manager-devel.manifest diff --git a/packaging/d2d-manager.manifest b/packaging/d2d-manager.manifest new file mode 100644 index 0000000..a76fdba --- /dev/null +++ b/packaging/d2d-manager.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/d2dd.service b/packaging/d2d-manager.service similarity index 100% rename from packaging/d2dd.service rename to packaging/d2d-manager.service diff --git a/packaging/d2d-manager.spec b/packaging/d2d-manager.spec index 7f7bab2..a166031 100644 --- a/packaging/d2d-manager.spec +++ b/packaging/d2d-manager.spec @@ -5,20 +5,19 @@ Release: 0 Group: Network & Connectivity/Other License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source2: d2dd.service -Source3: d2dd.manifest -Source4: net.d2d.manager.service +Source2: %{name}.service +Source3: %{name}.manifest +Source4: %{name}-devel.manifest +Source5: net.d2d.manager.service #Source5: d2dpt.manifest BuildRequires: cmake -BuildRequires: boost-devel BuildRequires: pkgconfig(iotivity) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(iotivity) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(capi-base-common) @@ -27,6 +26,14 @@ BuildRequires: pkgconfig(libtzplatform-config) %description D2D Manager +%package devel +Summary: D2D Manager (Development) +Group: Network & Connectivity/Other +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains the development files for %{name}. + %prep %setup -q chmod 644 %{SOURCE0} @@ -63,19 +70,20 @@ rm -rf %{buildroot}/BUILD/%{name}* mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/ cp %{SOURCE4} %{buildroot}%{_datadir}/dbus-1/system-services/net.d2d.manager.service mkdir -p %{buildroot}%{_unitdir} -cp %{SOURCE2} %{buildroot}%{_unitdir}/d2dd.service +cp %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service cp test/oic_svr_db_client.dat oic_svr_db_subowner_client.dat %files -%manifest d2dd.manifest +%manifest %{name}.manifest %license LICENSE %defattr(-,root,root,-) #%{_bindir}/%{name}-daemon %attr(644,root,root) %{_datadir}/dbus-1/system-services/* -%attr(644,root,root) %{_unitdir}/d2dd.service +%attr(644,root,root) %{_unitdir}/%{name}.service -# The following should be separated into different packages. +%files devel +%manifest %{name}-devel.manifest %defattr(-,root,root,-) %{NETWORK_FW_DATADIR}/oic_amss_db.dat %{NETWORK_FW_DATADIR}/oic_svr_db_client_devowner.dat diff --git a/src/subownerclient/main.c b/src/subownerclient/main.c new file mode 100755 index 0000000..604677f --- /dev/null +++ b/src/subownerclient/main.c @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2012, 2013 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +int main() +{ + return 0; +} -- 2.7.4