poldek: poldek/configure.in, poldek/pkgdir/hdrl/hdrl.c - rpm5.x: H...

[mis]

Author: mis                          Date: Tue Jan 22 11:05:59 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- rpm5.x: HEADER_MAGIC_YES has been removed

---- Files affected:
poldek/poldek:
   configure.in (1.141 -> 1.142) 
poldek/poldek/pkgdir/hdrl:
   hdrl.c (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: poldek/poldek/configure.in
diff -u poldek/poldek/configure.in:1.141 poldek/poldek/configure.in:1.142
--- poldek/poldek/configure.in:1.141	Thu Jan 10 20:29:24 2008
+++ poldek/poldek/configure.in	Tue Jan 22 12:05:54 2008
@@ -19,6 +19,7 @@
 AH_TEMPLATE([HAVE_RPM_HGETCOLOR],[])
 AH_TEMPLATE([HAVE_TM_GMTOFF],[])
 AH_TEMPLATE([HAVE_TM___GMTOFF],[])
+AH_TEMPLATE([HAVE_RPM_HEADER_MAGIC_YES],[])
 
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_DEFINE_UNQUOTED([VERSION_STATUS], "$VERSION_STATUS", [version status])
@@ -332,6 +333,13 @@
 dnl rpm 4.4.9
 AC_CHECK_HEADERS([rpm/rpmevr.h])
 
+dnl rpm 5.x
+dnl  - removed enum (not macro) HEADER_MAGIC_YES
+if test "${is_rpm4}." = "yes." ; then
+   AC_EGREP_CPP(HEADER_MAGIC_YES,
+               [ #include <rpm/header.h>
+               ], AC_DEFINE([HAVE_RPM_HEADER_MAGIC_YES], 1, []))
+fi
 
 dnl metadata & xml2
 AC_ARG_WITH(xml-metadata,
@@ -514,10 +522,10 @@
         doc/Makefile
         doc/homepage/Makefile
         doc/pl/Makefile
-	install/Makefile
+        install/Makefile
+        install3/Makefile
         Makefile
         poldek.spec
-        poldek-suse.spec
         tests/Makefile
         cli/Makefile
 	])

================================================================
Index: poldek/poldek/pkgdir/hdrl/hdrl.c
diff -u poldek/poldek/pkgdir/hdrl/hdrl.c:1.22 poldek/poldek/pkgdir/hdrl/hdrl.c:1.23
--- poldek/poldek/pkgdir/hdrl/hdrl.c:1.22	Tue Oct 30 22:57:33 2007
+++ poldek/poldek/pkgdir/hdrl/hdrl.c	Tue Jan 22 12:05:54 2008
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2000 - 2002 Pawel A. Gajda <mis at k2.net.pl>
+  Copyright (C) 2000 - 2008 Pawel A. Gajda <mis at pld-linux.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License, version 2 as
@@ -97,7 +97,7 @@
         return -1;
     }
    
-#ifdef HEADER_MAGIC_YES 
+#if HAVE_RPM_HEADER_MAGIC_YES 
     while ((h = headerRead(fdt, HEADER_MAGIC_YES))) {
 #else
     while ((h = headerRead(fdt))) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/configure.in?r1=1.141&r2=1.142&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/pkgdir/hdrl/hdrl.c?r1=1.22&r2=1.23&f=u