Make rpmplugins.h private for now

- We'll probably want to make some changes to the plugin type system
  before considered "ready", the current plugin slots are limited
  to 32 and Meego folks apparently want to use a largish number
  of slots. So we might want something like separate plugin type
  (collection, security... etc) and then have 32 slots per each type.
  Making this private for now to avoid having to potentially break
  the API shortly after introduction.
(cherry picked from commit d10b40301188f1b00cbdaf49b1c09786d546ede0)

diff --git a/Makefile.am b/Makefile.am
index d5be498..f1bcd7c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,6 @@ pkginclude_HEADERS += lib/rpmte.h
 pkginclude_HEADERS += lib/rpmts.h
 pkginclude_HEADERS += lib/rpmtypes.h
 pkginclude_HEADERS += lib/rpmvf.h
-pkginclude_HEADERS += lib/rpmplugins.h
 
 pkginclude_HEADERS += sign/rpmsign.h
 

diff --git a/lib/rpmplugins.c b/lib/rpmplugins.c
index 59506d8..e34019a 100644 (file)
--- a/lib/rpmplugins.c
+++ b/lib/rpmplugins.c
@@ -7,7 +7,7 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmts.h>
 
-#include <rpm/rpmplugins.h>
+#include "lib/rpmplugins.h"
 
 #define STR1(x) #x
 #define STR(x) STR1(x)

diff --git a/lib/rpmte.c b/lib/rpmte.c
index c36e8cb..860b3f4 100644 (file)
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -12,8 +12,8 @@
 #include <rpm/rpmts.h>
 #include <rpm/rpmdb.h>
 #include <rpm/rpmlog.h>
-#include <rpm/rpmplugins.h>
 
+#include "lib/rpmplugins.h"
 #include "lib/rpmte_internal.h"
 
 #include "debug.h"

diff --git a/lib/rpmts.c b/lib/rpmts.c
index cfe4ac4..d782ecf 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -19,11 +19,11 @@
 #include <rpm/rpmfi.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmte.h>
-#include <rpm/rpmplugins.h>
 
 #include "rpmio/digest.h"
 #include "lib/rpmal.h"
 #include "lib/rpmchroot.h"
+#include "lib/rpmplugins.h"
 #include "lib/rpmts_internal.h"
 #include "lib/rpmte_internal.h"
 #include "lib/misc.h"

diff --git a/preinstall.am b/preinstall.am
index b29854f..170c94c 100644 (file)
--- a/preinstall.am
+++ b/preinstall.am
@@ -114,10 +114,6 @@ include/rpm/rpmvf.h: lib/rpmvf.h include/rpm/$(dirstamp)
        $(INSTALL_DATA) $(top_srcdir)/lib/rpmvf.h include/rpm/rpmvf.h
 BUILT_SOURCES += include/rpm/rpmvf.h
 CLEANFILES += include/rpm/rpmvf.h
-include/rpm/rpmplugins.h: lib/rpmplugins.h include/rpm/$(dirstamp)
-       $(INSTALL_DATA) $(top_srcdir)/lib/rpmplugins.h include/rpm/rpmplugins.h
-BUILT_SOURCES += include/rpm/rpmplugins.h
-CLEANFILES += include/rpm/rpmplugins.h
 include/rpm/rpmsign.h: sign/rpmsign.h include/rpm/$(dirstamp)
        $(INSTALL_DATA) $(top_srcdir)/sign/rpmsign.h include/rpm/rpmsign.h
 BUILT_SOURCES += include/rpm/rpmsign.h