Move legacy%#¤%#¤ to librpm now that it can move..

diff --git a/build/files.c b/build/files.c
index d62cb94..bbf2d90 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -30,7 +30,7 @@
 #include "build/buildio.h"
 
 #include <rpmfileutil.h>       /* rpmDoDigest() */
-#include "rpmdb/legacy.h"      /* XXX expandFileList, compressFileList */
+#include "lib/legacy.h"        /* XXX expandFileList, compressFileList */
 #include <rpmlog.h>
 #include "debug.h"
 

diff --git a/build/pack.c b/build/pack.c
index 4296961..2ea8bf3 100644 (file)
--- a/build/pack.c
+++ b/build/pack.c
@@ -20,7 +20,7 @@
 
 #include "build/buildio.h"
 
-#include "rpmdb/legacy.h"      /* XXX providePackageNVR */
+#include "lib/legacy.h"        /* XXX providePackageNVR */
 #include "lib/signature.h"
 #include "lib/rpmlead.h"
 #include <rpmfileutil.h>

diff --git a/build/poptBT.c b/build/poptBT.c
index 30e7817..71d37d1 100644 (file)
--- a/build/poptBT.c
+++ b/build/poptBT.c
@@ -7,7 +7,6 @@
 
 #include <rpmbuild.h>
 
-#include "rpmdb/legacy.h"      /* XXX _noDirTokens */
 #include <rpmlog.h>
 #include "debug.h"
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d3f9e0b..3ee2adb 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,7 +24,9 @@ librpm_la_SOURCES = \
        rpminstall.c rpmtsscore.h rpmts_internal.h \
        rpmlead.c rpmlead.h rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c \
        rpmvercmp.c signature.c signature.h transaction.c \
-       verify.c rpmlock.c rpmlock.h misc.h
+       verify.c rpmlock.c rpmlock.h misc.h \
+       legacy.c legacy.h
+
 librpm_la_LDFLAGS = -release 4.4
 
 librpm_la_LIBADD = \

diff --git a/lib/formats.c b/lib/formats.c
index 996c5bf..fdb6a5f 100644 (file)
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -9,7 +9,7 @@
 
 #include <rpmfi.h>
 
-#include "rpmdb/legacy.h"      /* XXX rpmfiBuildFNames() */
+#include "lib/legacy.h"        /* XXX rpmfiBuildFNames() */
 #include "lib/manifest.h"
 
 #include "debug.h"

diff --git a/rpmdb/legacy.c b/lib/legacy.c
similarity index 99%
rename from rpmdb/legacy.c
rename to lib/legacy.c
index ed6669d..6a8e253 100644 (file)
--- a/rpmdb/legacy.c
+++ b/lib/legacy.c
@@ -7,7 +7,7 @@
 #include <rpmlib.h>
 #include <rpmmacro.h>
 #include <rpmstring.h>
-#include "rpmdb/legacy.h"
+#include "lib/legacy.h"
 #include "debug.h"
 
 #define alloca_strdup(_s)      strcpy(alloca(strlen(_s)+1), (_s))

diff --git a/rpmdb/legacy.h b/lib/legacy.h
similarity index 100%
rename from rpmdb/legacy.h
rename to lib/legacy.h

diff --git a/lib/package.c b/lib/package.c
index e30951e..7741490 100644 (file)
--- a/lib/package.c
+++ b/lib/package.c
@@ -12,7 +12,7 @@
 
 #include <rpmts.h>
 
-#include "rpmdb/legacy.h"      /* XXX legacyRetrofit() */
+#include "lib/legacy.h"        /* XXX legacyRetrofit() */
 #include "lib/rpmlead.h"
 
 #include <rpmlog.h>

diff --git a/lib/psm.c b/lib/psm.c
index 00489f1..22989e9 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -27,7 +27,7 @@
 
 #include "lib/rpmlead.h"               /* writeLead proto */
 #include "lib/signature.h"             /* signature constants */
-#include "rpmdb/legacy.h"              /* XXX rpmfiBuildFNames() */
+#include "lib/legacy.h"                /* XXX rpmfiBuildFNames() */
 #include <rpmfileutil.h>       /* rpmMkTempFile() */
 #include "lib/misc.h"          /* XXX rpmMkdirPath, doputenv */
 #include <rpmdb.h>             /* XXX for db_chrootDone */

diff --git a/python/header-py.c b/python/header-py.c
index 7705f73..165743e 100644 (file)
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -7,7 +7,7 @@
 #include <rpmlib.h>
 #include <rpmstring.h>
 
-#include "legacy.h"
+#include "lib/legacy.h"
 
 #include <rpmts.h>     /* XXX rpmtsCreate/rpmtsFree */
 

diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index dcfa7b1..e8a16c4 100644 (file)
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -18,7 +18,6 @@ librpmdb_la_SOURCES = \
        dbconfig.c fprint.c fprint.h \
        hdrNVR.c header.c header_internal.c header_internal.h \
        header_common.c header_method.h \
-       legacy.c legacy.h \
        merge.c \
        poptDB.c rpmhash.c rpmhash.h rpmdb.c rpmdb_internal.h \
        tagname.c tagtbl.c

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 165b009..6ff64d6 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -26,7 +26,6 @@
 #include "rpmdb/rpmdb_internal.h"
 #include <rpmdb.h>
 #include "rpmdb/fprint.h"
-#include "rpmdb/legacy.h"
 #include "rpmdb/header_internal.h"     /* XXX for HEADERFLAG_ALLOCATED */
 #include "debug.h"