From 2ef028c41c3e251a014476754f3530d52e71e61f Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Mon, 29 May 2017 01:59:39 +0200
Subject: Add missing macro used in building RPM spec file

Change-Id: I4058a9fc101b7aea0343a68557a2e5b76ec827f2
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 cmake/common.cmake     |  4 ++++
 rpm/config.spec.in     | 43 -------------------------------------------
 rpm/rpm-config.spec.in | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 43 deletions(-)
 delete mode 100644 rpm/config.spec.in
 create mode 100644 rpm/rpm-config.spec.in

diff --git a/cmake/common.cmake b/cmake/common.cmake
index 8e23af7..1c931cb 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -52,6 +52,10 @@ macro(PROJECT_TARGET_ADD TARGET_NAME)
 	set(TARGET_NAME ${TARGET_NAME})
 endmacro(PROJECT_TARGET_ADD)
 
+macro(PROJECT_PKGDEP_ADD PKG_NAME)
+	set_property(GLOBAL APPEND PROPERTY PROJECT_PKG_DEPS ${PKG_NAME})
+endmacro(PROJECT_PKGDEP_ADD)
+
 # Check GCC minimal version
 if (gcc_minimal_version)
 	message (STATUS "${Blue}-- Check gcc_minimal_version (found gcc version ${CMAKE_C_COMPILER_VERSION})  (found g++ version ${CMAKE_CXX_COMPILER_VERSION})${ColourReset}")
diff --git a/rpm/config.spec.in b/rpm/config.spec.in
deleted file mode 100644
index 66346fb..0000000
--- a/rpm/config.spec.in
+++ /dev/null
@@ -1,43 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-#
-# 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.
-###########################################################################
-
-
-Name:    @PROJECT_NAME@
-Version: @PROJECT_VERSION@
-Release: 1
-License: @PROJECT_LICENCE@
-Summary: @PROJECT_DESCRIPTION@
-Url:     @PROJECT_URL@
-
-Provides: @PROJECT_NAME@
-Prefix: /opt/@PROJECT_NAME@
-BuildRequires: pkg-config @RPM_PKG_DEPS@
-
-BuildRoot:@CMAKE_CURRENT_BINARY_DIR@
-
-%description
-@PROJECT_DESCRIPTION@
-
-%prep
-
-%build
-(mkdir -p build; cd build; cmake ..; make)
-
-%install
-(cd build; make populate DESTDIR=%{buildroot})
-
diff --git a/rpm/rpm-config.spec.in b/rpm/rpm-config.spec.in
new file mode 100644
index 0000000..66346fb
--- /dev/null
+++ b/rpm/rpm-config.spec.in
@@ -0,0 +1,43 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# 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.
+###########################################################################
+
+
+Name:    @PROJECT_NAME@
+Version: @PROJECT_VERSION@
+Release: 1
+License: @PROJECT_LICENCE@
+Summary: @PROJECT_DESCRIPTION@
+Url:     @PROJECT_URL@
+
+Provides: @PROJECT_NAME@
+Prefix: /opt/@PROJECT_NAME@
+BuildRequires: pkg-config @RPM_PKG_DEPS@
+
+BuildRoot:@CMAKE_CURRENT_BINARY_DIR@
+
+%description
+@PROJECT_DESCRIPTION@
+
+%prep
+
+%build
+(mkdir -p build; cd build; cmake ..; make)
+
+%install
+(cd build; make populate DESTDIR=%{buildroot})
+
-- 
cgit 1.2.3-korg