poldek: poldek/pm/rpm/pm_rpm.h, poldek/configure.in - HAVE_RPM_5

[mis]

Author: mis                          Date: Sun Feb 24 22:40:48 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- HAVE_RPM_5

---- Files affected:
poldek/poldek/pm/rpm:
   pm_rpm.h (1.21 -> 1.22) 
poldek/poldek:
   configure.in (1.143 -> 1.144) 

---- Diffs:

================================================================
Index: poldek/poldek/pm/rpm/pm_rpm.h
diff -u poldek/poldek/pm/rpm/pm_rpm.h:1.21 poldek/poldek/pm/rpm/pm_rpm.h:1.22
--- poldek/poldek/pm/rpm/pm_rpm.h:1.21	Sun Feb 24 23:14:08 2008
+++ poldek/poldek/pm/rpm/pm_rpm.h	Sun Feb 24 23:40:43 2008
@@ -44,10 +44,6 @@
 #include <rpm/rpmurl.h>
 #include <rpm/rpmmacro.h>
 
-#ifdef HAVE_RPMPKGREAD
-# define HAVE_RPM_5 1
-#endif
-
 #ifdef RPM_MAJOR_VERSION
 # define PM_RPMVER(a,b,c) ((a)*65536+(b)*256+(c))
 # if PM_RPMVER(RPM_FORMAT_VERSION,RPM_MAJOR_VERSION,RPM_MINOR_VERSION) >= PM_RPMVER(4,4,8)

================================================================
Index: poldek/poldek/configure.in
diff -u poldek/poldek/configure.in:1.143 poldek/poldek/configure.in:1.144
--- poldek/poldek/configure.in:1.143	Sun Feb 24 23:14:08 2008
+++ poldek/poldek/configure.in	Sun Feb 24 23:40:43 2008
@@ -21,6 +21,7 @@
 AH_TEMPLATE([HAVE_TM___GMTOFF],[])
 AH_TEMPLATE([HAVE_RPM_HEADER_MAGIC_YES],[])
 AH_TEMPLATE([HAVE_RPM_INT32_TYPE],[])
+AH_TEMPLATE([HAVE_RPM_5],[])
 
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_DEFINE_UNQUOTED([VERSION_STATUS], "$VERSION_STATUS", [version status])
@@ -339,6 +340,13 @@
 dnl fnpyKey provider
 AC_CHECK_HEADERS([rpm/rpmcb.h])
 AC_CHECK_FUNCS(rpmpkgRead)
+AC_MSG_CHECKING([for rpm 5.x])
+if test "$ac_cv_func_rpmpkgRead." != "yes."; then
+     AC_MSG_RESULT(no)   
+else
+     AC_DEFINE([HAVE_RPM_5], [1], [])
+     AC_MSG_RESULT(yes)
+fi
 AC_CHECK_FUNCS(headerNVR)     # removed since 5.0
 AC_CHECK_FUNCS(headerNEVRA)  
 AC_CHECK_FUNCS(rpmErrorString)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/pm/rpm/pm_rpm.h?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/configure.in?r1=1.143&r2=1.144&f=u