I downloaded RPM 4.4.2 from the fedora CVS. When I tried to compile it, it died out with errors of header files not being found. I modified many of the include statements, in a few files and then it compiled successfully . The changes were all something like this: type 1) #include <beecrypt.h> --> #include<beecrypt/beecrypt.h> (also for md5.h, sha*.h ...) type 2) #include "structmember.h" --> #include <python2.4/structmember.h> type 3) #include "ne_alloc.h" --> #include <neon/ne_alloc.h> I am not sure if I am doing something wrong myself, but it doesn't compile unless I make those changes. My system was basically built using yum, so the beecrypt header files are in the location yum defaults it to. I am including the patch here. You can apply the patch by: patch --strip 1 -d rpm-4.4.2/ < rpm-4.4.2-patch.patch PS: This is my First patch, so if you think I'm spouting bull, tell me Gja -- Tejas Dinkar <tejasdinkar@xxxxxxxxx>
diff -ur rpm-4.4.2/python/rpmfts-py.c ../rpm-4.4.2/python/rpmfts-py.c --- rpm-4.4.2/python/rpmfts-py.c 2004-11-17 22:35:39.000000000 +0530 +++ ../rpm-4.4.2/python/rpmfts-py.c 2006-01-11 20:10:21.000000000 +0530 @@ -4,7 +4,7 @@ #include "system.h" -#include "structmember.h" +#include <python2.4/structmember.h> #ifdef __LCLINT__ #undef PyObject_HEAD diff -ur rpm-4.4.2/python/rpmrc-py.c ../rpm-4.4.2/python/rpmrc-py.c --- rpm-4.4.2/python/rpmrc-py.c 2004-11-17 22:35:39.000000000 +0530 +++ ../rpm-4.4.2/python/rpmrc-py.c 2006-01-11 20:10:21.000000000 +0530 @@ -4,7 +4,7 @@ #include "system.h" -#include "structmember.h" +#include <python2.4/structmember.h> #include "rpmdebug-py.c" diff -ur rpm-4.4.2/python/system.h ../rpm-4.4.2/python/system.h --- rpm-4.4.2/python/system.h 2005-02-13 08:42:07.000000000 +0530 +++ ../rpm-4.4.2/python/system.h 2006-01-11 20:10:21.000000000 +0530 @@ -9,7 +9,7 @@ #include <sys/types.h> #endif -#include "Python.h" +#include "python2.4/Python.h" #ifdef __LCLINT__ #undef PyObject_HEAD diff -ur rpm-4.4.2/rpmio/rpmdav.c ../rpm-4.4.2/rpmio/rpmdav.c --- rpm-4.4.2/rpmio/rpmdav.c 2005-02-17 06:37:18.000000000 +0530 +++ ../rpm-4.4.2/rpmio/rpmdav.c 2006-01-11 20:10:28.000000000 +0530 @@ -9,11 +9,11 @@ #include <pthread.h> #endif -#include "ne_alloc.h" -#include "ne_auth.h" -#include "ne_basic.h" -#include "ne_dates.h" -#include "ne_locks.h" +#include <neon/ne_alloc.h> +#include <neon/ne_auth.h> +#include <neon/ne_basic.h> +#include <neon/ne_dates.h> +#include <neon/ne_locks.h> #define NEONBLOWSCHUNKS #ifndef NEONBLOWSCHUNKS @@ -21,11 +21,11 @@ #include "../neon/src/ne_private.h" #endif -#include "ne_props.h" -#include "ne_request.h" -#include "ne_socket.h" -#include "ne_string.h" -#include "ne_utils.h" +#include <neon/ne_props.h> +#include <neon/ne_request.h> +#include <neon/ne_socket.h> +#include <neon/ne_string.h> +#include <neon/ne_utils.h> #include <rpmio_internal.h> diff -ur rpm-4.4.2/rpmio/rpmio_internal.h ../rpm-4.4.2/rpmio/rpmio_internal.h --- rpm-4.4.2/rpmio/rpmio_internal.h 2005-03-13 01:27:56.000000000 +0530 +++ ../rpm-4.4.2/rpmio/rpmio_internal.h 2006-01-11 20:10:28.000000000 +0530 @@ -10,7 +10,7 @@ #include <rpmurl.h> #if HAVE_BEECRYPT_API_H -#include <api.h> +#include <beecrypt/api.h> #else #include <beecrypt.api.h> #endif @@ -19,19 +19,19 @@ #include <rpmsw.h> /* Drag in the beecrypt includes. */ -#include <beecrypt.h> -#include <base64.h> -#include <dsa.h> -#include <endianness.h> -#include <md5.h> -#include <mp.h> -#include <rsa.h> -#include <rsapk.h> -#include <sha1.h> +#include <beecrypt/beecrypt.h> +#include <beecrypt/base64.h> +#include <beecrypt/dsa.h> +#include <beecrypt/endianness.h> +#include <beecrypt/md5.h> +#include <beecrypt/mp.h> +#include <beecrypt/rsa.h> +#include <beecrypt/rsapk.h> +#include <beecrypt/sha1.h> #if HAVE_BEECRYPT_API_H -#include <sha256.h> -#include <sha384.h> -#include <sha512.h> +#include <beecrypt/sha256.h> +#include <beecrypt/sha384.h> +#include <beecrypt/sha512.h> #endif /** \ingroup rpmio
_______________________________________________ Rpm-list mailing list Rpm-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/rpm-list
