PATH_UTILS: merge in INI_CONFIG

and don't expose its API

Author: alexey-tikhonov

.packit.yaml

@@ -13,7 +13,6 @@ packages:
         - sed -i "s/@PACKAGE_NAME@/ding-libs/g" contrib/ding-libs.spec
         - sed -i "s/@PACKAGE_VERSION@/0/g" contrib/ding-libs.spec
         - sed -i "s/@PRERELEASE_VERSION@/99/g" contrib/ding-libs.spec
-        - sed -i "s/@PATH_UTILS_VERSION@/99.0.0/g" contrib/ding-libs.spec
         - sed -i "s/@DHASH_VERSION@/99.0.0/g" contrib/ding-libs.spec
         - sed -i "s/@COLLECTION_VERSION@/99.0.0/g" contrib/ding-libs.spec
         - sed -i "s/@REF_ARRAY_VERSION@/99.0.0/g" contrib/ding-libs.spec

Makefile.am

@@ -12,7 +12,6 @@ dist_noinst_DATA = \
     m4 \
     COPYING \
     COPYING.LESSER \
-    path_utils/libpath_utils.sym \
     dhash/libdhash.sym \
     collection/libcollection.sym \
     refarray/libref_array.sym \
@@ -61,21 +60,6 @@ examplesdir = $(docdir)/examples
 # Path Utils
 ##############################################################################
 
-lib_LTLIBRARIES += libpath_utils.la
-dist_pkgconfig_DATA += path_utils/path_utils.pc
-dist_include_HEADERS += path_utils/path_utils.h
-
-libpath_utils_la_SOURCES = path_utils/path_utils.c
-libpath_utils_la_DEPENDENCIES = path_utils/libpath_utils.sym
-libpath_utils_la_LIBADD = $(LTLIBICONV) \
-    $(LTLIBINTL)
-libpath_utils_la_LDFLAGS = \
-    -version-info 1:1:0
-
-if HAVE_LD_VERSION_SCRIPT
-libpath_utils_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/path_utils/libpath_utils.sym
-endif
-
 if HAVE_CHECK
     check_PROGRAMS += path_utils_ut \
                       ini_augment_ut_check \
@@ -97,7 +81,7 @@ path_utils_ut_CFLAGS = \
     $(CHECK_CFLAGS)
 path_utils_ut_LDADD = \
     $(CHECK_LIBS) \
-    libpath_utils.la
+    libini_config_internal.la
 
 path_utils-docs:
 if HAVE_DOXYGEN
@@ -274,6 +258,8 @@ dist_include_HEADERS += ini/ini_configobj.h \
                         ini/ini_configmod.h
 
 libini_config_la_SOURCES = \
+    path_utils/path_utils.c \
+    path_utils/path_utils.h \
     ini/ini_config.c \
     ini/ini_config.h \
     ini/ini_get_value.c \
@@ -303,7 +289,6 @@ libini_config_la_SOURCES = \
 EXTRA_libini_config_la_DEPENDENCIES = ini/libini_config.sym
 libini_config_la_LIBADD = \
     libcollection.la \
-    libpath_utils.la \
     libref_array.la \
     libbasicobjects.la \
     $(LTLIBICONV) \
@@ -383,11 +368,11 @@ ini_parse_ut_LDADD = libini_config_internal.la libcollection.la libbasicobjects.
 
 ini_augment_ut_SOURCES = ini/ini_augment_ut.c
 ini_augment_ut_LDADD = libini_config_internal.la libcollection.la \
-                       libbasicobjects.la libpath_utils.la libref_array.la
+                       libbasicobjects.la libref_array.la
 
 ini_configmod_ut_SOURCES = ini/ini_configmod_ut.c
 ini_configmod_ut_LDADD = libini_config_internal.la libcollection.la \
-                         libbasicobjects.la libpath_utils.la libref_array.la
+                         libbasicobjects.la libref_array.la
 
 ini_augment_ut_check_SOURCES = ini/ini_augment_ut_check.c
 ini_augment_ut_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
@@ -397,7 +382,7 @@ ini_augment_ut_check_LDADD = libini_config_internal.la $(CHECK_LIBS) \
 ini_configmod_ut_check_SOURCES = ini/ini_configmod_ut_check.c
 ini_configmod_ut_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
 ini_configmod_ut_check_LDADD = libini_config_internal.la libcollection.la \
-                               libbasicobjects.la libpath_utils.la \
+                               libbasicobjects.la \
                                libref_array.la \
                                $(CHECK_LIBS)
 
@@ -414,7 +399,7 @@ ini_validators_ut_check_LDADD = libini_config_internal.la $(CHECK_LIBS)
 
 ini_save_ut_SOURCES = ini/ini_save_ut.c
 ini_save_ut_LDADD = libini_config_internal.la libcollection.la \
