[gnome-software] trivial: Move the rpm plugin into the ostree directory

[Richard Hughes <rhughes src gnome org>]

commit af0067fbb85d583e1fee03b21d213e69708c1b64
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 7 13:06:33 2017 +0000

    trivial: Move the rpm plugin into the ostree directory
    
    We either want to support a PackageKit-based system, or rpmostree, but not
    weird variants of both.

 configure.ac                         |   27 ++-------------------------
 plugins/Makefile.am                  |   11 -----------
 plugins/ostree/Makefile.am           |    6 ++++++
 plugins/{ => ostree}/gs-plugin-rpm.c |    0
 4 files changed, 8 insertions(+), 36 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5eeecf8..974c387 100644
--- a/configure.ac
+++ b/configure.ac
@@ -281,7 +281,7 @@ AC_ARG_ENABLE(ostree,
               enable_ostree=maybe)
 AS_IF([test "x$enable_ostree" != "xno"], [
     PKG_CHECK_MODULES(OSTREE,
-                      [ostree-1],
+                      [ostree-1 rpm],
                       [have_ostree=yes],
                       [have_ostree=no])
 ], [
@@ -291,7 +291,7 @@ AS_IF([test "x$have_ostree" = "xyes"], [
     AC_DEFINE(HAVE_OSTREE,1,[Build ostree support])
 ], [
     AS_IF([test "x$enable_ostree" = "xyes"], [
-          AC_MSG_ERROR([ostree support requested but 'ostree' was not found])
+          AC_MSG_ERROR([ostree support requested but 'ostree' or 'rpm' was not found])
     ])
 ])
 AM_CONDITIONAL(HAVE_OSTREE, test "$have_ostree" != no)
@@ -318,28 +318,6 @@ AS_IF([test "x$have_limba" = "xyes"], [
 ])
 AM_CONDITIONAL(HAVE_LIMBA, test x$enable_limba = xyes)
 
-# RPM
-AC_ARG_ENABLE(rpm,
-              [AS_HELP_STRING([--enable-rpm],
-                              [enable RPM support [default=auto]])],,
-              enable_rpm=maybe)
-AS_IF([test "x$enable_rpm" != "xno"], [
-    PKG_CHECK_MODULES(RPM,
-                      rpm,
-                      [have_rpm=yes],
-                      [have_rpm=no])
-], [
-    have_rpm=no
-])
-AS_IF([test "x$have_rpm" = "xyes"], [
-    AC_DEFINE(HAVE_RPM, 1, [Build RPM support])
-], [
-    AS_IF([test "x$enable_rpm" = "xyes"], [
-          AC_MSG_ERROR([RPM support requested but 'rpm' was not found])
-    ])
-])
-AM_CONDITIONAL(HAVE_RPM, test x$have_rpm = xyes)
-
 # Steam
 AC_ARG_ENABLE(steam,
               [AS_HELP_STRING([--enable-steam],
@@ -542,7 +520,6 @@ echo "
         OSTree support:            ${have_ostree}
         GtkSpell support:          ${have_gtkspell}
         GNOME desktop support:     ${have_gnome_desktop}
-        RPM support:               ${have_rpm}
         GUDev support:             ${have_gudev}
         Steam support:             ${enable_steam}
         GNOME Shell ext. support:  ${enable_shell_extensions}
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 6c13253..fe9fca6 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -89,10 +89,6 @@ if HAVE_FLATPAK
 plugin_LTLIBRARIES += libgs_plugin_flatpak.la
 endif
 
-if HAVE_RPM
-plugin_LTLIBRARIES += libgs_plugin_rpm.la
-endif
-
 libgs_plugin_dummy_la_SOURCES = gs-plugin-dummy.c
 libgs_plugin_dummy_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_dummy_la_LDFLAGS = -module -avoid-version
@@ -176,13 +172,6 @@ libgs_plugin_flatpak_la_LDFLAGS = -module -avoid-version
 libgs_plugin_flatpak_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(FLATPAK_CFLAGS)
 endif
 
-if HAVE_RPM
-libgs_plugin_rpm_la_SOURCES = gs-plugin-rpm.c
-libgs_plugin_rpm_la_LIBADD = $(GS_PLUGIN_LIBS) $(RPM_LIBS)
-libgs_plugin_rpm_la_LDFLAGS = -module -avoid-version
-libgs_plugin_rpm_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(RPM_CFLAGS)
-endif
-
 libgs_plugin_repos_la_SOURCES = gs-plugin-repos.c
 libgs_plugin_repos_la_LIBADD = $(GS_PLUGIN_LIBS) $(RPM_LIBS)
 libgs_plugin_repos_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/ostree/Makefile.am b/plugins/ostree/Makefile.am
index 378f9ae..2877aa2 100644
--- a/plugins/ostree/Makefile.am
+++ b/plugins/ostree/Makefile.am
@@ -6,4 +6,10 @@ libgs_plugin_ostree_la_LIBADD = $(GS_PLUGIN_LIBS) $(OSTREE_LIBS)
 libgs_plugin_ostree_la_LDFLAGS = -module -avoid-version
 libgs_plugin_ostree_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(OSTREE_CFLAGS)
 
+plugin_LTLIBRARIES += libgs_plugin_rpm.la
+libgs_plugin_rpm_la_SOURCES = gs-plugin-rpm.c
+libgs_plugin_rpm_la_LIBADD = $(GS_PLUGIN_LIBS) $(RPM_LIBS)
+libgs_plugin_rpm_la_LDFLAGS = -module -avoid-version
+libgs_plugin_rpm_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(RPM_CFLAGS)
+
 -include $(top_srcdir)/git.mk
diff --git a/plugins/gs-plugin-rpm.c b/plugins/ostree/gs-plugin-rpm.c
similarity index 100%
rename from plugins/gs-plugin-rpm.c
rename to plugins/ostree/gs-plugin-rpm.c