Fix version handling of the libraries

9 files changed, 31 insertions, 18 deletions

diff --git a/basicobjects/basicobjects.pc.in b/basicobjects/basicobjects.pc.in
index f705904..6fabd96 100644
--- a/basicobjects/basicobjects.pc.in
+++ b/basicobjects/basicobjects.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @PACKAGE_NAME@
+Name: basicobjects
 Description: Library contains basic objects like dynamic string
-Version: @PACKAGE_VERSION@
+Version: @BASICOBJECTS_VERSION@
 Libs: -L${libdir} -lbasicobjects
 Cflags: -I${includedir}
 URL: http://fedorahosted.org/sssd/
diff --git a/collection/collection.pc.in b/collection/collection.pc.in
index 31e86fe..f4f92d2 100644
--- a/collection/collection.pc.in
+++ b/collection/collection.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @PACKAGE_NAME@
+Name: collection
 Description: A data-type to collect data in a heirarchical structure for easy iteration and serialization
-Version: @PACKAGE_VERSION@
+Version: @COLLECTION_VERSION@
 Libs: -L${libdir} -lcollection
 Cflags: -I${includedir}
 URL: http://fedorahosted.org/sssd/
diff --git a/configure.ac b/configure.ac
index 10c4062..2e22e8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,13 @@ AC_CONFIG_HEADERS([config.h])
 AC_SUBST([PRERELEASE_VERSION],
          PRERELEASE_VERSION_NUMBER)
 
+AC_SUBST([PATH_UTILS_VERSION], PATH_UTILS_VERSION_NUMBER)
+AC_SUBST([DHASH_VERSION], DHASH_VERSION_NUMBER)
+AC_SUBST([COLLECTION_VERSION], COLLECTION_VERSION_NUMBER)
+AC_SUBST([REF_ARRAY_VERSION], REF_ARRAY_VERSION_NUMBER)
+AC_SUBST([BASICOBJECTS_VERSION], BASICOBJECTS_VERSION_NUMBER)
+AC_SUBST([INI_CONFIG_VERSION], INI_CONFIG_VERSION_NUMBER)
+
 AM_CONDITIONAL([GIT_CHECKOUT], [git log -1 &>/dev/null])
 
 AC_PATH_PROG([DOXYGEN], [doxygen], [false])
diff --git a/contrib/ding-libs.spec.in b/contrib/ding-libs.spec.in
index 4b38a2e..6871eb8 100644
--- a/contrib/ding-libs.spec.in
+++ b/contrib/ding-libs.spec.in
@@ -8,12 +8,12 @@ URL: http://fedorahosted.org/sssd/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-%global path_utils_version 0.2.1
-%global dhash_version 0.4.1
-%global collection_version 0.6.0
-%global ref_array_version 0.1.1
-%global basicobjects_version 0.1.0
-%global ini_config_version 0.6.1
+%global path_utils_version @PATH_UTILS_VERSION@
+%global dhash_version @DHASH_VERSION@
+%global collection_version @COLLECTION_VERSION@
+%global ref_array_version @REF_ARRAY_VERSION@
+%global basicobjects_version @BASICOBJECTS_VERSION@
+%global ini_config_version @INI_CONFIG_VERSION@
 
 ### Patches ###
 
diff --git a/dhash/dhash.pc.in b/dhash/dhash.pc.in
index 7dfc8a3..fbe8bc7 100644
--- a/dhash/dhash.pc.in
+++ b/dhash/dhash.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @PACKAGE_NAME@
+Name: dhash
 Description: A hash table which will dynamically resize to achieve optimal storage & access time properties
-Version: @PACKAGE_VERSION@
+Version: @DHASH_VERSION@
 Libs: -L${libdir} -ldhash
 Cflags: -I${includedir}
 URL: http://fedorahosted.org/sssd/
diff --git a/ini/ini_config.pc.in b/ini/ini_config.pc.in
index efa8da9..600d39a 100644
--- a/ini/ini_config.pc.in
+++ b/ini/ini_config.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @PACKAGE_NAME@
+Name: ini_config
 Description: Library to process config files in INI format into a libcollection data structure
-Version: @PACKAGE_VERSION@
+Version: @INI_CONFIG_VERSION@
 Libs: -L${libdir} -lini_config -lcollection
 Cflags: -I${includedir}
 URL: http://fedorahosted.org/sssd/
diff --git a/path_utils/path_utils.pc.in b/path_utils/path_utils.pc.in
index aaf7531..68e479c 100644
--- a/path_utils/path_utils.pc.in
+++ b/path_utils/path_utils.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @PACKAGE_NAME@
+Name: path_utils
 Description: Utility functions to manipulate filesystem pathnames
-Version: @PACKAGE_VERSION@
+Version: @PATH_UTILS_VERSION@
 Libs: -L${libdir} -lpath_utils
 Cflags: -I${includedir}
 URL: http://fedorahosted.org/sssd/
diff --git a/refarray/ref_array.pc.in b/refarray/ref_array.pc.in
index c4fe941..fbc16f3 100644
--- a/refarray/ref_array.pc.in
+++ b/refarray/ref_array.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @PACKAGE_NAME@
+Name: ref_array
 Description: A dynamically-growing, reference-counted array
-Version: @PACKAGE_VERSION@
+Version: @REF_ARRAY_VERSION@
 Libs: -L${libdir} -lref_array
 Cflags: -I${includedir}
 URL: http://fedorahosted.org/sssd/
diff --git a/version.m4 b/version.m4
index ddb86b0..a109279 100644
--- a/version.m4
+++ b/version.m4
@@ -10,3 +10,9 @@ m4_define([VERSION_NUMBER], [0.2.0])
 # ding-libs-0.1.0-0.20090915gitf1bcde7.fc13.src.rpm
 m4_define([PRERELEASE_VERSION_NUMBER], [])
 
+m4_define([PATH_UTILS_VERSION_NUMBER], [0.2.1])
+m4_define([DHASH_VERSION_NUMBER], [0.4.1])
+m4_define([COLLECTION_VERSION_NUMBER], [0.6.0])
+m4_define([REF_ARRAY_VERSION_NUMBER], [0.1.1])
+m4_define([BASICOBJECTS_VERSION_NUMBER], [0.1.0])
+m4_define([INI_CONFIG_VERSION_NUMBER], [0.6.1])