[gnome-software] trivial: Bump the plugin version as we've renamed plugins

[Richard Hughes <rhughes src gnome org>]

commit 3c422d8f82f4e9c6895ffe81bfbe0f2e0e97f808
Author: Richard Hughes <richard hughsie com>
Date:   Thu Jun 2 21:23:32 2016 +0100

    trivial: Bump the plugin version as we've renamed plugins
    
    Also, remove any artificial conflicts as they're now unused.

 configure.ac                               |    2 +-
 contrib/gnome-software.spec.in             |    2 +-
 src/plugins/gs-plugin-desktop-categories.c |    3 ---
 src/plugins/gs-plugin-desktop-menu-path.c  |    3 ---
 src/plugins/gs-plugin-flatpak-system.c     |    3 ---
 5 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3f89d83..7f2133e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -288,7 +288,7 @@ AC_DEFINE(HAVE_UBUNTU_REVIEWS,1,[Build Ubuntu reviews])
 
 # this refers to the gnome-software plugin API version
 # this is not in any way related to a package or soname version
-GS_PLUGIN_API_VERSION=10
+GS_PLUGIN_API_VERSION=11
 AC_SUBST(GS_PLUGIN_API_VERSION)
 AC_DEFINE_UNQUOTED([GS_PLUGIN_API_VERSION], "$GS_PLUGIN_API_VERSION", [the plugin API version])
 
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 3c9aa16..5798940 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -55,7 +55,7 @@ BuildRequires: polkit-devel
 BuildRequires: flatpak-devel >= %{flatpak_version}
 
 # this is not a library version
-%define gs_plugin_version               10
+%define gs_plugin_version               11
 
 %description
 gnome-software is an application that makes it easy to add, remove
diff --git a/src/plugins/gs-plugin-desktop-categories.c b/src/plugins/gs-plugin-desktop-categories.c
index 5a2d9f9..9ce6ec4 100644
--- a/src/plugins/gs-plugin-desktop-categories.c
+++ b/src/plugins/gs-plugin-desktop-categories.c
@@ -37,9 +37,6 @@ gs_plugin_initialize (GsPlugin *plugin)
 {
        /* need categories */
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_BEFORE, "appstream");
-
-       /* the old name for this plugin */
-       gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "menu-spec-categories");
 }
 
 gboolean
diff --git a/src/plugins/gs-plugin-desktop-menu-path.c b/src/plugins/gs-plugin-desktop-menu-path.c
index 4bb059a..c0d6e38 100644
--- a/src/plugins/gs-plugin-desktop-menu-path.c
+++ b/src/plugins/gs-plugin-desktop-menu-path.c
@@ -36,9 +36,6 @@ gs_plugin_initialize (GsPlugin *plugin)
 {
        /* need categories */
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
-
-       /* the old name for this plugin */
-       gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "menu-spec-refine");
 }
 
 static gboolean
diff --git a/src/plugins/gs-plugin-flatpak-system.c b/src/plugins/gs-plugin-flatpak-system.c
index b33dd12..14a42e7 100644
--- a/src/plugins/gs-plugin-flatpak-system.c
+++ b/src/plugins/gs-plugin-flatpak-system.c
@@ -46,9 +46,6 @@ gs_plugin_initialize (GsPlugin *plugin)
 
        /* getting app properties from appstream is quicker */
        gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
-
-       /* do not load the plugin with the old name */
-       gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "flatpak");
 }
 
 void