Move rpmvercmp() to librpmio

Adding a new header just for this seems a bit much but we'll be adding
stuff there shortly.

No functional changes as such, this is prerequisite for supporting
version comparison in expressions.

Makefile.am

@@ -78,6 +78,7 @@ pkginclude_HEADERS += rpmio/rpmfileutil.h
 pkginclude_HEADERS += rpmio/rpmutil.h
 pkginclude_HEADERS += rpmio/rpmkeyring.h
 pkginclude_HEADERS += rpmio/rpmbase64.h
+pkginclude_HEADERS += rpmio/rpmver.h
 
 pkginclude_HEADERS += lib/header.h
 pkginclude_HEADERS += lib/rpmdb.h

lib/Makefile.am

@@ -36,7 +36,7 @@ librpm_la_SOURCES = \
 	rpmgi.h rpmgi.c rpminstall.c rpmts_internal.h \
 	rpmlead.c rpmlead.h rpmps.c rpmprob.c rpmrc.c \
 	rpmte.c rpmte_internal.h rpmts.c rpmfs.h rpmfs.c \
-	rpmvercmp.c signature.c signature.h transaction.c \
+	signature.c signature.h transaction.c \
 	verify.c rpmlock.c rpmlock.h misc.h relocation.c \
 	rpmscript.h rpmscript.c \
 	rpmchroot.c rpmchroot.h \

lib/rpmlib.h

@@ -13,6 +13,7 @@
 #include <rpm/rpmtag.h>
 #include <rpm/rpmds.h>	/* XXX move rpmlib provides to rpmds instead */
 #include <rpm/rpmpgp.h>
+#include <rpm/rpmver.h>
 
 #ifdef _RPM_4_4_COMPAT
 #error RPM 4.4.x compatibility layer has been removed in RPM >= 4.14
@@ -167,15 +168,6 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
 			char ** specFilePtr,
 			char ** cookie);
 
-/** \ingroup rpmtrans
- * Segmented string compare for version or release strings.
- *
- * @param a		1st string
- * @param b		2nd string
- * @return		+1 if a is "newer", 0 if equal, -1 if b is "newer"
- */
-int rpmvercmp(const char * a, const char * b);
-
 #ifdef __cplusplus
 }
 #endif

po/POTFILES.in

@@ -68,7 +68,6 @@ lib/rpmscript.c
 lib/rpmtd.c
 lib/rpmte.c
 lib/rpmts.c
-lib/rpmvercmp.c
 lib/rpmvs.c
 lib/signature.c
 lib/tagexts.c
@@ -95,6 +94,7 @@ rpmio/rpmpgp.c
 rpmio/rpmsq.c
 rpmio/rpmstring.c
 rpmio/rpmsw.c
+rpmio/rpmvercmp.c
 rpmio/url.c
 sign/rpmgensig.c
 sign/rpmsignfiles.c

preinstall.am

@@ -54,6 +54,10 @@ include/rpm/rpmbase64.h: rpmio/rpmbase64.h include/rpm/$(dirstamp)
 	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmbase64.h include/rpm/rpmbase64.h
 BUILT_SOURCES += include/rpm/rpmbase64.h
 CLEANFILES += include/rpm/rpmbase64.h
+include/rpm/rpmver.h: rpmio/rpmver.h include/rpm/$(dirstamp)
+	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmver.h include/rpm/rpmver.h
+BUILT_SOURCES += include/rpm/rpmver.h
+CLEANFILES += include/rpm/rpmver.h
 include/rpm/header.h: lib/header.h include/rpm/$(dirstamp)
 	$(INSTALL_DATA) $(top_srcdir)/lib/header.h include/rpm/header.h
 BUILT_SOURCES += include/rpm/header.h

rpmio/Makefile.am

@@ -20,7 +20,7 @@ librpmio_la_SOURCES = \
 	argv.c base64.c digest.h digest.c expression.c macro.c \
 	rpmhook.c rpmio.c rpmlog.c rpmmalloc.c \
 	rpmpgp.c rpmsq.c rpmsw.c url.c \
-	rpmio_internal.h rpmhook.h \
+	rpmio_internal.h rpmhook.h rpmvercmp.c \
 	rpmstring.c rpmfileutil.c rpmglob.c \
 	rpmkeyring.c rpmstrpool.c rpmmacro_internal.h
 

rpmio/rpmver.h

@@ -0,0 +1,21 @@
+#ifndef _RPMVER_H
+#define _RPMVER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \ingroup rpmtrans
+ * Segmented string compare for version or release strings.
+ *
+ * @param a		1st string
+ * @param b		2nd string
+ * @return		+1 if a is "newer", 0 if equal, -1 if b is "newer"
+ */
+int rpmvercmp(const char * a, const char * b);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RPMVER_H */