-                         libbasicobjects.la libpath_utils.la libref_array.la
+                         libbasicobjects.la libref_array.la
 
 ini_config-docs:
 if HAVE_DOXYGEN

configure.ac

@@ -30,7 +30,6 @@ 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)
@@ -81,7 +80,7 @@ if test x$docdir = x; then
 fi
 
 AC_CONFIG_FILES([Makefile contrib/ding-libs.spec
-                 path_utils/path_utils.cfg.doxy path_utils/path_utils.pc
+                 path_utils/path_utils.cfg.doxy
                  dhash/dhash.pc
                  collection/collection.cfg.doxy collection/collection.pc
                  refarray/ref_array.cfg.doxy refarray/ref_array.pc

contrib/ding-libs.spec.in

@@ -8,7 +8,6 @@ URL: https://github.com/SSSD/ding-libs/
 Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-%global path_utils_version @PATH_UTILS_VERSION@
 %global dhash_version @DHASH_VERSION@
 %global collection_version @COLLECTION_VERSION@
 %global ref_array_version @REF_ARRAY_VERSION@
@@ -20,7 +19,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ### Dependencies ###
 # ding-libs is a meta-package that will pull in all of its own
 # sub-packages
-Requires: libpath_utils = %{path_utils_version}-%{release}
+Obsoletes: libpath_utils <= 0.2.1
 Requires: libdhash = %{dhash_version}-%{release}
 Requires: libcollection = %{collection_version}-%{release}
 Requires: libref_array = %{ref_array_version}-%{release}
@@ -39,7 +38,7 @@ BuildRequires: gettext-devel
 
 %description
 A meta-package that pulls in libcollection, libdhash, libini_config,
-librefarray and libpath_utils.
+librefarray.
 
 %package devel
 Summary: Development packages for ding-libs
@@ -48,7 +47,7 @@ License: LGPLv3+
 
 # ding-libs is a meta-package that will pull in all of its own
 # sub-packages
-Requires: libpath_utils-devel = %{path_utils_version}-%{release}
+Obsoletes: libpath_utils-devel <= 0.2.1
 Requires: libdhash-devel = %{dhash_version}-%{release}
 Requires: libcollection-devel = %{collection_version}-%{release}
 Requires: libref_array-devel = %{ref_array_version}-%{release}
@@ -57,48 +56,7 @@ Requires: libini_config-devel = %{ini_config_version}-%{release}
 
 %description devel
 A meta-package that pulls in development libraries for libcollection,
-libdhash, libini_config, librefarray and libpath_utils.
-
-##############################################################################
-# Path Utils
-##############################################################################
-
-%package -n libpath_utils
-Summary: Filesystem Path Utilities
-Group: Development/Libraries
-License: LGPLv3+
-Version: %{path_utils_version}
-
-%description -n libpath_utils
-Utility functions to manipulate filesystem pathnames
-
-%package -n libpath_utils-devel
-Summary: Development files for libpath_utils
-Group: Development/Libraries
-Requires: libpath_utils = %{path_utils_version}-%{release}
-License: LGPLv3+
-Version: %{path_utils_version}
-
-%description -n libpath_utils-devel
-Utility functions to manipulate filesystem pathnames
-
-%post -n libpath_utils -p /sbin/ldconfig
-%postun -n libpath_utils -p /sbin/ldconfig
-
-%files -n libpath_utils
-%defattr(-,root,root,-)
-%doc COPYING COPYING.LESSER
-%{_libdir}/libpath_utils.so.1
-%{_libdir}/libpath_utils.so.1.0.1
-
-%files -n libpath_utils-devel
-%defattr(-,root,root,-)
-%{_includedir}/path_utils.h
-%{_libdir}/libpath_utils.so
-%{_libdir}/pkgconfig/path_utils.pc
-%doc path_utils/README.path_utils
-%doc path_utils/doc/html/
-
+libdhash, libini_config, librefarray.
 
 ##############################################################################
 # dhash
@@ -280,7 +238,6 @@ License: LGPLv3+
 Requires: libcollection = %{collection_version}-%{release}
 Requires: libref_array = %{ref_array_version}-%{release}
 Requires: libbasicobjects = %{basicobjects_version}-%{release}
-Requires: libpath_utils = %{path_utils_version}-%{release}
 Version: %{ini_config_version}
 
 %description -n libini_config

ini/m4/libpath_utils.m4

@@ -10,7 +10,6 @@ m4_define([VERSION_NUMBER], [0.6.2])
 # 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.5.0])
 m4_define([COLLECTION_VERSION_NUMBER], [0.7.0])
 m4_define([REF_ARRAY_VERSION_NUMBER], [0.1.5])