Synchronize RPM and pkg-config versions

This change also introduces CYNARA_VERSION cmake variable which will need
to be kept in sync with rpm package version.
We cannot rely on passing version from RPM spec since we want to be able
to build Cynara independently of the Tizen build system.

Change-Id: I1bdd3a603a486d386f261e8330a9635923945569
Signed-off-by: Jacek Bukarewicz <j.bukarewicz@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4f80a2..8cdd475 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
 PROJECT("cynara")
+set(CYNARA_VERSION 0.2.2)
 
 ############################# cmake packages ##################################
 

diff --git a/pkgconfig/cynara-admin/cynara-admin.pc.in b/pkgconfig/cynara-admin/cynara-admin.pc.in
index 3bf19a0..faa6c47 100644 (file)
--- a/pkgconfig/cynara-admin/cynara-admin.pc.in
+++ b/pkgconfig/cynara-admin/cynara-admin.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cynara-admin
 Description: cynara-admin package
-Version: 0.0.1
+Version: @CYNARA_VERSION@
 Requires:
 Libs: -L${libdir} -lcynara-admin
 Cflags: -I${includedir}/cynara

diff --git a/pkgconfig/cynara-client/cynara-client.pc.in b/pkgconfig/cynara-client/cynara-client.pc.in
index d81e8ab..e1505a0 100644 (file)
--- a/pkgconfig/cynara-client/cynara-client.pc.in
+++ b/pkgconfig/cynara-client/cynara-client.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cynara-client
 Description: cynara-client package
-Version: 0.0.1
+Version: @CYNARA_VERSION@
 Requires:
 Libs: -L${libdir} -lcynara-client
 Cflags: -I${includedir}/cynara

diff --git a/pkgconfig/cynara-creds-commons/cynara-creds-commons.pc.in b/pkgconfig/cynara-creds-commons/cynara-creds-commons.pc.in
index cb87e5f..7d6e3c4 100644 (file)
--- a/pkgconfig/cynara-creds-commons/cynara-creds-commons.pc.in
+++ b/pkgconfig/cynara-creds-commons/cynara-creds-commons.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cynara-creds-commons
 Description: Base package for all cynara-creds packages
-Version: 0.0.1
+Version: @CYNARA_VERSION@
 Requires:
 Libs: -L${libdir} -lcynara-creds-commons
 Cflags: -I${includedir}/cynara

diff --git a/pkgconfig/cynara-creds-dbus/cynara-creds-dbus.pc.in b/pkgconfig/cynara-creds-dbus/cynara-creds-dbus.pc.in
index 296ce6c..eb09848 100644 (file)
--- a/pkgconfig/cynara-creds-dbus/cynara-creds-dbus.pc.in
+++ b/pkgconfig/cynara-creds-dbus/cynara-creds-dbus.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cynara-creds-dbus
 Description: cynara-creds package for dbus clients
-Version: 0.0.1
+Version: @CYNARA_VERSION@
 Requires: dbus-1
 Libs: -L${libdir} -lcynara-creds-dbus
 Cflags: -I${includedir}/cynara

diff --git a/pkgconfig/cynara-creds-socket/cynara-creds-socket.pc.in b/pkgconfig/cynara-creds-socket/cynara-creds-socket.pc.in
index b81cf68..3c53f53 100644 (file)
--- a/pkgconfig/cynara-creds-socket/cynara-creds-socket.pc.in
+++ b/pkgconfig/cynara-creds-socket/cynara-creds-socket.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cynara-creds-socket
 Description: cynara-creds package for socket clients
-Version: 0.0.1
+Version: @CYNARA_VERSION@
 Requires:
 Libs: -L${libdir} -lcynara-creds-socket
 Cflags: -I${includedir}/cynara

diff --git a/pkgconfig/cynara-session/cynara-session.pc.in b/pkgconfig/cynara-session/cynara-session.pc.in
index fa6e763..e734739 100644 (file)
--- a/pkgconfig/cynara-session/cynara-session.pc.in
+++ b/pkgconfig/cynara-session/cynara-session.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cynara-session
 Description: cynara-session package
-Version: 0.0.1
+Version: @CYNARA_VERSION@
 Requires:
 Libs: -L${libdir} -lcynara-session
 Cflags: -I${includedir}/cynara