modify libedge-orchestration-devel packaging

-. remove duplicated liborchestration-client.so file from package
-. move sample app to devel package

Change-Id: I3cac15cc7e39be2962feee50679664917f17de57
Signed-off-by: wansuyoo <wansu.yoo@samsung.com>

diff --git a/Makefile b/Makefile
index 6cb271fa06153408633db1c7ee6ec9c7e9789ddb..e13dcc6c29ba9d9a2b7c3649969d525c9771eec2 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,10 @@ install:
        install -d $(DESTDIR)/usr/lib
        install -d $(DESTDIR)/usr/include/$(PKG_NAME)
        install -d $(DESTDIR)/usr/lib/pkgconfig
-       install -m 644 $(LIBPKG_LIB_DIR)/$(LIBPKG_LIB_FILE) $(DESTDIR)/usr/lib
+       
+       install -m 644 $(LIBPKG_LIB_DIR)/$(LIBPKG_LIB_FILE).* $(DESTDIR)/usr/lib
+       cp -r $(LIBPKG_LIB_DIR)/$(LIBPKG_LIB_FILE) $(DESTDIR)/usr/lib
+
        install -m 644 $(BASE_DIR)/$(PKG_NAME).pc.in $(DESTDIR)/usr/lib/pkgconfig/$(PKG_NAME).pc
        install -m 644 $(LIBPKG_INC_DIR)/$(LIBPKG_HEADER_FILE) $(DESTDIR)/usr/include/$(PKG_NAME)
 

diff --git a/packaging/edge-orchestration.spec b/packaging/edge-orchestration.spec
index a0d3118160676c9b107ab8cb801b922ceb164974..4c5f17a7df2142bc7c4aaa0321879d3b7967defe 100755 (executable)
--- a/packaging/edge-orchestration.spec
+++ b/packaging/edge-orchestration.spec
@@ -42,7 +42,7 @@ Edge orchestration library for use of Edge-orchestration
 %package -n libedge-orchestration-devel
 Summary:    edge-orchestration library for (devel)
 Group:      System/Edge Framework
-Requires:   %{name} = %{version}-%{release}
+Requires:   libedge-orchestration = %{version}-%{release}
 
 %description -n libedge-orchestration-devel
 Edge orchestration library for use of Edge-orchestration (devel)
@@ -95,7 +95,7 @@ export ARCH=arm
 systemctl daemon-reload
 systemctl restart %{name}
 
-%post -n libedge-orchestration
+%post -n libedge-orchestration-devel
 ln -sf %{_sysconfdir}/%{name}/myscoring/libmyscoring.so.1.0.1 %{_sysconfdir}/%{name}/myscoring/libmyscoring.so
 ln -sf %{_sysconfdir}/%{name}/myscoring2/libmyscoring2.so.1.0.1 %{_sysconfdir}/%{name}/myscoring2/libmyscoring2.so
 
@@ -112,16 +112,14 @@ ln -sf %{_sysconfdir}/%{name}/myscoring2/libmyscoring2.so.1.0.1 %{_sysconfdir}/%
 %files -n libedge-orchestration
 %manifest lib%{name}.manifest
 %license LICENSE.Apache-2.0
+%attr(755,system_fw,system_fw)%{_libdir}/liborchestration-client.so.*
+
+%files -n libedge-orchestration-devel
 %attr(755,system_fw,system_fw)%{_libdir}/liborchestration-client.so
+%attr(755,system_fw,system_fw)%{_libdir}/pkgconfig/%{name}.pc
+%attr(755,system_fw,system_fw)%{_includedir}/%{name}/orchestration_client.h
 # orchestration sample
 %attr(755,system_fw,system_fw)%{_bindir}/orchestration_sample
 %attr(755,system_fw,system_fw)%{_bindir}/orchestration_chrome_sample
 %attr(755,system_fw,system_fw)%{_sysconfdir}/%{name}/myscoring/*
 %attr(755,system_fw,system_fw)%{_sysconfdir}/%{name}/myscoring2/*
-
-%files -n libedge-orchestration-devel
-%manifest lib%{name}.manifest
-%license LICENSE.Apache-2.0
-%attr(755,system_fw,system_fw)%{_libdir}/liborchestration-client.so
-%attr(755,system_fw,system_fw)%{_libdir}/pkgconfig/%{name}.pc
-%attr(755,system_fw,system_fw)%{_includedir}/%{name}/orchestration_client.h
\ No newline at end of file

diff --git a/src/libedge-orchestration/Makefile b/src/libedge-orchestration/Makefile
index 1c19e77e88e99cf3be7eb44b3dc985765f7617aa..b7984516a4b8529aa985412734996d4888da50f0 100755 (executable)
--- a/src/libedge-orchestration/Makefile
+++ b/src/libedge-orchestration/Makefile
@@ -8,6 +8,7 @@ LIB_DIR                 := lib
 SRC_DIR                        := src
 SAMPLE_DIR             := sample
 LIBRARY_FILE   := liborchestration-client.so
+LIBRARY_VERSION        := 0.1.0
 SRC_FILES              := \
                        $(SRC_DIR)/orchestration_client.c \
                        $(SRC_DIR)/dbus_consumer.c
@@ -28,7 +29,8 @@ build-sample: build
 build:
        mkdir -p $(LIB_DIR)
        $(CC) -fPIC -Wall -c -I $(INC_DIR) `pkg-config --libs --cflags gio-2.0 gio-unix-2.0 glib-2.0` $(SRC_FILES)
-       $(CC) -shared -g -Wall -Werror $(OBJ_FILES) -o $(LIB_DIR)/$(LIBRARY_FILE) -I $(INC_DIR)
+       $(CC) -shared -g -Wall -Werror $(OBJ_FILES) -o $(LIB_DIR)/$(LIBRARY_FILE).$(LIBRARY_VERSION) -I $(INC_DIR)
+       ln -sf $(LIBRARY_FILE).$(LIBRARY_VERSION) $(LIB_DIR)/$(LIBRARY_FILE)
        -rm -f $(OBJ_FILES)
 
 clean: